This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new 791d1a7 Backport packages are renamed to include backport in their
name (#8767)
791d1a7 is described below
commit 791d1a786fb4fd54105d9cf95fa614193fc250dc
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sat May 9 14:09:12 2020 +0200
Backport packages are renamed to include backport in their name (#8767)
---
CONTRIBUTING.rst | 10 ++++++----
TESTING.rst | 8 ++++----
backport_packages/setup_backport_packages.py | 8 +++-----
scripts/ci/in_container/run_test_package_installation.sh | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 0c0819f..9c27daa 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -425,8 +425,9 @@ in the ``airflow/providers/dependencies.json``. Pre-commits
are also used to gen
The dependency list is automatically used during pypi packages generation.
Cross-dependencies between provider packages are converted into extras - if
you need functionality from
-the other provider package you can install it adding [extra] after the
apache-airflow-providers-PROVIDER
-for example ``pip install apache-airflow-providers-google[amazon]`` in case
you want to use GCP's
+the other provider package you can install it adding [extra] after the
+apache-airflow-backport-providers-PROVIDER for example ``pip install
+apache-airflow-backport-providers-google[amazon]`` in case you want to use
GCP's
transfer operators from Amazon ECS.
If you add a new dependency between different providers packages, it will be
detected automatically during
@@ -1008,7 +1009,7 @@ prepare such packages on your own easily.
adding cross-dependencies between packages.
* This creates a wheel package in your ``dist`` folder with a name similar to:
- ``apache_airflow_providers-0.0.1-py2.py3-none-any.whl``
+ ``apache_airflow_backport_providers-0.0.1-py2.py3-none-any.whl``
* You can install this package with ``pip install <PACKAGE_FILE>``
@@ -1019,7 +1020,8 @@ prepare such packages on your own easily.
Each package has description generated from the the general
``backport_packages/README.md`` file with the
following replacements:
-* ``{{ PACKAGE_NAME }}`` is replaced with the name of the package
(``apache-airflow-providers-<NAME>``)
+* ``{{ PACKAGE_NAME }}`` is replaced with the name of the package
+(``apache-airflow-backport-providers-<NAME>``)
* ``{{ PACKAGE_DEPENDENCIES }}`` is replaced with list of optional
dependencies for the package
* ``{{ PACKAGE_BACKPORT_README }}`` is replaced with the content of
``BACKPORT_README.md`` file in the
package folder if it exists.
diff --git a/TESTING.rst b/TESTING.rst
index c8ce900..b1fa711 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -479,7 +479,7 @@ run Google Cloud system tests.
# install any packages from dist folder if they are available
if [[ ${RUN_AIRFLOW_1_10:=} == "true" ]]; then
- pip install /dist/apache_airflow_providers_{google,postgres,mysql}*.whl
|| true
+ pip install
/dist/apache_airflow_backport_providers_{google,postgres,mysql}*.whl || true
fi
To execute system tests, specify the ``--system SYSTEM``
@@ -588,7 +588,7 @@ Typically the command in you variables.env file will be
similar to:
# install any packages from dist folder if they are available
if [[ ${RUN_AIRFLOW_1_10:=} == "true" ]]; then
- pip install /dist/apache_airflow_providers_{google,postgres,mysql}*.whl
|| true
+ pip install
/dist/apache_airflow_backport_providers_{google,postgres,mysql}*.whl || true
fi
The command above will automatically install backported google, postgres, and
mysql packages if they
@@ -722,8 +722,8 @@ In the container:
.. code-block:: bash
- pip uninstall apache-airflow-providers-google
- pip install /dist/apache_airflow_providers_google-*.whl
+ pip uninstall apache-airflow-backport-providers-google
+ pip install /dist/apache_airflow_backport_providers_google-*.whl
The points 4. and 5. can be repeated multiple times without leaving the
container
diff --git a/backport_packages/setup_backport_packages.py
b/backport_packages/setup_backport_packages.py
index 31197eb..70c51df 100644
--- a/backport_packages/setup_backport_packages.py
+++ b/backport_packages/setup_backport_packages.py
@@ -294,7 +294,7 @@ def get_providers_package_folder(provider_package: str):
def get_provider_package_name(provider_package: str):
- return "apache-airflow-providers-" + provider_package.replace(".", "-")
+ return "apache-airflow-backport-providers-" +
provider_package.replace(".", "-")
def copy_provider_sources():
@@ -341,10 +341,8 @@ def get_long_description(provider_package: str):
def do_setup_package_providers(provider_package: str, deps: List[str], extras:
Dict[str, List[str]]):
setup.write_version()
provider_package_name = get_provider_package_name(provider_package)
- package_name = f'{provider_package_name}' if provider_package !=
"providers" \
- else f'apache-airflow-providers'
- package_prefix = f'airflow.providers.{provider_package}' if
provider_package != 'providers' \
- else 'airflow.providers'
+ package_name = f'{provider_package_name}'
+ package_prefix = f'airflow.providers.{provider_package}'
found_packages = find_packages()
found_packages = [package for package in found_packages if
package.startswith(package_prefix)]
setuptools_setup(
diff --git a/scripts/ci/in_container/run_test_package_installation.sh
b/scripts/ci/in_container/run_test_package_installation.sh
index 54f3e65..8ea1a20 100755
--- a/scripts/ci/in_container/run_test_package_installation.sh
+++ b/scripts/ci/in_container/run_test_package_installation.sh
@@ -30,9 +30,9 @@ else
pip install "apache-airflow==${INSTALL_AIRFLOW_VERSION}" >>"${OUT_FILE}"
2>&1
fi
-for PACKAGE_FILE in /dist/apache_airflow_providers_*.whl
+for PACKAGE_FILE in /dist/apache_airflow_backport_providers_*.whl
do
- if [[ ! ${PACKAGE_FILE} =~ /dist/(apache_airflow_providers_[^-]*)-.* ]];
then
+ if [[ ! ${PACKAGE_FILE} =~
/dist/(apache_airflow_backport_providers_[^-]*)-.* ]]; then
echo
echo "ERROR: ${PACKAGE_FILE} does not match providers package regexp"
echo
