This is an automated email from the ASF dual-hosted git repository. kaxilnaik pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 912a3b0f5acf34d990b2de66702c62cb3cf36067 Author: Kaxil Naik <[email protected]> AuthorDate: Fri Mar 12 15:56:45 2021 +0000 Bump Airflow Version to 1.10.15 --- BREEZE.rst | 6 ++-- IMAGES.rst | 22 +++++++-------- INSTALL | 2 +- README.md | 10 +++---- airflow/upgrade/README.md | 2 +- airflow/version.py | 2 +- breeze-complete | 1 + docs/installation.rst | 6 ++-- docs/production-deployment.rst | 62 +++++++++++++++++++++--------------------- 9 files changed, 57 insertions(+), 56 deletions(-) diff --git a/BREEZE.rst b/BREEZE.rst index 4c1b3a7..00d4c62 100644 --- a/BREEZE.rst +++ b/BREEZE.rst @@ -1262,7 +1262,7 @@ This is the current syntax for `./breeze <./breeze>`_: If specified, installs Airflow directly from PIP released version. This happens at image building time in production image and at container entering time for CI image. One of: - 1.10.14 1.10.12 1.10.11 1.10.10 1.10.9 none wheel sdist + 1.10.15 1.10.14 1.10.12 1.10.11 1.10.10 1.10.9 none wheel sdist When 'none' is used, you can install airflow from local packages. When building image, airflow package should be added to 'docker-context-files' and @@ -1651,7 +1651,7 @@ This is the current syntax for `./breeze <./breeze>`_: wheel,sdist,both - Default: + Default: -S, --version-suffix-for-pypi SUFFIX Adds optional suffix to the version in the generated backport package. It can be used @@ -2225,7 +2225,7 @@ This is the current syntax for `./breeze <./breeze>`_: If specified, installs Airflow directly from PIP released version. This happens at image building time in production image and at container entering time for CI image. One of: - 1.10.14 1.10.12 1.10.11 1.10.10 1.10.9 none wheel sdist + 1.10.15 1.10.14 1.10.12 1.10.11 1.10.10 1.10.9 none wheel sdist When 'none' is used, you can install airflow from local packages. When building image, airflow package should be added to 'docker-context-files' and diff --git a/IMAGES.rst b/IMAGES.rst index 8804d1f..b62a71a 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -39,7 +39,7 @@ The images are named as follows: where: -* ``BRANCH_OR_TAG`` - branch or tag used when creating the image. Examples: ``master``, ``v1-10-test``, ``1.10.14`` +* ``BRANCH_OR_TAG`` - branch or tag used when creating the image. Examples: ``master``, ``v1-10-test``, ``1.10.15`` The ``master`` and ``v1-10-test`` labels are built from branches so they change over time. The ``1.10.*`` and in the future ``2.*`` labels are build from git tags and they are "fixed" once built. * ``PYTHON_MAJOR_MINOR_VERSION`` - version of python used to build the image. Examples: ``3.5``, ``3.7`` @@ -115,7 +115,7 @@ parameter to Breeze: .. code-block:: bash ./breeze build-image --python 3.7 --additional-extras=presto \ - --production-image --install-airflow-version=1.10.14 + --production-image --install-airflow-version=1.10.15 .. note:: @@ -132,8 +132,8 @@ This will build the image using command similar to: .. code-block:: bash pip install \ - apache-airflow[async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv,presto]==1.10.14 \ - --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.14/constraints-3.6.txt"; + apache-airflow[async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv,presto]==1.10.15 \ + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.15/constraints-3.6.txt"; You can also build production images from specific Git version via providing ``--install-airflow-reference`` parameter to Breeze (this time constraints are taken from the ``constraints-master`` branch which is the @@ -229,8 +229,8 @@ For example: apache/airflow:master-python3.6 - production "latest" image from current master apache/airflow:master-python3.6-ci - CI "latest" image from current master apache/airflow:v1-10-test-python2.7-ci - CI "latest" image from current v1-10-test branch - apache/airflow:1.10.14-python3.6 - production image for 1.10.14 release - apache/airflow:1.10.14-1-python3.6 - production image for 1.10.14 with some patches applied + apache/airflow:1.10.15-python3.6 - production image for 1.10.15 release + apache/airflow:1.10.15-1-python3.6 - production image for 1.10.15 with some patches applied You can see DockerHub images at `<https://hub.docker.com/repository/docker/apache/airflow>`_ @@ -311,8 +311,8 @@ additional apt dev and runtime dependencies. --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ @@ -328,7 +328,7 @@ the same image can be built using ``breeze`` (it supports auto-completion of the .. code-block:: bash ./breeze build-image -f Dockerfile.ci \ - --production-image --python 3.7 --install-airflow-version=1.10.14 \ + --production-image --python 3.7 --install-airflow-version=1.10.15 \ --additional-extras=jdbc --additional-python-deps="pandas" \ --additional-dev-apt-deps="gcc g++" --additional-runtime-apt-deps="default-jre-headless" You can build the default production image with standard ``docker build`` command but they will only build @@ -346,8 +346,8 @@ based on example in `this comment <https://github.com/apache/airflow/issues/8605 --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ diff --git a/INSTALL b/INSTALL index 763ed20..6338fb7 100644 --- a/INSTALL +++ b/INSTALL @@ -52,7 +52,7 @@ python setup.py install # For example: pip install . \ - --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.14/constraints-3.6.txt"; + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.15/constraints-3.6.txt"; .. note:: diff --git a/README.md b/README.md index 2d7edd6..46e4cd1 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Airflow is not a streaming solution, but it is often used to process real-time d Apache Airflow is tested with: -| | Master version (2.0.0dev) | Stable version (1.10.14) | +| | Master version (2.1.0dev) | Stable version (1.10.15) | | ------------ | ------------------------- | ------------------------ | | Python | 3.6, 3.7, 3.8 | 2.7, 3.5, 3.6, 3.7, 3.8 | | PostgreSQL | 9.6, 10, 11, 12, 13 | 9.6, 10, 11, 12, 13 | @@ -131,8 +131,8 @@ of extras. In order to install Airflow you need to either downgrade pip to versi ```bash -pip install apache-airflow==1.10.14 \ - --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.14/constraints-3.7.txt"; +pip install apache-airflow==1.10.15 \ + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.15/constraints-3.7.txt"; ``` **NOTE!!!** @@ -144,8 +144,8 @@ pip to version 20.2.4 `pip upgrade --pip==20.2.4` or, in case you use Pip 20.3, `--use-deprecated legacy-resolver` to your pip install command. ```bash -pip install apache-airflow[postgres,google]==1.10.14 \ - --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.14/constraints-3.7.txt"; +pip install apache-airflow[postgres,google]==1.10.15 \ + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.15/constraints-3.7.txt"; ``` For information on installing backport providers check [/docs/backport-providers.rst][/docs/backport-providers.rst]. diff --git a/airflow/upgrade/README.md b/airflow/upgrade/README.md index f8c38b3..67679db 100644 --- a/airflow/upgrade/README.md +++ b/airflow/upgrade/README.md @@ -33,7 +33,7 @@ providing upgrade path (where the old code continues to work and prints out a de unfortunately some breaking changes where we couldn't provide a compatibility shim. The recommended upgrade path to get to Airflow 2.0.0 is to first upgrade to the latest release in the 1.10 -series (at the time of writing: 1.10.14) and to then run this script. +series (at the time of writing: 1.10.15) and to then run this script. ```bash pip install apache-airflow-upgrade-check diff --git a/airflow/version.py b/airflow/version.py index b3b5b30..f6a19c0 100644 --- a/airflow/version.py +++ b/airflow/version.py @@ -18,4 +18,4 @@ # under the License. # -version = '1.10.14' +version = '1.10.15' diff --git a/breeze-complete b/breeze-complete index 042a7fa..b2af2a3 100644 --- a/breeze-complete +++ b/breeze-complete @@ -51,6 +51,7 @@ _breeze_allowed_package_formats="wheel sdist both" } _breeze_allowed_install_airflow_versions=$(cat <<-EOF +1.10.15 1.10.14 1.10.12 1.10.11 diff --git a/docs/installation.rst b/docs/installation.rst index ed4f4a0..f4b2f1c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -51,11 +51,11 @@ and python versions in the URL. .. code-block:: bash - AIRFLOW_VERSION=1.10.14 + AIRFLOW_VERSION=1.10.15 PYTHON_VERSION="$(python --version | cut -d " " -f 2 | cut -d "." -f 1-2)" # For example: 3.6 CONSTRAINT_URL="https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-${PYTHON_VERSION}.txt"; - # For example: https://raw.githubusercontent.com/apache/airflow/constraints-1.10.14/constraints-3.6.txt + # For example: https://raw.githubusercontent.com/apache/airflow/constraints-1.10.15/constraints-3.6.txt pip install "apache-airflow==${AIRFLOW_VERSION}" --constraint "${CONSTRAINT_URL}" @@ -70,7 +70,7 @@ and python versions in the URL. .. code-block:: bash - AIRFLOW_VERSION=1.10.14 + AIRFLOW_VERSION=1.10.15 PYTHON_VERSION="$(python --version | cut -d " " -f 2 | cut -d "." -f 1-2)" CONSTRAINT_URL="https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-${PYTHON_VERSION}.txt"; pip install "apache-airflow[postgres,google]==${AIRFLOW_VERSION}" --constraint "${CONSTRAINT_URL}" diff --git a/docs/production-deployment.rst b/docs/production-deployment.rst index 22059ec..6c25307 100644 --- a/docs/production-deployment.rst +++ b/docs/production-deployment.rst @@ -64,7 +64,7 @@ You should be aware, about a few things: .. code-block:: dockerfile - FROM apache/airflow:1.10.14 + FROM apache/airflow:1.10.15 USER root RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -81,7 +81,7 @@ You should be aware, about a few things: .. code-block:: dockerfile - FROM apache/airflow:1.10.14 + FROM apache/airflow:1.10.15 RUN pip install --no-cache-dir --user my-awesome-pip-dependency-to-add @@ -92,7 +92,7 @@ You should be aware, about a few things: .. code-block:: dockerfile - FROM apache/airflow:1.10.14 + FROM apache/airflow:1.10.15 USER root RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -125,7 +125,7 @@ in the `<#production-image-build-arguments>`_ chapter below. Here just a few examples are presented which should give you general understanding of what you can customize. -This builds the production image in version 3.7 with additional airflow extras from 1.10.14 PyPI package and +This builds the production image in version 3.7 with additional airflow extras from 1.10.15 PyPI package and additional apt dev and runtime dependencies. .. code-block:: bash @@ -134,8 +134,8 @@ additional apt dev and runtime dependencies. --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ @@ -151,7 +151,7 @@ the same image can be built using ``breeze`` (it supports auto-completion of the .. code-block:: bash ./breeze build-image \ - --production-image --python 3.7 --install-airflow-version=1.10.14 \ + --production-image --python 3.7 --install-airflow-version=1.10.15 \ --additional-extras=jdbc --additional-python-deps="pandas" \ --additional-dev-apt-deps="gcc g++" --additional-runtime-apt-deps="default-jre-headless" @@ -167,8 +167,8 @@ based on example in `this comment <https://github.com/apache/airflow/issues/8605 --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ @@ -227,7 +227,7 @@ Preparing the constraint files and wheel files: pip download --dest docker-context-files \ --constraint docker-context-files/constraints-1-10.txt \ - apache-airflow[async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv]==1.10.14 + apache-airflow[async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv]==1.10.15 Building the image (after copying the files downloaded to the "docker-context-files" directory: @@ -235,7 +235,7 @@ Building the image (after copying the files downloaded to the "docker-context-fi .. code-block:: bash ./breeze build-image \ - --production-image --python 3.7 --install-airflow-version=1.10.14 \ + --production-image --python 3.7 --install-airflow-version=1.10.15 \ --disable-mysql-client-installation --disable-pip-cache --install-from-local-files-when-building \ --constraints-location="/docker-context-files/constraints-1-10.txt" @@ -247,8 +247,8 @@ or --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ @@ -417,7 +417,7 @@ The following build arguments (``--build-arg`` in docker build command) can be u | | | 1.10.* installation. In case of building | | | | specific version you want to point it | | | | to specific tag, for example | -| | | ``constraints-1.10.14``. | +| | | ``constraints-1.10.15``. | +------------------------------------------+------------------------------------------+------------------------------------------+ | ``AIRFLOW_EXTRAS`` | (see Dockerfile) | Default extras with which airflow is | | | | installed. | @@ -528,13 +528,13 @@ production image. There are three types of build: | | | Only used when ``INSTALL_FROM_PYPI`` is set to ``true``. | +-----------------------------------+------------------------+-----------------------------------------------------------------------------------+ | ``AIRFLOW_INSTALL_VERSION`` | | Optional - might be used for package installation of different Airflow version | -| | | for example"==1.10.14". For consistency, you should also set``AIRFLOW_VERSION`` | +| | | for example"==1.10.15". For consistency, you should also set``AIRFLOW_VERSION`` | | | | to the same value AIRFLOW_VERSION is embedded as label in the image created. | +-----------------------------------+------------------------+-----------------------------------------------------------------------------------+ | ``AIRFLOW_CONSTRAINTS_REFERENCE`` | ``constraints-master`` | Reference (branch or tag) from GitHub where constraints file is taken from. | | | | It can be ``constraints-master`` but also can be``constraints-1-10`` for | | | | 1.10.* installations. In case of building specific version | -| | | you want to point it to specific tag, for example ``constraints-1.10.14`` | +| | | you want to point it to specific tag, for example ``constraints-1.10.15`` | +-----------------------------------+------------------------+-----------------------------------------------------------------------------------+ | ``AIRFLOW_WWW`` | ``www`` | In case of Airflow 2.0 it should be "www", in case of Airflow 1.10 | | | | series it should be "www_rbac". | @@ -553,7 +553,7 @@ of 2.0 currently): docker build . -This builds the production image in version 3.7 with default extras from 1.10.14 tag and +This builds the production image in version 3.7 with default extras from 1.10.15 tag and constraints taken from constraints-1-10-12 branch in GitHub. .. code-block:: bash @@ -561,14 +561,14 @@ constraints taken from constraints-1-10-12 branch in GitHub. docker build . \ --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ - --build-arg AIRFLOW_INSTALLATION_METHOD="https://github.com/apache/airflow/archive/1.10.14.tar.gz#egg=apache-airflow"; \ + --build-arg AIRFLOW_INSTALLATION_METHOD="https://github.com/apache/airflow/archive/1.10.15.tar.gz#egg=apache-airflow"; \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_BRANCH="v1-10-test" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" -This builds the production image in version 3.7 with default extras from 1.10.14 PyPI package and -constraints taken from 1.10.14 tag in GitHub and pre-installed pip dependencies from the top +This builds the production image in version 3.7 with default extras from 1.10.15 PyPI package and +constraints taken from 1.10.15 tag in GitHub and pre-installed pip dependencies from the top of v1-10-test branch. .. code-block:: bash @@ -577,15 +577,15 @@ of v1-10-test branch. --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_BRANCH="v1-10-test" \ - --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1.10.14" \ + --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1.10.15" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" -This builds the production image in version 3.7 with additional airflow extras from 1.10.14 PyPI package and -additional python dependencies and pre-installed pip dependencies from 1.10.14 tagged constraints. +This builds the production image in version 3.7 with additional airflow extras from 1.10.15 PyPI package and +additional python dependencies and pre-installed pip dependencies from 1.10.15 tagged constraints. .. code-block:: bash @@ -593,16 +593,16 @@ additional python dependencies and pre-installed pip dependencies from 1.10.14 t --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_BRANCH="v1-10-test" \ - --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1.10.14" \ + --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1.10.15" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ --build-arg ADDITIONAL_AIRFLOW_EXTRAS="mssql,hdfs" \ --build-arg ADDITIONAL_PYTHON_DEPS="sshtunnel oauth2client" -This builds the production image in version 3.7 with additional airflow extras from 1.10.14 PyPI package and +This builds the production image in version 3.7 with additional airflow extras from 1.10.15 PyPI package and additional apt dev and runtime dependencies. .. code-block:: bash @@ -611,8 +611,8 @@ additional apt dev and runtime dependencies. --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ --build-arg AIRFLOW_INSTALLATION_METHOD="apache-airflow" \ - --build-arg AIRFLOW_VERSION="1.10.14" \ - --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ + --build-arg AIRFLOW_VERSION="1.10.15" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.15" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \
