Skip to content

Commit f380e6a

Browse files
committed
Use latest Pip version when building image.
The initial problem with the new PIP resolved in 20.3 version have been successfully solved. Seems that version 21.* is much more stable and actually works in all cases, so we are switching back to it. Also changed pip and wheel dependencies to ~= (compatible) version hoping that the experience of backwards incomptible release in major version update have been adopted by the PIP team with 21* series release. Closes #12838
1 parent 614be87 commit f380e6a

File tree

89 files changed

+37
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+37
-689
lines changed

CONTRIBUTING.rst

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -553,17 +553,9 @@ Airflow dependencies
553553

554554
.. note::
555555

556-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
557-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
558-
depend on your choice of extras. In order to install Airflow you might need to either downgrade
559-
pip to version 20.2.4 ``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3,
560-
you need to add option ``--use-deprecated legacy-resolver`` to your pip install command.
556+
The official way of installing Airflow is with the ``pip`` tool.
561557

562-
While ``pip 20.3.3`` solved most of the ``teething`` problems of 20.3, this note will remain here until we
563-
set ``pip 20.3`` as official version in our CI pipeline where we are testing the installation as well.
564-
Due to those constraints, only ``pip`` installation is currently officially supported.
565-
566-
While they are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
558+
While there are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
567559
`pip-tools <https://pypi.org/project/pip-tools/>`_, they do not share the same workflow as
568560
``pip`` - especially when it comes to constraint vs. requirements management.
569561
Installing via ``Poetry`` or ``pip-tools`` is not currently supported.
@@ -788,17 +780,9 @@ Pinned constraint files
788780

789781
.. note::
790782

791-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
792-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
793-
depend on your choice of extras. In order to install Airflow you might need to either downgrade
794-
pip to version 20.2.4 ``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3,
795-
you need to add option ``--use-deprecated legacy-resolver`` to your pip install command.
796-
797-
While ``pip 20.3.3`` solved most of the ``teething`` problems of 20.3, this note will remain here until we
798-
set ``pip 20.3`` as official version in our CI pipeline where we are testing the installation as well.
799-
Due to those constraints, only ``pip`` installation is currently officially supported.
783+
The official way of installing Airflow is with the ``pip`` tool.
800784

801-
While they are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
785+
While there are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
802786
`pip-tools <https://pypi.org/project/pip-tools/>`_, they do not share the same workflow as
803787
``pip`` - especially when it comes to constraint vs. requirements management.
804788
Installing via ``Poetry`` or ``pip-tools`` is not currently supported.

CONTRIBUTORS_QUICK_START.rst

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,9 @@ Setup Airflow with Breeze and PyCharm
167167

168168
.. note::
169169

170-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
171-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
172-
depend on your choice of extras. In order to install Airflow you might need to either downgrade
173-
pip to version 20.2.4 ``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3,
174-
you need to add option ``--use-deprecated legacy-resolver`` to your pip install command.
170+
The official way of installing Airflow is with the ``pip`` tool.
175171

176-
While ``pip 20.3.3`` solved most of the ``teething`` problems of 20.3, this note will remain here until we
177-
set ``pip 20.3`` as official version in our CI pipeline where we are testing the installation as well.
178-
Due to those constraints, only ``pip`` installation is currently officially supported.
179-
180-
While they are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
172+
While there are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
181173
`pip-tools <https://pypi.org/project/pip-tools/>`_, they do not share the same workflow as
182174
``pip`` - especially when it comes to constraint vs. requirements management.
183175
Installing via ``Poetry`` or ``pip-tools`` is not currently supported.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ARG CASS_DRIVER_BUILD_CONCURRENCY="8"
4646

4747
ARG PYTHON_BASE_IMAGE="python:3.6-slim-buster"
4848

49-
ARG AIRFLOW_PIP_VERSION=20.2.4
49+
ARG AIRFLOW_PIP_VERSION=21.0.1
5050

