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/03 07:16:14 UTC
[airflow] branch v1-10-test updated (fda6667 -> 5c663d5)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a change to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.
discard fda6667 Update setup.py to get non-conflicting set of dependencies (#12636)
new 6f7ee10 Update setup.py to get non-conflicting set of dependencies (#12636)
new 5c663d5 fixup! Improve verification of images with PIP check (#12718)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (fda6667)
\
N -- N -- N refs/heads/v1-10-test (5c663d5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
scripts/ci/images/ci_verify_prod_image.sh | 26 ++------------------------
setup.py | 6 ++----
2 files changed, 4 insertions(+), 28 deletions(-)
[airflow] 01/02: Update setup.py to get non-conflicting set of
dependencies (#12636)
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 6f7ee1006e5bef573381c3cbd0e8284eb6c10554
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Nov 29 19:45:58 2020 +0100
Update setup.py to get non-conflicting set of dependencies (#12636)
This change upgrades setup.py and setup.cfg to provide non-conflicting
`pip check` valid set of constraints for CI image.
(cherry picked from commit 5370f3feb095e02704b0852fe630efdd118cb8f5)
[airflow] 02/02: fixup! Improve verification of images with PIP
check (#12718)
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 5c663d527165e91d0b32d90cce633a1e51bac293
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Thu Dec 3 08:14:25 2020 +0100
fixup! Improve verification of images with PIP check (#12718)
---
scripts/ci/images/ci_verify_prod_image.sh | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/scripts/ci/images/ci_verify_prod_image.sh b/scripts/ci/images/ci_verify_prod_image.sh
index b330904..9718a48 100755
--- a/scripts/ci/images/ci_verify_prod_image.sh
+++ b/scripts/ci/images/ci_verify_prod_image.sh
@@ -18,7 +18,7 @@
# shellcheck source=scripts/ci/libraries/_script_init.sh
. "$( dirname "${BASH_SOURCE[0]}" )/../libraries/_script_init.sh"
-function verify_prod_image_has_airflow_and_providers {
+function verify_prod_image_has_airflow {
echo
echo "Airflow folders installed in the image:"
echo
@@ -49,28 +49,6 @@ function verify_prod_image_has_airflow_and_providers {
echo -e " \e[32mOK. Airflow is installed.\e[0m"
echo
fi
-
- EXPECTED_MIN_PROVIDERS_DIRS_COUNT="240"
- readonly EXPECTED_MIN_PROVIDERS_DIRS_COUNT
-
- COUNT_AIRFLOW_PROVIDERS_DIRS=$(docker run --rm --entrypoint /bin/bash "${AIRFLOW_PROD_IMAGE}" -c \
- 'find '"${AIRFLOW_INSTALLATION_LOCATION}"'/lib/python*/site-packages/airflow/providers -type d | grep -c "" | xargs')
-
- echo
- echo "Number of providers dirs: ${COUNT_AIRFLOW_PROVIDERS_DIRS}"
- echo
-
- if [ "${COUNT_AIRFLOW_PROVIDERS_DIRS}" -lt "${EXPECTED_MIN_PROVIDERS_DIRS_COUNT}" ]; then
- >&2 echo
- >&2 echo Number of providers folders installed is less than ${EXPECTED_MIN_PROVIDERS_DIRS_COUNT}
- >&2 echo This is unexpected. Please investigate, looking at the output above!
- >&2 echo
- exit 1
- else
- echo
- echo -e " \e[32mOK. Airflow Providers are installed.\e[0m"
- echo
- fi
}
@@ -111,6 +89,6 @@ function pull_prod_image() {
build_images::prepare_prod_build
-verify_prod_image_has_airflow_and_providers
+verify_prod_image_has_airflow
verify_prod_image_dependencies