You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2020/12/12 06:29:52 UTC
[airflow] branch master updated: Switching to standard --tag-build
flag in setuptools in providers (#13021)
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 15fd1bc Switching to standard --tag-build flag in setuptools in providers (#13021)
15fd1bc is described below
commit 15fd1bc890aa1630ef16e7981408f8f994d30d97
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Sat Dec 12 07:28:51 2020 +0100
Switching to standard --tag-build flag in setuptools in providers (#13021)
Following #13020 provider packages are also switching to
--tag-build flag.
---
dev/provider_packages/SETUP_TEMPLATE.py.jinja2 | 21 ++++----------------
dev/provider_packages/prepare_provider_packages.py | 4 +++-
scripts/in_container/_in_container_utils.sh | 10 +++++++---
.../in_container/run_prepare_provider_packages.sh | 23 +++++++++++++---------
4 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/dev/provider_packages/SETUP_TEMPLATE.py.jinja2 b/dev/provider_packages/SETUP_TEMPLATE.py.jinja2
index 9564ed6..17a919c 100644
--- a/dev/provider_packages/SETUP_TEMPLATE.py.jinja2
+++ b/dev/provider_packages/SETUP_TEMPLATE.py.jinja2
@@ -28,14 +28,13 @@
import logging
import os
-import sys
from os.path import dirname
from setuptools import find_namespace_packages, setup
logger = logging.getLogger(__name__)
-version = '{{ RELEASE_NO_LEADING_ZEROS }}{{VERSION_SUFFIX }}'
+version = '{{ RELEASE_NO_LEADING_ZEROS }}{{ VERSION_SUFFIX }}'
my_dir = dirname(__file__)
@@ -46,7 +45,7 @@ except FileNotFoundError:
long_description = ''
-def do_setup(version_suffix_for_pypi=''):
+def do_setup():
"""Perform the package {{ PACKAGE_PIP_NAME }} setup."""
setup(
name='{{ PACKAGE_PIP_NAME }}',
@@ -55,7 +54,7 @@ def do_setup(version_suffix_for_pypi=''):
long_description=long_description,
long_description_content_type='text/markdown',
license='Apache License 2.0',
- version=version + version_suffix_for_pypi,
+ version=version,
packages=find_namespace_packages(
include=['airflow.providers.{{ PROVIDER_PACKAGE_ID }}',
'airflow.providers.{{ PROVIDER_PACKAGE_ID }}.*']),
@@ -89,17 +88,5 @@ def do_setup(version_suffix_for_pypi=''):
},
)
-#
-# Note that --version-suffix-for-pypi should only be used in case we generate RC packages for PyPI
-# Those packages should have actual RC version in order to be published even if source version
-# should be the final one.
-#
if __name__ == "__main__":
- suffix=''
- if len(sys.argv) > 1 and sys.argv[1] == "--version-suffix-for-pypi":
- if len(sys.argv) < 3:
- print("ERROR! --version-suffix-for-pypi needs parameter!", file=sys.stderr)
- sys.exit(1)
- suffix = sys.argv[2]
- sys.argv = [sys.argv[0]] + sys.argv[3:]
- do_setup(version_suffix_for_pypi=suffix)
+ do_setup()
diff --git a/dev/provider_packages/prepare_provider_packages.py b/dev/provider_packages/prepare_provider_packages.py
index 3bbf2f5..d027818 100644
--- a/dev/provider_packages/prepare_provider_packages.py
+++ b/dev/provider_packages/prepare_provider_packages.py
@@ -1598,7 +1598,9 @@ ERROR! Wrong first param: {sys.argv[1]}
package_format = os.environ.get("PACKAGE_FORMAT", "wheel")
print(f"Building backport package: {_provider_package} in format ${package_format}")
copy_readme_and_changelog(_provider_package, BACKPORT_PACKAGES)
- command = ["python3", "setup.py", "--version-suffix-for-pypi", suffix]
+ command = ["python3", "setup.py"]
+ if suffix != "":
+ command.extend(['egg_info', '--tag-build', suffix])
if package_format in ['sdist', 'both']:
command.append("sdist")
if package_format in ['wheel', 'both']:
diff --git a/scripts/in_container/_in_container_utils.sh b/scripts/in_container/_in_container_utils.sh
index 08934dd..822200b 100644
--- a/scripts/in_container/_in_container_utils.sh
+++ b/scripts/in_container/_in_container_utils.sh
@@ -393,10 +393,14 @@ function verify_suffix_versions_for_package_preparation() {
fi
if [[ ${VERSION_SUFFIX_FOR_SVN} =~ ^rc ]]; then
+ echo """
+${COLOR_YELLOW_WARNING} The version suffix for SVN is used only for file names.
+ The version inside the packages has no version suffix.
+ This way we can just rename files when they graduate to final release.
+${COLOR_RESET}
+"""
echo
- echo "${COLOR_RED_ERROR} The version suffix for SVN is used only for file names in RC version ${COLOR_RESET}"
- echo
- echo "This suffix is only added to the files '${VERSION_SUFFIX_FOR_SVN}' "
+ echo "This suffix is added '${VERSION_SUFFIX_FOR_SVN}' "
echo
FILE_VERSION_SUFFIX=${VERSION_SUFFIX_FOR_SVN}
VERSION_SUFFIX_FOR_SVN=""
diff --git a/scripts/in_container/run_prepare_provider_packages.sh b/scripts/in_container/run_prepare_provider_packages.sh
index 86f7849..3de7aef 100755
--- a/scripts/in_container/run_prepare_provider_packages.sh
+++ b/scripts/in_container/run_prepare_provider_packages.sh
@@ -119,7 +119,8 @@ for PROVIDER_PACKAGE in "${PROVIDER_PACKAGES[@]}"
do
rm -rf -- *.egg-info build/
LOG_FILE=$(mktemp)
- python3 "${PREPARE_PROVIDER_PACKAGES_PY}" generate-setup-files "${PROVIDER_PACKAGE}"
+ python3 "${PREPARE_PROVIDER_PACKAGES_PY}" --version-suffix "${VERSION_SUFFIX_FOR_PYPI}" \
+ generate-setup-files "${PROVIDER_PACKAGE}"
echo "==================================================================================="
echo " Preparing ${PACKAGE_TYPE} package ${PROVIDER_PACKAGE} format: ${PACKAGE_FORMAT}"
if [[ "${VERSION_SUFFIX_FOR_PYPI}" == '' && "${VERSION_SUFFIX_FOR_SVN}" == ''
@@ -170,14 +171,18 @@ pushd dist
if [[ ${FILE_VERSION_SUFFIX} != "" ]]; then
# In case we have FILE_VERSION_SUFFIX we rename prepared files
- for FILE in *.tar.gz
- do
- mv "${FILE}" "${FILE//\.tar\.gz/${FILE_VERSION_SUFFIX}-bin.tar.gz}"
- done
- for FILE in *.whl
- do
- mv "${FILE}" "${FILE//\-py3/${FILE_VERSION_SUFFIX}-py3}"
- done
+ if [[ "${PACKAGE_FORMAT}" == "sdist" || "${PACKAGE_FORMAT}" == "both" ]]; then
+ for FILE in *.tar.gz
+ do
+ mv "${FILE}" "${FILE//\.tar\.gz/${FILE_VERSION_SUFFIX}-bin.tar.gz}"
+ done
+ fi
+ if [[ "${PACKAGE_FORMAT}" == "wheel" || "${PACKAGE_FORMAT}" == "both" ]]; then
+ for FILE in *.whl
+ do
+ mv "${FILE}" "${FILE//\-py3/${FILE_VERSION_SUFFIX}-py3}"
+ done
+ fi
fi
popd