diff --git a/airflow/providers/airbyte/.latest-doc-only-change.txt b/airflow/providers/airbyte/.latest-doc-only-change.txt index 5a3ee9304c53a..e7e8156d80b9e 100644 --- a/airflow/providers/airbyte/.latest-doc-only-change.txt +++ b/airflow/providers/airbyte/.latest-doc-only-change.txt @@ -1 +1 @@ -1e1b212417e089b43474bc19eec05b654afe98fb +b916b7507921129dc48d6add1bdc4b923b60c9b9 diff --git a/airflow/providers/amazon/CHANGELOG.rst b/airflow/providers/amazon/CHANGELOG.rst index d37daa9ec2c4a..eac711dc1a16f 100644 --- a/airflow/providers/amazon/CHANGELOG.rst +++ b/airflow/providers/amazon/CHANGELOG.rst @@ -38,9 +38,10 @@ Bug Fixes * ``AWS DataSync cancel task on exception (#11011) (#16589)`` .. Below changes are excluded from the changelog. Move them to -appropriate section above if needed. Do not delete the lines(!): + appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` - * ``Bump ''sphinxcontrib-spelling'' and minor improvements (#16675)`` + * ``Bump sphinxcontrib-spelling and minor improvements (#16675)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/apache/beam/.latest-doc-only-change.txt b/airflow/providers/apache/beam/.latest-doc-only-change.txt index b620a033bd63e..e7e8156d80b9e 100644 --- a/airflow/providers/apache/beam/.latest-doc-only-change.txt +++ b/airflow/providers/apache/beam/.latest-doc-only-change.txt @@ -1 +1 @@ -866a601b76e219b3c043e1dbbc8fb22300866351 +b916b7507921129dc48d6add1bdc4b923b60c9b9 diff --git a/airflow/providers/apache/cassandra/.latest-doc-only-change.txt b/airflow/providers/apache/cassandra/.latest-doc-only-change.txt index b620a033bd63e..e7e8156d80b9e 100644 --- a/airflow/providers/apache/cassandra/.latest-doc-only-change.txt +++ b/airflow/providers/apache/cassandra/.latest-doc-only-change.txt @@ -1 +1 @@ -866a601b76e219b3c043e1dbbc8fb22300866351 +b916b7507921129dc48d6add1bdc4b923b60c9b9 diff --git a/airflow/providers/apache/druid/.latest-doc-only-change.txt b/airflow/providers/apache/druid/.latest-doc-only-change.txt index b620a033bd63e..e7e8156d80b9e 100644 --- a/airflow/providers/apache/druid/.latest-doc-only-change.txt +++ b/airflow/providers/apache/druid/.latest-doc-only-change.txt @@ -1 +1 @@ -866a601b76e219b3c043e1dbbc8fb22300866351 +b916b7507921129dc48d6add1bdc4b923b60c9b9 diff --git a/airflow/providers/apache/hive/CHANGELOG.rst b/airflow/providers/apache/hive/CHANGELOG.rst index 5f0fdf9330fb1..4f86fbecb4c00 100644 --- a/airflow/providers/apache/hive/CHANGELOG.rst +++ b/airflow/providers/apache/hive/CHANGELOG.rst @@ -30,6 +30,7 @@ Features .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/apache/sqoop/CHANGELOG.rst b/airflow/providers/apache/sqoop/CHANGELOG.rst index 0a23d7b589db6..ff3484eb06a7f 100644 --- a/airflow/providers/apache/sqoop/CHANGELOG.rst +++ b/airflow/providers/apache/sqoop/CHANGELOG.rst @@ -30,6 +30,7 @@ Bug Fixes .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/cncf/kubernetes/CHANGELOG.rst b/airflow/providers/cncf/kubernetes/CHANGELOG.rst index 994efecaae882..b03eed650961a 100644 --- a/airflow/providers/cncf/kubernetes/CHANGELOG.rst +++ b/airflow/providers/cncf/kubernetes/CHANGELOG.rst @@ -31,6 +31,7 @@ Bug Fixes appropriate section above if needed. Do not delete the lines(!): * ``Updating task dependencies (#16624)`` * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/docker/CHANGELOG.rst b/airflow/providers/docker/CHANGELOG.rst index 7672c4751f869..1e813584a4694 100644 --- a/airflow/providers/docker/CHANGELOG.rst +++ b/airflow/providers/docker/CHANGELOG.rst @@ -39,6 +39,7 @@ using the new parameter to disable mounting the folder. .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/google/CHANGELOG.rst b/airflow/providers/google/CHANGELOG.rst index 93d87c38fbbd2..0f9606a50cef7 100644 --- a/airflow/providers/google/CHANGELOG.rst +++ b/airflow/providers/google/CHANGELOG.rst @@ -34,6 +34,7 @@ Bug Fixes .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 4.0.0 ..... diff --git a/airflow/providers/jenkins/CHANGELOG.rst b/airflow/providers/jenkins/CHANGELOG.rst index 4688fabae4d55..a1746128e7932 100644 --- a/airflow/providers/jenkins/CHANGELOG.rst +++ b/airflow/providers/jenkins/CHANGELOG.rst @@ -30,6 +30,7 @@ Bug Fixes .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/microsoft/azure/CHANGELOG.rst b/airflow/providers/microsoft/azure/CHANGELOG.rst index 127328d624d12..adbd740e8bbd2 100644 --- a/airflow/providers/microsoft/azure/CHANGELOG.rst +++ b/airflow/providers/microsoft/azure/CHANGELOG.rst @@ -36,6 +36,7 @@ Bug Fixes .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 3.0.0 ..... diff --git a/airflow/providers/mysql/CHANGELOG.rst b/airflow/providers/mysql/CHANGELOG.rst index f2afb13a328c1..425caeb86d695 100644 --- a/airflow/providers/mysql/CHANGELOG.rst +++ b/airflow/providers/mysql/CHANGELOG.rst @@ -34,6 +34,7 @@ Features .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/postgres/CHANGELOG.rst b/airflow/providers/postgres/CHANGELOG.rst index 5cab846fe5f17..f877230af433e 100644 --- a/airflow/providers/postgres/CHANGELOG.rst +++ b/airflow/providers/postgres/CHANGELOG.rst @@ -30,6 +30,7 @@ Features .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/sftp/CHANGELOG.rst b/airflow/providers/sftp/CHANGELOG.rst index 1eefc2ffe3238..aa5d25f40a12f 100644 --- a/airflow/providers/sftp/CHANGELOG.rst +++ b/airflow/providers/sftp/CHANGELOG.rst @@ -30,6 +30,7 @@ Features .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Remove redundant logging in SFTP Hook (#16704)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/snowflake/CHANGELOG.rst b/airflow/providers/snowflake/CHANGELOG.rst index c316a9f7819bf..4c94ebb025f5c 100644 --- a/airflow/providers/snowflake/CHANGELOG.rst +++ b/airflow/providers/snowflake/CHANGELOG.rst @@ -39,6 +39,7 @@ Bug Fixes appropriate section above if needed. Do not delete the lines(!): * ``Logging and returning info about query execution SnowflakeHook (#15736)`` * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/ssh/CHANGELOG.rst b/airflow/providers/ssh/CHANGELOG.rst index 305240075ec55..263825b042606 100644 --- a/airflow/providers/ssh/CHANGELOG.rst +++ b/airflow/providers/ssh/CHANGELOG.rst @@ -36,6 +36,7 @@ Bug Fixes .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): * ``Removes pylint from our toolchain (#16682)`` + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/airflow/providers/tableau/CHANGELOG.rst b/airflow/providers/tableau/CHANGELOG.rst index e9fb369f0bd7f..4e0a38f0449d1 100644 --- a/airflow/providers/tableau/CHANGELOG.rst +++ b/airflow/providers/tableau/CHANGELOG.rst @@ -30,7 +30,7 @@ Features .. Below changes are excluded from the changelog. Move them to appropriate section above if needed. Do not delete the lines(!): - + * ``Prepare documentation for July release of providers. (#17015)`` 2.0.0 ..... diff --git a/dev/provider_packages/prepare_provider_packages.py b/dev/provider_packages/prepare_provider_packages.py index 16bd0464b0090..e36fcf87e1af7 100755 --- a/dev/provider_packages/prepare_provider_packages.py +++ b/dev/provider_packages/prepare_provider_packages.py @@ -357,11 +357,12 @@ def get_long_description(provider_package_id: str) -> str: return long_description -def get_install_requirements(provider_package_id: str) -> List[str]: +def get_install_requirements(provider_package_id: str, version_suffix: str) -> List[str]: """ Returns install requirements for the package. :param provider_package_id: id of the provider package + :param version_suffix: optional version suffix for packages :return: install requirements of the package """ @@ -369,7 +370,21 @@ def get_install_requirements(provider_package_id: str) -> List[str]: provider_yaml = get_provider_yaml(provider_package_id) install_requires = [] if "additional-dependencies" in provider_yaml: - install_requires = provider_yaml['additional-dependencies'] + additional_dependencies = provider_yaml['additional-dependencies'] + if version_suffix: + # In case we are preparing "rc" or dev0 packages, we should also + # make sure that cross-dependency with Airflow or Airflow Providers will + # contain the version suffix, otherwise we will have conflicting dependencies. + # For example if (in sftp) we have ssh>=2.0.1 and release ssh==2.0.1 + # we want to turn this into ssh>=2.0.1.dev0 if we build dev0 version of the packages + # or >=2.0.1rc1 if we build rc1 version of the packages. + for dependency in additional_dependencies: + if dependency.startswith("apache-airflow") and ">=" in dependency: + dependency = dependency + version_suffix + install_requires.append(dependency) + else: + install_requires.extend(additional_dependencies) + install_requires.extend(dependencies) return install_requires @@ -1513,7 +1528,7 @@ def get_provider_jinja_context( "PROVIDERS_FOLDER": "providers", "PROVIDER_DESCRIPTION": provider_details.provider_description, "INSTALL_REQUIREMENTS": get_install_requirements( - provider_package_id=provider_details.provider_package_id + provider_package_id=provider_details.provider_package_id, version_suffix=version_suffix ), "SETUP_REQUIREMENTS": get_setup_requirements(), "EXTRAS_REQUIREMENTS": get_package_extras(provider_package_id=provider_details.provider_package_id), diff --git a/docs/apache-airflow-providers-amazon/commits.rst b/docs/apache-airflow-providers-amazon/commits.rst index cb28ba78c495a..e2fda9ca53426 100644 --- a/docs/apache-airflow-providers-amazon/commits.rst +++ b/docs/apache-airflow-providers-amazon/commits.rst @@ -36,6 +36,7 @@ Latest change: 2021-07-15 ================================================================================================ =========== =============================================================================== Commit Committed Subject ================================================================================================ =========== =============================================================================== +`b916b7507 `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `fc0250f1d `_ 2021-07-15 ``Allow attaching to previously launched task in ECSOperator (#16685)`` `d3f300fba `_ 2021-07-11 ``Fix wrong template_fields_renderers for AWS operators (#16820)`` `f0df184e4 `_ 2021-07-07 ``Update AWS Base hook to use refreshable credentials (#16770) (#16771)`` diff --git a/docs/apache-airflow-providers-apache-hive/commits.rst b/docs/apache-airflow-providers-apache-hive/commits.rst index 128ab1cfcf36b..763e4c75c5e5c 100644 --- a/docs/apache-airflow-providers-apache-hive/commits.rst +++ b/docs/apache-airflow-providers-apache-hive/commits.rst @@ -31,14 +31,15 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` `ce44b6289 `_ 2021-06-25 ``Add Python 3.9 support (#15515)`` -================================================================================================ =========== ============================================== +================================================================================================ =========== ================================================================= 2.0.0 ..... diff --git a/docs/apache-airflow-providers-apache-sqoop/commits.rst b/docs/apache-airflow-providers-apache-sqoop/commits.rst index 49724ccc3e7a8..defa9510a7cbd 100644 --- a/docs/apache-airflow-providers-apache-sqoop/commits.rst +++ b/docs/apache-airflow-providers-apache-sqoop/commits.rst @@ -31,14 +31,15 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `fc917af8b `_ 2021-07-10 ``Fix Minor Bugs in Apache Sqoop Hook and Operator (#16350)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` -================================================================================================ =========== ============================================================= +================================================================================================ =========== ================================================================= 2.0.0 ..... diff --git a/docs/apache-airflow-providers-cncf-kubernetes/commits.rst b/docs/apache-airflow-providers-cncf-kubernetes/commits.rst index cfd0f32b79989..8b452e6afa121 100644 --- a/docs/apache-airflow-providers-cncf-kubernetes/commits.rst +++ b/docs/apache-airflow-providers-cncf-kubernetes/commits.rst @@ -31,11 +31,12 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `b2c66e45b `_ 2021-07-11 ``BugFix: Using 'json' string in template_field causes issue with K8s Operators (#16930)`` `9d6ae609b `_ 2021-06-28 ``Updating task dependencies (#16624)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` diff --git a/docs/apache-airflow-providers-docker/commits.rst b/docs/apache-airflow-providers-docker/commits.rst index 980df96277424..506b8df60eb74 100644 --- a/docs/apache-airflow-providers-docker/commits.rst +++ b/docs/apache-airflow-providers-docker/commits.rst @@ -36,6 +36,7 @@ Latest change: 2021-07-15 ================================================================================================ =========== =============================================================================== Commit Committed Subject ================================================================================================ =========== =============================================================================== +`b916b7507 `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `bc004151e `_ 2021-07-15 ``Adds option to disable mounting temporary folder in DockerOperator (#16932)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` ================================================================================================ =========== =============================================================================== diff --git a/docs/apache-airflow-providers-google/commits.rst b/docs/apache-airflow-providers-google/commits.rst index 4d918fb75e2af..91e0a86565f1a 100644 --- a/docs/apache-airflow-providers-google/commits.rst +++ b/docs/apache-airflow-providers-google/commits.rst @@ -38,15 +38,16 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `a3f5c9380 `_ 2021-07-13 ``Update alias for field_mask in Google Memmcache (#16975)`` `b0f7f91fe `_ 2021-07-07 ``Standardise dataproc location param to region (#16034)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` -================================================================================================ =========== ============================================================ +================================================================================================ =========== ================================================================= 4.0.0 ..... diff --git a/docs/apache-airflow-providers-jenkins/commits.rst b/docs/apache-airflow-providers-jenkins/commits.rst index a422840ec1739..dfddc5bdcf28a 100644 --- a/docs/apache-airflow-providers-jenkins/commits.rst +++ b/docs/apache-airflow-providers-jenkins/commits.rst @@ -31,14 +31,15 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `9ff781ad8 `_ 2021-07-13 ``Fixed to check number key from jenkins response (#16963)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` -================================================================================================ =========== ============================================================ +================================================================================================ =========== ================================================================= 2.0.0 ..... diff --git a/docs/apache-airflow-providers-microsoft-azure/commits.rst b/docs/apache-airflow-providers-microsoft-azure/commits.rst index 63d991d2e99d2..21c5ed38689e4 100644 --- a/docs/apache-airflow-providers-microsoft-azure/commits.rst +++ b/docs/apache-airflow-providers-microsoft-azure/commits.rst @@ -31,11 +31,12 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` `caf0a8499 `_ 2021-06-25 ``Add support for managed identity in WASB hook (#16628)`` `ffb1fcacf `_ 2021-06-24 ``Fix multiple issues in Microsoft AzureContainerInstancesOperator (#15634)`` diff --git a/docs/apache-airflow-providers-mysql/commits.rst b/docs/apache-airflow-providers-mysql/commits.rst index 1cb9850cbd80c..ef0a5d0e3f066 100644 --- a/docs/apache-airflow-providers-mysql/commits.rst +++ b/docs/apache-airflow-providers-mysql/commits.rst @@ -31,11 +31,12 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `6ab00bfcf `_ 2021-07-14 ``Extended template_fields_renderers for MySQL provider (#16987)`` `c3b8212b6 `_ 2021-07-10 ``Added template_fields_renderers for MySQL Operator (#16914)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` diff --git a/docs/apache-airflow-providers-postgres/commits.rst b/docs/apache-airflow-providers-postgres/commits.rst index 893a2d8f28320..589cbdf463535 100644 --- a/docs/apache-airflow-providers-postgres/commits.rst +++ b/docs/apache-airflow-providers-postgres/commits.rst @@ -31,14 +31,15 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` `3ee916e9e `_ 2021-06-23 ``Add schema as DbApiHook instance attribute (#16521)`` -================================================================================================ =========== ======================================================= +================================================================================================ =========== ================================================================= 2.0.0 ..... diff --git a/docs/apache-airflow-providers-sftp/commits.rst b/docs/apache-airflow-providers-sftp/commits.rst index 757c61b51371a..4a6d04bff98d2 100644 --- a/docs/apache-airflow-providers-sftp/commits.rst +++ b/docs/apache-airflow-providers-sftp/commits.rst @@ -31,14 +31,15 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `81be82bfb `_ 2021-07-02 ``Remove redundant logging in SFTP Hook (#16704)`` `50e334df3 `_ 2021-06-24 ``Add support for non-RSA type key for SFTP hook (#16314)`` -================================================================================================ =========== =========================================================== +================================================================================================ =========== ================================================================= 2.0.0 ..... diff --git a/docs/apache-airflow-providers-snowflake/commits.rst b/docs/apache-airflow-providers-snowflake/commits.rst index d282254689af0..0d188bc3dd374 100644 --- a/docs/apache-airflow-providers-snowflake/commits.rst +++ b/docs/apache-airflow-providers-snowflake/commits.rst @@ -31,11 +31,12 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `5999cb9a6 `_ 2021-07-07 ``Adding: Snowflake Role in snowflake provider hook (#16735)`` `8b41c2e0b `_ 2021-07-01 ``Logging and returning info about query execution SnowflakeHook (#15736)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` diff --git a/docs/apache-airflow-providers-ssh/commits.rst b/docs/apache-airflow-providers-ssh/commits.rst index f935d7047bdf8..5ca3fac6e780a 100644 --- a/docs/apache-airflow-providers-ssh/commits.rst +++ b/docs/apache-airflow-providers-ssh/commits.rst @@ -31,11 +31,12 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `a2dc01b34 `_ 2021-07-03 ``SSHHook: Using correct hostname for host_key when using non-default ssh port (#15964)`` `7777d4f2f `_ 2021-07-01 ``Correctly load openssh-gerenated private keys in SSHHook (#16756)`` `866a601b7 `_ 2021-06-28 ``Removes pylint from our toolchain (#16682)`` diff --git a/docs/apache-airflow-providers-tableau/commits.rst b/docs/apache-airflow-providers-tableau/commits.rst index 28304ba14a4a9..2c1bb7fd4f6e7 100644 --- a/docs/apache-airflow-providers-tableau/commits.rst +++ b/docs/apache-airflow-providers-tableau/commits.rst @@ -33,12 +33,13 @@ For high-level changelog, see :doc:`package information including changelog `_ 2021-07-15 ``Prepare documentation for July release of providers. (#17015)`` `53246ebef `_ 2021-07-15 ``Deprecate Tableau personal token authentication (#16916)`` `df0746e13 `_ 2021-07-10 ``Allow disable SSL for TableauHook (#16365)`` -================================================================================================ =========== ============================================================ +================================================================================================ =========== ================================================================= 2.0.0 .....