Skip to content

Commit 3eeec4a

Browse files
committed
[v2-10-test] Workaround Python 3.8 alibabacloud issue
Alibabacloud 1.0 has a confusing setup.py where it changes dependencies dynamically based on sys.version.minor and it confuses installers - uv installs appsheduler 3.11 for Python 3.8 where pip expects < 3.11 We upgrade both `pip` and `uv` to latest versions and add manual protection to avoid this from happening. Also celery integration tests are not valid with the last celery version. The test was supposed to be run with latest provider and it should not be part of core integration tests.
1 parent 2b05b1c commit 3eeec4a

19 files changed

+175
-263
lines changed

.github/actions/install-pre-commit/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ inputs:
2424
default: "3.9"
2525
uv-version:
2626
description: 'uv version to use'
27-
default: "0.5.24" # Keep this comment to allow automatic replacement of uv version
27+
default: "0.6.14" # Keep this comment to allow automatic replacement of uv version
2828
pre-commit-version:
2929
description: 'pre-commit version to use'
3030
default: "3.5.0" # Keep this comment to allow automatic replacement of pre-commit 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.8-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.0
56+
ARG AIRFLOW_PIP_VERSION=25.0.1
5757
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
58-
ARG AIRFLOW_UV_VERSION=0.5.24
58+
ARG AIRFLOW_UV_VERSION=0.6.14
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ function check_boto_upgrade() {
911911
set -x
912912
# shellcheck disable=SC2086
913913
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore \
914-
"oss2>=2.14.0" "cryptography<43.0.0" "requests!=2.32.*,<3.0.0,>=2.24.0"
914+
"oss2>=2.14.0" "cryptography<43.0.0" "requests!=2.32.0,!=2.32.1,!=2.32.2,<3.0.0,>=2.24.0"
915915
set +x
916916
pip check
917917
}
@@ -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.0
1252+
ARG AIRFLOW_PIP_VERSION=25.0.1
12531253
# ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
1254-
ARG AIRFLOW_UV_VERSION=0.5.24
1254+
ARG AIRFLOW_UV_VERSION=0.6.14
12551255
# TODO(potiuk): automate with upgrade check (possibly)
12561256
ARG AIRFLOW_PRE_COMMIT_VERSION="3.5.0"
12571257

airflow/providers/alibaba/provider.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ dependencies:
5353
- oss2>=2.14.0
5454
- alibabacloud_adb20211201>=1.0.0
5555
- alibabacloud_tea_openapi>=0.3.7
56+
- apscheduler<3.11.0; python_version >= "3.8"
5657

5758
integrations:
5859
- integration-name: Alibaba Cloud OSS

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.0` | `pip` version used. |
446-
| `AIRFLOW_UV_VERSION` | `0.5.24` | `uv` version used. |
445+
| `AIRFLOW_PIP_VERSION` | `25.0.1` | `pip` version used. |
446+
| `AIRFLOW_UV_VERSION` | `0.6.14` | `uv` version used. |
447447
| `AIRFLOW_PRE_COMMIT_VERSION` | `3.5.0` | `pre-commit` 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/doc/images/output-commands.svg

Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)