5151
# By default PIP has progress bar but you can disable it.
5252
ARG PIP_PROGRESS_BAR="on"

Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ ENV INSTALL_FROM_DOCKER_CONTEXT_FILES=${INSTALL_FROM_DOCKER_CONTEXT_FILES}
266266
ARG INSTALL_FROM_PYPI="true"
267267
ENV INSTALL_FROM_PYPI=${INSTALL_FROM_PYPI}
268268

269-
ARG AIRFLOW_PIP_VERSION=20.2.4
269+
ARG AIRFLOW_PIP_VERSION=21.0.1
270270
ENV AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION}
271271

272272
# In the CI image we always:

IMAGES.rst

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,9 @@ parameter to Breeze:
122122
123123
.. note::
124124

125-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
126-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
127-
depend on your choice of extras. In order to install Airflow you might need to either downgrade
128-
pip to version 20.2.4 ``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3,
129-
you need to add option ``--use-deprecated legacy-resolver`` to your pip install command.
125+
The official way of installing Airflow is with the ``pip`` tool.
130126

131-
While ``pip 20.3.3`` solved most of the ``teething`` problems of 20.3, this note will remain here until we
132-
set ``pip 20.3`` as official version in our CI pipeline where we are testing the installation as well.
133-
Due to those constraints, only ``pip`` installation is currently officially supported.
134-
135-
While they are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
127+
While there are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
136128
`pip-tools <https://pypi.org/project/pip-tools/>`_, they do not share the same workflow as
137129
``pip`` - especially when it comes to constraint vs. requirements management.
138130
Installing via ``Poetry`` or ``pip-tools`` is not currently supported.
@@ -673,7 +665,7 @@ The following build arguments (``--build-arg`` in docker build command) can be u
673665
| ``ADDITIONAL_RUNTIME_APT_ENV`` | | Additional env variables defined |
674666
| | | when installing runtime deps |
675667
+------------------------------------------+------------------------------------------+------------------------------------------+
676-
| ``AIRFLOW_PIP_VERSION`` | ``20.2.4`` | PIP version used. |
668+
| ``AIRFLOW_PIP_VERSION`` | ``21.0.1`` | PIP version used. |
677669
+------------------------------------------+------------------------------------------+------------------------------------------+
678670
| ``PIP_PROGRESS_BAR`` | ``on`` | Progress bar for PIP installation |
679671
+------------------------------------------+------------------------------------------+------------------------------------------+

INSTALL

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ java -jar apache-rat.jar -E ./.rat-excludes -d .
2828
python3 -m venv PATH_TO_YOUR_VENV
2929
source PATH_TO_YOUR_VENV/bin/activate
3030

31-
NOTE!!
32-
33-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
34-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
35-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
36-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
37-
``--use-deprecated legacy-resolver`` to your pip install command.
38-
3931
# [required] building and installing by pip (preferred)
4032
pip install .
4133

LOCAL_VIRTUALENV.rst

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,9 @@ Extra Packages
6363

6464
.. note::
6565

66-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
67-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
68-
depend on your choice of extras. In order to install Airflow you might need to either downgrade
69-
pip to version 20.2.4 ``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3,
70-
you need to add option ``--use-deprecated legacy-resolver`` to your pip install command.
66+
The official way of installing Airflow is with the ``pip`` tool.
7167

72-
While ``pip 20.3.3`` solved most of the ``teething`` problems of 20.3, this note will remain here until we
73-
set ``pip 20.3`` as official version in our CI pipeline where we are testing the installation as well.
74-
Due to those constraints, only ``pip`` installation is currently officially supported.
75-
76-
While they are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
68+
While there are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
7769
`pip-tools <https://pypi.org/project/pip-tools/>`_, they do not share the same workflow as
7870
``pip`` - especially when it comes to constraint vs. requirements management.
7971
Installing via ``Poetry`` or ``pip-tools`` is not currently supported.
@@ -137,17 +129,9 @@ To create and initialize the local virtualenv:
137129

