This is an automated email from the ASF dual-hosted git repository.
pierrejeambrun pushed a commit to branch v2-5-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v2-5-test by this push:
new 8def408720 Update Airflow version to 2.5.3
8def408720 is described below
commit 8def408720b93c8fa38b803a9d5e829d75b757f3
Author: pierrejeambrun <[email protected]>
AuthorDate: Fri Mar 24 17:58:52 2023 +0100
Update Airflow version to 2.5.3
---
README.md | 14 +++++++-------
airflow/api_connexion/openapi/v1.yaml | 2 +-
airflow/utils/db.py | 3 +--
docs/apache-airflow/howto/docker-compose/index.rst | 4 ++--
docs/apache-airflow/installation/supported-versions.rst | 2 +-
docs/docker-stack/README.md | 10 +++++-----
.../docker-examples/extending/add-apt-packages/Dockerfile | 2 +-
.../extending/add-build-essential-extend/Dockerfile | 2 +-
.../docker-examples/extending/add-providers/Dockerfile | 2 +-
.../docker-examples/extending/add-pypi-packages/Dockerfile | 2 +-
.../extending/add-requirement-packages/Dockerfile | 2 +-
.../docker-examples/extending/custom-providers/Dockerfile | 2 +-
.../docker-examples/extending/embedding-dags/Dockerfile | 2 +-
.../extending/writable-directory/Dockerfile | 2 +-
docs/docker-stack/entrypoint.rst | 14 +++++++-------
scripts/ci/pre_commit/pre_commit_supported_versions.py | 2 +-
setup.py | 2 +-
17 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/README.md b/README.md
index bff83c5a39..8396ec9b6c 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ Airflow is not a streaming solution, but it is often used to
process real-time d
Apache Airflow is tested with:
-| | Main version (dev) | Stable version (2.5.2)
|
+| | Main version (dev) | Stable version (2.5.3)
|
|---------------------|------------------------------|------------------------------|
| Python | 3.7, 3.8, 3.9, 3.10 | 3.7, 3.8, 3.9, 3.10
|
| Platform | AMD64/ARM64(\*) | AMD64/ARM64(\*)
|
@@ -158,15 +158,15 @@ them to the appropriate format and workflow that your
tool requires.
```bash
-pip install 'apache-airflow==2.5.2' \
- --constraint
"https://raw.githubusercontent.com/apache/airflow/constraints-2.5.2/constraints-3.7.txt";
+pip install 'apache-airflow==2.5.3' \
+ --constraint
"https://raw.githubusercontent.com/apache/airflow/constraints-2.5.3/constraints-3.7.txt";
```
2. Installing with extras (i.e., postgres, google)
```bash
-pip install 'apache-airflow[postgres,google]==2.5.2' \
- --constraint
"https://raw.githubusercontent.com/apache/airflow/constraints-2.5.2/constraints-3.7.txt";
+pip install 'apache-airflow[postgres,google]==2.5.3' \
+ --constraint
"https://raw.githubusercontent.com/apache/airflow/constraints-2.5.3/constraints-3.7.txt";
```
For information on installing provider packages, check
@@ -275,7 +275,7 @@ Apache Airflow version life cycle:
| Version | Current Patch/Minor | State | First Release | Limited
Support | EOL/Terminated |
|-----------|-----------------------|-----------|-----------------|-------------------|------------------|
-| 2 | 2.5.2 | Supported | Dec 17, 2020 | TBD
| TBD |
+| 2 | 2.5.3 | Supported | Dec 17, 2020 | TBD
| TBD |
| 1.10 | 1.10.15 | EOL | Aug 27, 2018 | Dec 17,
2020 | June 17, 2021 |
| 1.9 | 1.9.0 | EOL | Jan 03, 2018 | Aug 27,
2018 | Aug 27, 2018 |
| 1.8 | 1.8.2 | EOL | Mar 19, 2017 | Jan 03,
2018 | Jan 03, 2018 |
@@ -305,7 +305,7 @@ They are based on the official release schedule of Python
and Kubernetes, nicely
2. The "oldest" supported version of Python/Kubernetes is the default one
until we decide to switch to
later version. "Default" is only meaningful in terms of "smoke tests" in CI
PRs, which are run using this
default version and the default reference image available. Currently
`apache/airflow:latest`
- and `apache/airflow:2.5.2` images are Python 3.7 images. This means that
default reference image will
+ and `apache/airflow:2.5.3` images are Python 3.7 images. This means that
default reference image will
become the default at the time when we start preparing for dropping 3.7
support which is few months
before the end of life for Python 3.7.
diff --git a/airflow/api_connexion/openapi/v1.yaml
b/airflow/api_connexion/openapi/v1.yaml
index db5609a0d6..1938761773 100644
--- a/airflow/api_connexion/openapi/v1.yaml
+++ b/airflow/api_connexion/openapi/v1.yaml
@@ -229,7 +229,7 @@ info:
This means that the server encountered an unexpected condition that
prevented it from
fulfilling the request.
- version: '2.5.2'
+ version: '2.5.3'
license:
name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/airflow/utils/db.py b/airflow/utils/db.py
index 4307f0850a..0e06c80f0a 100644
--- a/airflow/utils/db.py
+++ b/airflow/utils/db.py
@@ -78,6 +78,7 @@ REVISION_HEADS_MAP = {
"2.5.0": "290244fb8b83",
"2.5.1": "290244fb8b83",
"2.5.2": "290244fb8b83",
+ "2.5.3": "290244fb8b83",
}
@@ -769,7 +770,6 @@ def _configured_alembic_environment() ->
Generator[EnvironmentContext, None, Non
config,
script,
) as env, settings.engine.connect() as connection:
-
alembic_logger = logging.getLogger("alembic")
level = alembic_logger.level
alembic_logger.setLevel(logging.WARNING)
@@ -1168,7 +1168,6 @@ def _create_table_as(
def _move_dangling_data_to_new_table(
session, source_table: Table, source_query: Query, target_table_name: str
):
-
bind = session.get_bind()
dialect_name = bind.dialect.name
diff --git a/docs/apache-airflow/howto/docker-compose/index.rst
b/docs/apache-airflow/howto/docker-compose/index.rst
index 928f276680..8fe7d3c6ca 100644
--- a/docs/apache-airflow/howto/docker-compose/index.rst
+++ b/docs/apache-airflow/howto/docker-compose/index.rst
@@ -288,14 +288,14 @@ you should do those steps:
to (use correct image tag):
```
-#image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.5.2}
+#image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.5.3}
build: .
```
2) Create ``Dockerfile`` in the same folder your ``docker-compose.yaml`` file
is with content similar to:
```
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
ADD requirements.txt .
RUN pip install -r requirements.txt
```
diff --git a/docs/apache-airflow/installation/supported-versions.rst
b/docs/apache-airflow/installation/supported-versions.rst
index cf8c4a08a3..26aa171640 100644
--- a/docs/apache-airflow/installation/supported-versions.rst
+++ b/docs/apache-airflow/installation/supported-versions.rst
@@ -29,7 +29,7 @@ Apache Airflow version life cycle:
========= ===================== ========= ===============
================= ================
Version Current Patch/Minor State First Release Limited Support
EOL/Terminated
========= ===================== ========= ===============
================= ================
-2 2.5.2 Supported Dec 17, 2020 TBD
TBD
+2 2.5.3 Supported Dec 17, 2020 TBD
TBD
1.10 1.10.15 EOL Aug 27, 2018 Dec 17, 2020
June 17, 2021
1.9 1.9.0 EOL Jan 03, 2018 Aug 27, 2018
Aug 27, 2018
1.8 1.8.2 EOL Mar 19, 2017 Jan 03, 2018
Jan 03, 2018
diff --git a/docs/docker-stack/README.md b/docs/docker-stack/README.md
index 546ff32e3e..1efea1c618 100644
--- a/docs/docker-stack/README.md
+++ b/docs/docker-stack/README.md
@@ -31,12 +31,12 @@ Every time a new version of Airflow is released, the images
are prepared in the
[apache/airflow DockerHub](https://hub.docker.com/r/apache/airflow)
for all the supported Python versions.
-You can find the following images there (Assuming Airflow version `2.5.2`):
+You can find the following images there (Assuming Airflow version `2.5.3`):
* `apache/airflow:latest` - the latest released Airflow image with default
Python version (3.7 currently)
* `apache/airflow:latest-pythonX.Y` - the latest released Airflow image with
specific Python version
-* `apache/airflow:2.5.2` - the versioned Airflow image with default Python
version (3.7 currently)
-* `apache/airflow:2.5.2-pythonX.Y` - the versioned Airflow image with specific
Python version
+* `apache/airflow:2.5.3` - the versioned Airflow image with default Python
version (3.7 currently)
+* `apache/airflow:2.5.3-pythonX.Y` - the versioned Airflow image with specific
Python version
Those are "reference" regular images. They contain the most common set of
extras, dependencies and providers that are
often used by the users and they are good to "try-things-out" when you want to
just take Airflow for a spin,
@@ -47,8 +47,8 @@ via [Building the
image](https://airflow.apache.org/docs/docker-stack/build.html
* `apache/airflow:slim-latest` - the latest released Airflow
image with default Python version (3.7 currently)
* `apache/airflow:slim-latest-pythonX.Y` - the latest released Airflow
image with specific Python version
-* `apache/airflow:slim-2.5.2` - the versioned Airflow image with
default Python version (3.7 currently)
-* `apache/airflow:slim-2.5.2-pythonX.Y` - the versioned Airflow image with
specific Python version
+* `apache/airflow:slim-2.5.3` - the versioned Airflow image with
default Python version (3.7 currently)
+* `apache/airflow:slim-2.5.3-pythonX.Y` - the versioned Airflow image with
specific Python version
The Apache Airflow image provided as convenience package is optimized for
size, and
it provides just a bare minimal set of the extras and dependencies installed
and in most cases
diff --git
a/docs/docker-stack/docker-examples/extending/add-apt-packages/Dockerfile
b/docs/docker-stack/docker-examples/extending/add-apt-packages/Dockerfile
index 73f0c0ac13..f2916a8abf 100644
--- a/docs/docker-stack/docker-examples/extending/add-apt-packages/Dockerfile
+++ b/docs/docker-stack/docker-examples/extending/add-apt-packages/Dockerfile
@@ -15,7 +15,7 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
USER root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
diff --git
a/docs/docker-stack/docker-examples/extending/add-build-essential-extend/Dockerfile
b/docs/docker-stack/docker-examples/extending/add-build-essential-extend/Dockerfile
index c061aff942..323ff3c05c 100644
---
a/docs/docker-stack/docker-examples/extending/add-build-essential-extend/Dockerfile
+++
b/docs/docker-stack/docker-examples/extending/add-build-essential-extend/Dockerfile
@@ -15,7 +15,7 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
USER root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
diff --git
a/docs/docker-stack/docker-examples/extending/add-providers/Dockerfile
b/docs/docker-stack/docker-examples/extending/add-providers/Dockerfile
index fc736ca4e7..02ba985c59 100644
--- a/docs/docker-stack/docker-examples/extending/add-providers/Dockerfile
+++ b/docs/docker-stack/docker-examples/extending/add-providers/Dockerfile
@@ -15,7 +15,7 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
USER root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
diff --git
a/docs/docker-stack/docker-examples/extending/add-pypi-packages/Dockerfile
b/docs/docker-stack/docker-examples/extending/add-pypi-packages/Dockerfile
index a2bf47d4e5..d1fd6ad68c 100644
--- a/docs/docker-stack/docker-examples/extending/add-pypi-packages/Dockerfile
+++ b/docs/docker-stack/docker-examples/extending/add-pypi-packages/Dockerfile
@@ -15,6 +15,6 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
RUN pip install --no-cache-dir lxml
# [END Dockerfile]
diff --git
a/docs/docker-stack/docker-examples/extending/add-requirement-packages/Dockerfile
b/docs/docker-stack/docker-examples/extending/add-requirement-packages/Dockerfile
index 4512e05a31..95ba1c877b 100644
---
a/docs/docker-stack/docker-examples/extending/add-requirement-packages/Dockerfile
+++
b/docs/docker-stack/docker-examples/extending/add-requirement-packages/Dockerfile
@@ -15,7 +15,7 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
COPY requirements.txt /
RUN pip install --no-cache-dir -r /requirements.txt
# [END Dockerfile]
diff --git
a/docs/docker-stack/docker-examples/extending/custom-providers/Dockerfile
b/docs/docker-stack/docker-examples/extending/custom-providers/Dockerfile
index cb7eeca79a..b49b3de7d5 100644
--- a/docs/docker-stack/docker-examples/extending/custom-providers/Dockerfile
+++ b/docs/docker-stack/docker-examples/extending/custom-providers/Dockerfile
@@ -15,6 +15,6 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
RUN pip install --no-cache-dir apache-airflow-providers-docker==2.5.1
# [END Dockerfile]
diff --git
a/docs/docker-stack/docker-examples/extending/embedding-dags/Dockerfile
b/docs/docker-stack/docker-examples/extending/embedding-dags/Dockerfile
index f7d67ab0fc..96572a1819 100644
--- a/docs/docker-stack/docker-examples/extending/embedding-dags/Dockerfile
+++ b/docs/docker-stack/docker-examples/extending/embedding-dags/Dockerfile
@@ -15,7 +15,7 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
COPY --chown=airflow:root test_dag.py /opt/airflow/dags
diff --git
a/docs/docker-stack/docker-examples/extending/writable-directory/Dockerfile
b/docs/docker-stack/docker-examples/extending/writable-directory/Dockerfile
index cc7a911a18..bdd5dd9f63 100644
--- a/docs/docker-stack/docker-examples/extending/writable-directory/Dockerfile
+++ b/docs/docker-stack/docker-examples/extending/writable-directory/Dockerfile
@@ -15,7 +15,7 @@
# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
-FROM apache/airflow:2.5.2
+FROM apache/airflow:2.5.3
RUN umask 0002; \
mkdir -p ~/writeable-directory
# [END Dockerfile]
diff --git a/docs/docker-stack/entrypoint.rst b/docs/docker-stack/entrypoint.rst
index 3470444b37..9979ea4deb 100644
--- a/docs/docker-stack/entrypoint.rst
+++ b/docs/docker-stack/entrypoint.rst
@@ -132,7 +132,7 @@ if you specify extra arguments. For example:
.. code-block:: bash
- docker run -it apache/airflow:2.5.2-python3.7 bash -c "ls -la"
+ docker run -it apache/airflow:2.5.3-python3.7 bash -c "ls -la"
total 16
drwxr-xr-x 4 airflow root 4096 Jun 5 18:12 .
drwxr-xr-x 1 root root 4096 Jun 5 18:12 ..
@@ -144,7 +144,7 @@ you pass extra parameters. For example:
.. code-block:: bash
- > docker run -it apache/airflow:2.5.2-python3.7 python -c "print('test')"
+ > docker run -it apache/airflow:2.5.3-python3.7 python -c "print('test')"
test
If first argument equals to "airflow" - the rest of the arguments is treated
as an airflow command
@@ -152,13 +152,13 @@ to execute. Example:
.. code-block:: bash
- docker run -it apache/airflow:2.5.2-python3.7 airflow webserver
+ docker run -it apache/airflow:2.5.3-python3.7 airflow webserver
If there are any other arguments - they are simply passed to the "airflow"
command
.. code-block:: bash
- > docker run -it apache/airflow:2.5.2-python3.7 help
+ > docker run -it apache/airflow:2.5.3-python3.7 help
usage: airflow [-h] GROUP_OR_COMMAND ...
positional arguments:
@@ -363,7 +363,7 @@ database and creating an ``admin/admin`` Admin user with
the following command:
--env "_AIRFLOW_DB_UPGRADE=true" \
--env "_AIRFLOW_WWW_USER_CREATE=true" \
--env "_AIRFLOW_WWW_USER_PASSWORD=admin" \
- apache/airflow:2.5.2-python3.8 webserver
+ apache/airflow:2.5.3-python3.8 webserver
.. code-block:: bash
@@ -372,7 +372,7 @@ database and creating an ``admin/admin`` Admin user with
the following command:
--env "_AIRFLOW_DB_UPGRADE=true" \
--env "_AIRFLOW_WWW_USER_CREATE=true" \
--env "_AIRFLOW_WWW_USER_PASSWORD_CMD=echo admin" \
- apache/airflow:2.5.2-python3.8 webserver
+ apache/airflow:2.5.3-python3.8 webserver
The commands above perform initialization of the SQLite database, create admin
user with admin password
and Admin role. They also forward local port ``8080`` to the webserver port
and finally start the webserver.
@@ -412,6 +412,6 @@ Example:
--env "_AIRFLOW_DB_UPGRADE=true" \
--env "_AIRFLOW_WWW_USER_CREATE=true" \
--env "_AIRFLOW_WWW_USER_PASSWORD_CMD=echo admin" \
- apache/airflow:2.5.2-python3.8 webserver
+ apache/airflow:2.5.3-python3.8 webserver
This method is only available starting from Docker image of Airflow 2.1.1 and
above.
diff --git a/scripts/ci/pre_commit/pre_commit_supported_versions.py
b/scripts/ci/pre_commit/pre_commit_supported_versions.py
index baac9f2fc3..b35cff0d7b 100755
--- a/scripts/ci/pre_commit/pre_commit_supported_versions.py
+++ b/scripts/ci/pre_commit/pre_commit_supported_versions.py
@@ -27,7 +27,7 @@ AIRFLOW_SOURCES =
Path(__file__).resolve().parent.parent.parent.parent
HEADERS = ("Version", "Current Patch/Minor", "State", "First Release",
"Limited Support", "EOL/Terminated")
SUPPORTED_VERSIONS = (
- ("2", "2.5.2", "Supported", "Dec 17, 2020", "TBD", "TBD"),
+ ("2", "2.5.3", "Supported", "Dec 17, 2020", "TBD", "TBD"),
("1.10", "1.10.15", "EOL", "Aug 27, 2018", "Dec 17, 2020", "June 17,
2021"),
("1.9", "1.9.0", "EOL", "Jan 03, 2018", "Aug 27, 2018", "Aug 27, 2018"),
("1.8", "1.8.2", "EOL", "Mar 19, 2017", "Jan 03, 2018", "Jan 03, 2018"),
diff --git a/setup.py b/setup.py
index 7eaffba769..52a6ac0834 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ PY39 = sys.version_info >= (3, 9)
logger = logging.getLogger(__name__)
-version = "2.5.2"
+version = "2.5.3"
AIRFLOW_SOURCES_ROOT = Path(__file__).parent.resolve()
PROVIDERS_ROOT = AIRFLOW_SOURCES_ROOT / "airflow" / "providers"
