From 402df03ca39de36734cabfd25ea959dc68991273 Mon Sep 17 00:00:00 2001
From: Godot Bian <13778003+godobyte@users.noreply.github.com>
Date: Tue, 17 Mar 2026 23:05:05 +0000
Subject: [PATCH] chore: pin virtualenv<21 for python 3.9

Signed-off-by: Godot Bian <13778003+godobyte@users.noreply.github.com>
---
 .github/workflows/release_publish.yml                    | 2 +-
 pipeline/build.sh                                        | 2 +-
 testing_containers/ldap_sudo_environment/Dockerfile      | 3 ++-
 testing_containers/localuser_sudo_environment/Dockerfile | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release_publish.yml b/.github/workflows/release_publish.yml
index c4091d9c..36027dab 100644
--- a/.github/workflows/release_publish.yml
+++ b/.github/workflows/release_publish.yml
@@ -83,7 +83,7 @@ jobs:
           python-version: '3.9'
       - name: Install dependencies
         run: |
-          pip install --upgrade hatch
+          pip install --upgrade hatch "virtualenv<21"
       - name: Build
         run: hatch -v build
       # # See https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-pypi
diff --git a/pipeline/build.sh b/pipeline/build.sh
index 5ec09cbe..8ab5e0a9 100755
--- a/pipeline/build.sh
+++ b/pipeline/build.sh
@@ -3,7 +3,7 @@
 set -e
 
 pip install --upgrade pip
-pip install --upgrade hatch
+pip install --upgrade hatch "virtualenv<21; python_version=='3.9'"
 pip install --upgrade twine
 hatch run lint
 hatch run test
diff --git a/testing_containers/ldap_sudo_environment/Dockerfile b/testing_containers/ldap_sudo_environment/Dockerfile
index 96fbabf8..93bacb83 100644
--- a/testing_containers/ldap_sudo_environment/Dockerfile
+++ b/testing_containers/ldap_sudo_environment/Dockerfile
@@ -69,7 +69,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get clean && \
     # Install hatch (for setting up environment and running tests)
-    pip install hatch
+    # Pin virtualenv<21 for Python 3.9 compatibility
+    pip install hatch "virtualenv<21"
 
 COPY . /code/
 WORKDIR /code
diff --git a/testing_containers/localuser_sudo_environment/Dockerfile b/testing_containers/localuser_sudo_environment/Dockerfile
index 140f8da2..ab7ee2ae 100644
--- a/testing_containers/localuser_sudo_environment/Dockerfile
+++ b/testing_containers/localuser_sudo_environment/Dockerfile
@@ -33,7 +33,8 @@ RUN apt-get update && apt-get install -y gcc libcap2-bin psmisc sudo && \
     addgroup ${OPENJD_TEST_SUDO_DISJOINT_GROUP} && \
     useradd -ms /bin/bash -G ${OPENJD_TEST_SUDO_DISJOINT_GROUP} ${OPENJD_TEST_SUDO_DISJOINT_USER} && \
     # Install hatch (for setting up environment and running tests)
-    pip install hatch
+    # Pin virtualenv<21 for Python 3.9 compatibility
+    pip install hatch "virtualenv<21"
 
 USER hostuser