This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 698053784a Upgrade UV to 0.1.17 (#38019)
698053784a is described below
commit 698053784ab2893e976a827f88c2f72173e59609
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Mar 10 21:22:27 2024 +0100
Upgrade UV to 0.1.17 (#38019)
The latest UV **just** released should fix the problem introduced
in 0.1.16 that disallowed non-approved PEP keys in pyproject.toml
This PR bumps 0.1.17 as the base version for UV
---
.github/workflows/ci.yml | 2 +-
Dockerfile | 2 +-
Dockerfile.ci | 4 ++--
pyproject.toml | 2 +-
scripts/ci/pre_commit/pre_commit_update_installers.py | 5 -----
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d7a8fc5a05..041a83c420 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -642,7 +642,7 @@ jobs:
update-installers
if: always()
env:
- UPGRADE_UV: "false"
+ UPGRADE_UV: "true"
- name: "Run automated upgrade for chart dependencies"
run: >
pre-commit run
diff --git a/Dockerfile b/Dockerfile
index a4f2a6e1f0..10f19f6188 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,7 @@ ARG AIRFLOW_VERSION="2.8.2"
ARG PYTHON_BASE_IMAGE="python:3.8-slim-bookworm"
ARG AIRFLOW_PIP_VERSION=24.0
-ARG AIRFLOW_UV_VERSION=0.1.15
+ARG AIRFLOW_UV_VERSION=0.1.17
ARG AIRFLOW_USE_UV="false"
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow";
ARG
AIRFLOW_IMAGE_README_URL="https://raw.githubusercontent.com/apache/airflow/main/docs/docker-stack/README.md";
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 7c8ccd5359..739a96a7d0 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1203,7 +1203,7 @@ ARG DEFAULT_CONSTRAINTS_BRANCH="constraints-main"
ARG AIRFLOW_CI_BUILD_EPOCH="10"
ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true"
ARG AIRFLOW_PIP_VERSION=24.0
-ARG AIRFLOW_UV_VERSION=0.1.15
+ARG AIRFLOW_UV_VERSION=0.1.17
ARG AIRFLOW_USE_UV="true"
# Setup PIP
# By default PIP install run without cache to make image smaller
@@ -1226,7 +1226,7 @@ ARG AIRFLOW_VERSION=""
ARG ADDITIONAL_PIP_INSTALL_FLAGS=""
ARG AIRFLOW_PIP_VERSION=24.0
-ARG AIRFLOW_UV_VERSION=0.1.15
+ARG AIRFLOW_UV_VERSION=0.1.17
ARG AIRFLOW_USE_UV="true"
ENV AIRFLOW_REPO=${AIRFLOW_REPO}\
diff --git a/pyproject.toml b/pyproject.toml
index 8c17afdde2..880731a4c9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -242,7 +242,7 @@ statsd = [
"statsd>=3.3.0",
]
uv = [
- "uv>=0.1.15",
+ "uv>=0.1.17",
]
virtualenv = [
"virtualenv",
diff --git a/scripts/ci/pre_commit/pre_commit_update_installers.py
b/scripts/ci/pre_commit/pre_commit_update_installers.py
index 3a44a3c494..863dad06db 100755
--- a/scripts/ci/pre_commit/pre_commit_update_installers.py
+++ b/scripts/ci/pre_commit/pre_commit_update_installers.py
@@ -47,11 +47,6 @@ PIP_PATTERN = re.compile(r"AIRFLOW_PIP_VERSION=[0-9.]+")
UV_PATTERN = re.compile(r"AIRFLOW_UV_VERSION=[0-9.]+")
UV_GREATER_PATTERN = re.compile(r'"uv>=[0-9]+[0-9.]+"')
-# For now we temporarily disable upgrading uv in the pre-commit hook because
the latest version (0.1.16)
-# is not compatible with our pyproject.toml using Draft
https://peps.python.org/pep-0639/
-# licence-files key (which hatchling backend already supports nicely)
-# We will re-enable it once the problem is addressed:
-# Issue: https://github.com/astral-sh/uv/issues/2302
UPGRADE_UV: bool = os.environ.get("UPGRADE_UV", "true").lower() == "true"
if __name__ == "__main__":
