Skip to content

Commit 917ae56

Browse files
authored
Upgrade to latest released build dependencies (#62613)
This reverts commit 34fb41e.
1 parent b75f131 commit 917ae56

11 files changed

Lines changed: 25 additions & 30 deletions

File tree

.github/actions/install-prek/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ inputs:
2424
default: "3.10"
2525
uv-version:
2626
description: 'uv version to use'
27-
default: "0.9.11" # Keep this comment to allow automatic replacement of uv version
27+
default: "0.10.7" # Keep this comment to allow automatic replacement of uv version
2828
prek-version:
2929
description: 'prek version to use'
3030
default: "0.3.2" # Keep this comment to allow automatic replacement of prek version

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ ARG PYTHON_BASE_IMAGE="python:3.9-slim-bookworm"
5353
# You can swap comments between those two args to test pip from the main version
5454
# When you attempt to test if the version of `pip` from specified branch works for our builds
5555
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
56-
ARG AIRFLOW_PIP_VERSION=25.3
56+
ARG AIRFLOW_PIP_VERSION=26.0.1
5757
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
58-
ARG AIRFLOW_UV_VERSION=0.9.11
58+
ARG AIRFLOW_UV_VERSION=0.10.7
5959
ARG AIRFLOW_USE_UV="false"
6060
ARG UV_HTTP_TIMEOUT="300"
6161
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"

Dockerfile.ci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,9 +1249,9 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
12491249
# You can swap comments between those two args to test pip from the main version
12501250
# When you attempt to test if the version of `pip` from specified branch works for our builds
12511251
# Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
1252-
ARG AIRFLOW_PIP_VERSION=25.3
1252+
ARG AIRFLOW_PIP_VERSION=26.0.1
12531253
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
1254-
ARG AIRFLOW_UV_VERSION=0.9.11
1254+
ARG AIRFLOW_UV_VERSION=0.10.7
12551255
# TODO(potiuk): automate with upgrade check (possibly)
12561256
ARG AIRFLOW_PREK_VERSION="0.3.2"
12571257

dev/breeze/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@ PLEASE DO NOT MODIFY THE HASH BELOW! IT IS AUTOMATICALLY UPDATED BY PRE-COMMIT.
128128

129129
---------------------------------------------------------------------------------------------------------
130130

131-
Package config hash: 05d02d507f75f5dacea7774487482ac2d66130d89da112db0bd1c581a509da38082dfeda6aea41e8d204a82919c4987dc0fa3daa2b82ce1981c354ff112254a4
131+
Package config hash: 123045caf6ca2fad10f1bbf238ccaffa45e38406b699c2afc8f33d5defd231ddde02467fe354ba4af0f3ee6da2cf04c70afe025775a7f9afcfde89ecab85bd64
132132

133133
---------------------------------------------------------------------------------------------------------

dev/breeze/doc/ci/02_images.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ can be used for CI images:
442442
| `DEV_APT_DEPS` | | Dev APT dependencies installed in the first part of the image (default empty means default dependencies are used) |
443443
| `ADDITIONAL_DEV_APT_DEPS` | | Additional apt dev dependencies installed in the first part of the image |
444444
| `ADDITIONAL_DEV_APT_ENV` | | Additional env variables defined when installing dev deps |
445-
| `AIRFLOW_PIP_VERSION` | `25.3` | `pip` version used. |
446-
| `AIRFLOW_UV_VERSION` | `0.9.11` | `uv` version used. |
445+
| `AIRFLOW_PIP_VERSION` | `26.0.1` | `pip` version used. |
446+
| `AIRFLOW_UV_VERSION` | `0.10.7` | `uv` version used. |
447447
| `AIRFLOW_PREK_VERSION` | `0.3.2` | `prel` version used. |
448448
| `AIRFLOW_USE_UV` | `true` | Whether to use UV for installation. |
449449
| `PIP_PROGRESS_BAR` | `on` | Progress bar for PIP installation |

dev/breeze/pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies = [
5454
"google-auth-httplib2>=0.2.0",
5555
"google-auth-oauthlib>=1.2.0",
5656
"gitpython>=3.1.40",
57-
"hatch>=1.14.1",
57+
"hatch>=1.16.5",
5858
"inputimeout>=1.0.4",
5959
"jinja2>=3.1.5",
6060
"jsonschema>=4.19.1",
@@ -76,8 +76,7 @@ dependencies = [
7676
"twine>=4.0.2",
7777
"tqdm>=4.67.1",
7878
"boto3>=1.34.90",
79-
"semver>=3.0.4",
80-
"virtualenv<21" # Temporary pin for https://github.com/pypa/hatch/issues/2193
79+
"semver>=3.0.4"
8180
]
8281

8382
[project.scripts]

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,24 +232,23 @@ class VersionedFile(NamedTuple):
232232
file_name: str
233233

234234

235-
AIRFLOW_PIP_VERSION = "25.3"
236-
AIRFLOW_UV_VERSION = "0.9.11"
235+
AIRFLOW_PIP_VERSION = "26.0.1"
236+
AIRFLOW_UV_VERSION = "0.10.7"
237237
AIRFLOW_USE_UV = False
238238
# TODO: automate these as well
239-
WHEEL_VERSION = "0.44.0"
240-
GITPYTHON_VERSION = "3.1.43"
241-
RICH_VERSION = "13.9.4"
242-
NODE_VERSION = "22.2.0"
239+
WHEEL_VERSION = "0.46.3"
240+
GITPYTHON_VERSION = "3.1.46"
241+
RICH_VERSION = "14.3.3"
242+
NODE_VERSION = "22.22.0"
243243
PREK_VERSION = "0.3.2"
244-
HATCH_VERSION = "1.13.0"
245-
PYYAML_VERSION = "6.0.2"
244+
HATCH_VERSION = "1.16.5"
245+
PYYAML_VERSION = "6.0.3"
246246

247247
AIRFLOW_BUILD_DOCKERFILE = f"""
248248
FROM python:{DEFAULT_PYTHON_MAJOR_MINOR_VERSION}-slim-{ALLOWED_DEBIAN_VERSIONS[0]}
249249
RUN apt-get update && apt-get install -y --no-install-recommends git
250250
RUN pip install --root-user-action ignore pip=={AIRFLOW_PIP_VERSION} hatch=={HATCH_VERSION} pyyaml=={PYYAML_VERSION}\
251-
gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} prek=={PREK_VERSION} \
252-
"virtualenv<21" # Temporary pin for https://github.com/pypa/hatch/issues/2193
251+
gitpython=={GITPYTHON_VERSION} rich=={RICH_VERSION} prek=={PREK_VERSION}
253252
COPY . /opt/airflow
254253
"""
255254

dev/breeze/src/airflow_breeze/global_constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@
186186

187187
ALLOWED_INSTALL_MYSQL_CLIENT_TYPES = ["mariadb", "mysql"]
188188

189-
PIP_VERSION = "25.3"
190-
UV_VERSION = "0.9.11"
189+
PIP_VERSION = "26.0.1"
190+
UV_VERSION = "0.10.7"
191191

192192
DEFAULT_UV_HTTP_TIMEOUT = 300
193193
DEFAULT_WSL2_HTTP_TIMEOUT = 900

hatch_build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
"uv>=0.1.32",
151151
],
152152
"virtualenv": [
153-
"virtualenv<21", # Temporary pin for https://github.com/pypa/hatch/issues/2193
153+
"virtualenv",
154154
],
155155
}
156156

@@ -197,7 +197,7 @@
197197
"devel-devscripts": [
198198
"click>=8.0",
199199
"gitpython>=3.1.40",
200-
"hatch>=1.9.1",
200+
"hatch>=1.16.5",
201201
# Incremental 24.7.0, 24.7.1 has broken `python -m virtualenv` command when run in /opt/airflow directory
202202
"incremental!=24.7.0,!=24.7.1,>=22.10.0",
203203
"pipdeptree>=2.13.1",

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@
2424
requires = [
2525
"distlib==0.4.0",
2626
"filelock==3.24.3",
27-
"gitdb==4.0.12",
28-
"GitPython==3.1.46",
2927
"hatchling==1.29.0",
3028
"packaging==26.0",
3129
"pathspec==1.0.4",
3230
"platformdirs==4.9.2",
3331
"pluggy==1.6.0",
34-
"smmap==5.0.2",
3532
"tomli==2.4.0; python_version < '3.11'",
3633
"trove-classifiers==2026.1.14.14",
3734
"typing-extensions==4.15.0; python_version < '3.11'",

0 commit comments

Comments
 (0)