138130
.. note::
139131

140-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
141-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
142-
depend on your choice of extras. In order to install Airflow you might need to either downgrade
143-
pip to version 20.2.4 ``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3,
144-
you need to add option ``--use-deprecated legacy-resolver`` to your pip install command.
145-
146-
While ``pip 20.3.3`` solved most of the ``teething`` problems of 20.3, this note will remain here until we
147-
set ``pip 20.3`` as official version in our CI pipeline where we are testing the installation as well.
148-
Due to those constraints, only ``pip`` installation is currently officially supported.
132+
The official way of installing Airflow is with the ``pip`` tool.
149133

150-
While they are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
134+
While there are some successes with using other tools like `poetry <https://python-poetry.org/>`_ or
151135
`pip-tools <https://pypi.org/project/pip-tools/>`_, they do not share the same workflow as
152136
``pip`` - especially when it comes to constraint vs. requirements management.
153137
Installing via ``Poetry`` or ``pip-tools`` is not currently supported.

README.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,9 @@ correct Airflow tag/version/branch and Python versions in the URL.
147147

148148
1. Installing just Airflow:
149149

150-
NOTE!!!
151-
152-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
153-
might work with Apache Airflow as of 20.3.3, but it might lead to errors in installation. It might
154-
depend on your choice of extras. In order to install Airflow reliably, you might need to either downgrade
155-
pip to version 20.2.4 `pip install --upgrade pip==20.2.4` or, in case you use Pip 20.3,
156-
you might need to add option] `--use-deprecated legacy-resolver` to your pip install command.
157-
While `pip 20.3.3` solved most of the `teething` problems of 20.3, this note will remain here until we
158-
set `pip 20.3` as official version in our CI pipeline where we are testing the installation as well.
159-
Due to those constraints, only `pip` installation is currently officially supported.
160-
161-
While they are some successes with using other tools like [poetry](https://python-poetry.org) or
150+
The official way of installing Airflow is with the `pip` tool.
151+
152+
While there are some successes with using other tools like [poetry](https://python-poetry.org) or
162153
[pip-tools](https://pypi.org/project/pip-tools), they do not share the same workflow as
163154
`pip` - especially when it comes to constraint vs. requirements management.
164155
Installing via `Poetry` or `pip-tools` is not currently supported.

UPDATING.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,15 +1762,6 @@ If you want to install integration for Microsoft Azure, then instead of `pip ins
17621762
you should use `pip install apache-airflow[apache.atlas]`.
17631763

17641764

1765-
NOTE!
1766-
1767-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
1768-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
1769-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
1770-
`pip install --upgrade pip==20.2.4` or, in case you use Pip 20.3, you need to add option
1771-
`--use-deprecated legacy-resolver` to your pip install command.
1772-
1773-
17741765
If you want to install integration for Microsoft Azure, then instead of
17751766

17761767
```

airflow/providers/apache/beam/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ are in `airflow.providers.apache.beam` python package.
4141

4242
## Installation
4343

44-
NOTE!
45-
46-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
47-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
48-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
49-
`pip install --upgrade pip==20.2.4` or, in case you use Pip 20.3, you need to add option
50-
`--use-deprecated legacy-resolver` to your pip install command.
51-
5244
You can install this package on top of an existing airflow 2.* installation via
5345
`pip install apache-airflow-providers-apache-beam`
5446

dev/provider_packages/PROVIDER_INDEX_TEMPLATE.rst.jinja2

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,6 @@ are in ``{{FULL_PACKAGE_NAME}}`` python package.
4747
Installation
4848
------------
4949

50-
.. note::
51-
52-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
53-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
54-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
55-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
56-
``--use-deprecated legacy-resolver`` to your pip install command.
57-
58-
5950
You can install this package on top of an existing airflow 2.* installation via
6051
``pip install {{PACKAGE_PIP_NAME}}``
6152
{%- if PIP_REQUIREMENTS %}

dev/provider_packages/PROVIDER_README_TEMPLATE.rst.jinja2

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ in the `documentation <https://airflow.apache.org/docs/{{ PACKAGE_PIP_NAME }}/{{
4444
Installation
4545
============
4646

47-
NOTE!
48-
49-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
50-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
51-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
52-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
53-
``--use-deprecated legacy-resolver`` to your pip install command.
54-
5547
You can install this package on top of an existing airflow 2.* installation via
5648
``pip install {{PACKAGE_PIP_NAME}}``
5749

docs/apache-airflow-providers-airbyte/index.rst

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ are in ``airflow.providers.airbyte`` python package.
6464
Installation
6565
------------
6666

67-
.. note::
68-
69-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
70-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
71-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
72-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
73-
``--use-deprecated legacy-resolver`` to your pip install command.
74-
75-
7667
You can install this package on top of an existing airflow 2.* installation via
7768
``pip install apache-airflow-providers-airbyte``
7869

@@ -147,15 +138,6 @@ are in ``airflow.providers.airbyte`` python package.
147138
Installation
148139
------------
149140

150-
.. note::
151-
152-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
153-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
154-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
155-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
156-
``--use-deprecated legacy-resolver`` to your pip install command.
157-
158-
159141
You can install this package on top of an existing airflow 2.* installation via
160142
``pip install apache-airflow-providers-airbyte``
161143

docs/apache-airflow-providers-amazon/index.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@ are in ``airflow.providers.amazon`` python package.
7070
Installation
7171
------------
7272

73-
.. note::
74-
75-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
76-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
77-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
78-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
79-
``--use-deprecated legacy-resolver`` to your pip install command.
80-
81-
8273
You can install this package on top of an existing airflow 2.* installation via
8374
``pip install apache-airflow-providers-amazon``
8475

docs/apache-airflow-providers-apache-beam/index.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ are in ``airflow.providers.apache.beam`` python package.
6262
Installation
6363
------------
6464

65-
.. note::
66-
67-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
68-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
69-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
70-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
71-
``--use-deprecated legacy-resolver`` to your pip install command.
72-
7365

7466
You can install this package on top of an existing airflow 2.* installation via
7567
``pip install apache-airflow-providers-apache-beam``

docs/apache-airflow-providers-apache-cassandra/index.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@ are in ``airflow.providers.apache.cassandra`` python package.
6868
Installation
6969
------------
7070

71-
.. note::
72-
73-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
74-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
75-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
76-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
77-
``--use-deprecated legacy-resolver`` to your pip install command.
78-
7971

8072
You can install this package on top of an existing airflow 2.* installation via
8173
``pip install apache-airflow-providers-apache-cassandra``

docs/apache-airflow-providers-apache-druid/index.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ are in ``airflow.providers.apache.druid`` python package.
5555
Installation
5656
------------
5757

58-
.. note::
59-
60-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
61-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
62-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
63-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
64-
``--use-deprecated legacy-resolver`` to your pip install command.
65-
6658

6759
You can install this package on top of an existing airflow 2.* installation via
6860
``pip install apache-airflow-providers-apache-druid``

docs/apache-airflow-providers-apache-hdfs/index.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ are in ``airflow.providers.apache.hdfs`` python package.
6464
Installation
6565
------------
6666

67-
.. note::
68-
69-
On November 2020, new version of PIP (20.3) has been released with a new, 2020 resolver. This resolver
70-
does not yet work with Apache Airflow and might lead to errors in installation - depends on your choice
71-
of extras. In order to install Airflow you need to either downgrade pip to version 20.2.4
72-
``pip install --upgrade pip==20.2.4`` or, in case you use Pip 20.3, you need to add option
73-
``--use-deprecated legacy-resolver`` to your pip install command.
74-
7567

7668
You can install this package on top of an existing airflow 2.* installation via
7769
``pip install apache-airflow-providers-apache-hdfs``

0 commit comments

Comments
 (0)