Skip to content

Commit 66bf73f

Browse files
authored
Upgrade Hatch to 1.16.5 and revert virtualenv pin (#62602)
1 parent 2440d19 commit 66bf73f

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

.github/workflows/airflow-distributions-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
# Pin on virtualenv is temporary for pypa/hatch#2193
116116
run: |
117117
uv tool uninstall hatch || true
118-
uv tool install hatch==1.16.4 --with 'virtualenv<21'
118+
uv tool install hatch==1.16.5
119119
breeze release-management "${DISTRIBUTION_TYPE}" --distribution-format wheel
120120
if: ${{ matrix.python-version == inputs.default-python-version }}
121121
- name: "Verify wheel packages with twine"

dev/breeze/pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ dependencies = [
5252
"google-auth-httplib2>=0.2.0",
5353
"google-auth-oauthlib>=1.2.0",
5454
"gitpython>=3.1.40",
55-
"hatch>=1.16.4",
56-
"virtualenv<21", # Temporary pin for pypa/hatch#2193
55+
"hatch>=1.16.5",
5756
"inputimeout>=1.0.4",
5857
"jinja2>=3.1.5",
5958
"jsonschema>=4.19.1",

dev/breeze/src/airflow_breeze/commands/release_management_commands.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class VersionedFile(NamedTuple):
265265
GITPYTHON_VERSION = "3.1.46"
266266
RICH_VERSION = "14.3.3"
267267
PREK_VERSION = "0.3.3"
268-
HATCH_VERSION = "1.16.4"
268+
HATCH_VERSION = "1.16.5"
269269
PYYAML_VERSION = "6.0.3"
270270

271271
# prek environment and this is done with node, no python installation is needed.
@@ -278,8 +278,7 @@ class VersionedFile(NamedTuple):
278278
RUN --mount=type=cache,id=cache-airflow-build-dockerfile-installation,target=/root/.cache/ \
279279
uv pip install --system ignore pip=={AIRFLOW_PIP_VERSION} hatch=={HATCH_VERSION} \
280280
pyyaml=={PYYAML_VERSION} gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} \
281-
prek=={PREK_VERSION} \
282-
'virtualenv<21'
281+
prek=={PREK_VERSION}
283282
COPY . /opt/airflow
284283
"""
285284

scripts/ci/prek/upgrade_important_versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,12 +691,12 @@ def sync_breeze_lock_file() -> None:
691691

692692
def resolve_hatchling_build_requires(with_gitpython: bool = False) -> list[str]:
693693
"""
694-
Resolve the full transitive dependency list for hatchling (with virtualenv<21) using uv pip compile.
694+
Resolve the full transitive dependency list for hatchling using uv pip compile.
695695
696696
When with_gitpython is True, also includes GitPython and its transitive dependencies (gitdb, smmap).
697697
Returns a sorted list of pinned requirement strings, with tomli carrying its python_version marker.
698698
"""
699-
packages = ["hatchling", "virtualenv<21"]
699+
packages = ["hatchling"]
700700
if with_gitpython:
701701
packages.append("gitpython")
702702

0 commit comments

Comments
 (0)