Skip to content

Commit 5cd78cf

Browse files
authored
Upgrade dependencies in order to avoid backtracking (#27531)
Seems that the new `pip` have become a little more relaxed when it comes to looking for dependencies, and we need to make sure that version constraint is specified in every extra otherwise it might have hard time finding the right set of dependencies while running "eager upgrade". Over the last few days all our main builds failed because of that as pip was backtracking when performing eager upgrade.. This PR updates various dependencies to get rid of the backtracking, following the process described in the https://github.com/apache/airflow/blob/main/dev/TRACKING_BACKTRACKING_ISSUES.md
1 parent 2462d57 commit 5cd78cf

File tree

13 files changed

+26
-19
lines changed

13 files changed

+26
-19
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ARG AIRFLOW_VERSION="2.4.2"
4848

4949
ARG PYTHON_BASE_IMAGE="python:3.7-slim-bullseye"
5050

51-
ARG AIRFLOW_PIP_VERSION=22.3
51+
ARG AIRFLOW_PIP_VERSION=22.3.1
5252
ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"
5353
ARG AIRFLOW_IMAGE_README_URL="https://raw.githubusercontent.com/apache/airflow/main/docs/docker-stack/README.md"
5454

@@ -422,7 +422,7 @@ function common::get_airflow_version_specification() {
422422
function common::override_pip_version_if_needed() {
423423
if [[ -n ${AIRFLOW_VERSION} ]]; then
424424
if [[ ${AIRFLOW_VERSION} =~ ^2\.0.* || ${AIRFLOW_VERSION} =~ ^1\.* ]]; then
425-
export AIRFLOW_PIP_VERSION="22.3"
425+
export AIRFLOW_PIP_VERSION="22.3.1"
426426
fi
427427
fi
428428
}

Dockerfile.ci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ function common::get_airflow_version_specification() {
382382
function common::override_pip_version_if_needed() {
383383
if [[ -n ${AIRFLOW_VERSION} ]]; then
384384
if [[ ${AIRFLOW_VERSION} =~ ^2\.0.* || ${AIRFLOW_VERSION} =~ ^1\.* ]]; then
385-
export AIRFLOW_PIP_VERSION="22.3"
385+
export AIRFLOW_PIP_VERSION="22.3.1"
386386
fi
387387
fi
388388
}
@@ -1093,7 +1093,7 @@ ARG AIRFLOW_CI_BUILD_EPOCH="3"
10931093
ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true"
10941094
# By default in the image, we are installing all providers when installing from sources
10951095
ARG INSTALL_PROVIDERS_FROM_SOURCES="true"
1096-
ARG AIRFLOW_PIP_VERSION=22.3
1096+
ARG AIRFLOW_PIP_VERSION=22.3.1
10971097
# Setup PIP
10981098
# By default PIP install run without cache to make image smaller
10991099
ARG PIP_NO_CACHE_DIR="true"

IMAGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ The following build arguments (``--build-arg`` in docker build command) can be u
457457
| ``ADDITIONAL_DEV_APT_ENV`` | | Additional env variables defined |
458458
| | | when installing dev deps |
459459
+------------------------------------------+------------------------------------------+------------------------------------------+
460-
| ``AIRFLOW_PIP_VERSION`` | ``22.3`` | PIP version used. |
460+
| ``AIRFLOW_PIP_VERSION`` | ``22.3.1`` | PIP version used. |
461461
+------------------------------------------+------------------------------------------+------------------------------------------+
462462
| ``PIP_PROGRESS_BAR`` | ``on`` | Progress bar for PIP installation |
463463
+------------------------------------------+------------------------------------------+------------------------------------------+

airflow/providers/amazon/provider.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ versions:
4848
dependencies:
4949
- apache-airflow>=2.3.0
5050
- apache-airflow-providers-common-sql>=1.3.0
51-
- boto3>=1.15.0
51+
- boto3>=1.24.0
5252
# watchtower 3 has been released end Jan and introduced breaking change across the board that might
5353
# change logging behaviour:
5454
# https://github.com/kislyuk/watchtower/blob/develop/Changes.rst#changes-for-v300-2022-01-26
@@ -58,9 +58,9 @@ dependencies:
5858
- redshift_connector>=2.0.888
5959
- sqlalchemy_redshift>=0.8.6
6060
- pandas>=0.17.1
61-
- mypy-boto3-rds>=1.21.0
62-
- mypy-boto3-redshift-data>=1.21.0
63-
- mypy-boto3-appflow>=1.21.0
61+
- mypy-boto3-rds>=1.24.0
62+
- mypy-boto3-redshift-data>=1.24.0
63+
- mypy-boto3-appflow>=1.24.0
6464

6565
integrations:
6666
- integration-name: Amazon Athena

airflow/providers/google/provider.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ dependencies:
6666
# TODO: Upgrade all Google libraries that are limited to <2.0.0
6767
- PyOpenSSL
6868
- asgiref>=3.5.2
69+
- gcloud_aio_auth>=4.0.0
6970
- gcloud-aio-bigquery>=6.1.2
7071
- gcloud-aio-storage
7172
- google-ads>=15.1.1

airflow/providers/microsoft/azure/provider.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ dependencies:
6464
# Limited due to https://github.com/Azure/azure-uamqp-python/issues/191
6565
- azure-servicebus>=7.6.1; platform_machine != "aarch64"
6666
- azure-synapse-spark
67+
- adal>=.1.2.7
6768

6869
integrations:
6970
- integration-name: Microsoft Azure Batch

dev/breeze/src/airflow_breeze/global_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
ALLOWED_MYSQL_VERSIONS = ["5.7", "8"]
7575
ALLOWED_MSSQL_VERSIONS = ["2017-latest", "2019-latest"]
7676

77-
PIP_VERSION = "22.3"
77+
PIP_VERSION = "22.3.1"
7878

7979

8080
@lru_cache(maxsize=None)

dev/breeze/src/airflow_breeze/utils/find_newer_dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def find_newer_dependencies(
9292
get_console().print("[info]Use the following pip install command (see the doc above for details)\n")
9393
get_console().print(
9494
'pip install ".[devel_all]" --upgrade --upgrade-strategy eager '
95-
'"dill<0.3.3" "certifi<2021.0.0"' + constraint_string,
95+
'"dill<0.3.3" "pyarrow>=6.0.0" "protobuf<4.21.0"' + constraint_string,
9696
markup=False,
9797
soft_wrap=True,
9898
)

docs/docker-stack/build-arg-ref.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Those are the most common arguments that you use when you want to build a custom
4545
+------------------------------------------+------------------------------------------+---------------------------------------------+
4646
| ``AIRFLOW_USER_HOME_DIR`` | ``/home/airflow`` | Home directory of the Airflow user. |
4747
+------------------------------------------+------------------------------------------+---------------------------------------------+
48-
| ``AIRFLOW_PIP_VERSION`` | ``22.3`` | PIP version used. |
48+
| ``AIRFLOW_PIP_VERSION`` | ``22.3.1`` | PIP version used. |
4949
+------------------------------------------+------------------------------------------+---------------------------------------------+
5050
| ``ADDITIONAL_PIP_INSTALL_FLAGS`` | | additional ``pip`` flags passed to the |
5151
| | | installation commands (except when |

generated/provider_dependencies.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"deps": [
2020
"apache-airflow-providers-common-sql>=1.3.0",
2121
"apache-airflow>=2.3.0",
22-
"boto3>=1.15.0",
22+
"boto3>=1.24.0",
2323
"jsonpath_ng>=1.5.3",
24-
"mypy-boto3-appflow>=1.21.0",
25-
"mypy-boto3-rds>=1.21.0",
26-
"mypy-boto3-redshift-data>=1.21.0",
24+
"mypy-boto3-appflow>=1.24.0",
25+
"mypy-boto3-rds>=1.24.0",
26+
"mypy-boto3-redshift-data>=1.24.0",
2727
"pandas>=0.17.1",
2828
"redshift_connector>=2.0.888",
2929
"sqlalchemy_redshift>=0.8.6",
@@ -305,6 +305,7 @@
305305
"asgiref>=3.5.2",
306306
"gcloud-aio-bigquery>=6.1.2",
307307
"gcloud-aio-storage",
308+
"gcloud_aio_auth>=4.0.0",
308309
"google-ads>=15.1.1",
309310
"google-api-core>=2.7.0,<3.0.0",
310311
"google-api-python-client>=1.6.0,<2.0.0",
@@ -426,6 +427,7 @@
426427
},
427428
"microsoft.azure": {
428429
"deps": [
430+
"adal>=.1.2.7",
429431
"apache-airflow>=2.3.0",
430432
"azure-batch>=8.0.0",
431433
"azure-cosmos>=4.0.0",

0 commit comments

Comments
 (0)