This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch revert-virtualenv-pin in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 5192e4d91b5ebd37354aca5c8c221265fe9ea63c Author: Jarek Potiuk <[email protected]> AuthorDate: Sat Feb 28 07:40:39 2026 +0100 Revert "Temporary pin to workaround hatch virtualenv >= 21 compatibility (#62566)" This reverts commit 34fb41e867486448e49909d0ec9025805cd9b5df. --- dev/breeze/README.md | 2 +- dev/breeze/pyproject.toml | 5 ++--- .../src/airflow_breeze/commands/release_management_commands.py | 3 +-- hatch_build.py | 4 ++-- pyproject.toml | 3 --- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dev/breeze/README.md b/dev/breeze/README.md index 5446e087a1b..ca31f1fd83b 100644 --- a/dev/breeze/README.md +++ b/dev/breeze/README.md @@ -128,6 +128,6 @@ PLEASE DO NOT MODIFY THE HASH BELOW! IT IS AUTOMATICALLY UPDATED BY PRE-COMMIT. --------------------------------------------------------------------------------------------------------- -Package config hash: 05d02d507f75f5dacea7774487482ac2d66130d89da112db0bd1c581a509da38082dfeda6aea41e8d204a82919c4987dc0fa3daa2b82ce1981c354ff112254a4 +Package config hash: 123045caf6ca2fad10f1bbf238ccaffa45e38406b699c2afc8f33d5defd231ddde02467fe354ba4af0f3ee6da2cf04c70afe025775a7f9afcfde89ecab85bd64 --------------------------------------------------------------------------------------------------------- diff --git a/dev/breeze/pyproject.toml b/dev/breeze/pyproject.toml index 8650bcd0db6..eb25e968635 100644 --- a/dev/breeze/pyproject.toml +++ b/dev/breeze/pyproject.toml @@ -54,7 +54,7 @@ dependencies = [ "google-auth-httplib2>=0.2.0", "google-auth-oauthlib>=1.2.0", "gitpython>=3.1.40", - "hatch>=1.14.1", + "hatch>=1.16.5", "inputimeout>=1.0.4", "jinja2>=3.1.5", "jsonschema>=4.19.1", @@ -76,8 +76,7 @@ dependencies = [ "twine>=4.0.2", "tqdm>=4.67.1", "boto3>=1.34.90", - "semver>=3.0.4", - "virtualenv<21" # Temporary pin for https://github.com/pypa/hatch/issues/2193 + "semver>=3.0.4" ] [project.scripts] diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py index 1af1d301028..9a5a4a4d088 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -248,8 +248,7 @@ AIRFLOW_BUILD_DOCKERFILE = f""" FROM python:{DEFAULT_PYTHON_MAJOR_MINOR_VERSION}-slim-{ALLOWED_DEBIAN_VERSIONS[0]} RUN apt-get update && apt-get install -y --no-install-recommends git RUN pip install --root-user-action ignore pip=={AIRFLOW_PIP_VERSION} hatch=={HATCH_VERSION} pyyaml=={PYYAML_VERSION}\ - gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} prek=={PREK_VERSION} \ - "virtualenv<21" # Temporary pin for https://github.com/pypa/hatch/issues/2193 + gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} prek=={PREK_VERSION} COPY . /opt/airflow """ diff --git a/hatch_build.py b/hatch_build.py index d7c63848fa0..a1f207c7724 100644 --- a/hatch_build.py +++ b/hatch_build.py @@ -150,7 +150,7 @@ CORE_EXTRAS: dict[str, list[str]] = { "uv>=0.1.32", ], "virtualenv": [ - "virtualenv<21", # Temporary pin for https://github.com/pypa/hatch/issues/2193 + "virtualenv", ], } @@ -197,7 +197,7 @@ DEVEL_EXTRAS: dict[str, list[str]] = { "devel-devscripts": [ "click>=8.0", "gitpython>=3.1.40", - "hatch>=1.9.1", + "hatch>=1.16.5", # Incremental 24.7.0, 24.7.1 has broken `python -m virtualenv` command when run in /opt/airflow directory "incremental!=24.7.0,!=24.7.1,>=22.10.0", "pipdeptree>=2.13.1", diff --git a/pyproject.toml b/pyproject.toml index 68d7bf0621f..83ad37ad6d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,14 +24,11 @@ requires = [ "distlib==0.4.0", "filelock==3.24.3", - "gitdb==4.0.12", - "GitPython==3.1.46", "hatchling==1.29.0", "packaging==26.0", "pathspec==1.0.4", "platformdirs==4.9.2", "pluggy==1.6.0", - "smmap==5.0.2", "tomli==2.4.0; python_version < '3.11'", "trove-classifiers==2026.1.14.14", "typing-extensions==4.15.0; python_version < '3.11'",
