This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch test-pip-check in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e92575f70bd0c17dc9a5064e1f801e8116dd6732 Author: Jarek Potiuk <[email protected]> AuthorDate: Tue Nov 24 20:38:34 2020 +0000 Change constraints to use pipcheck --- Dockerfile.ci | 2 +- scripts/ci/libraries/_initialization.sh | 2 +- setup.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 87f4d2f..7ce6b18 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -250,7 +250,7 @@ ENV AIRFLOW_CONSTRAINTS_LOCATION=${AIRFLOW_CONSTRAINTS_LOCATION} # By changing the CI build epoch we can force reinstalling Airflow from the current master # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH environment variable. -ARG AIRFLOW_CI_BUILD_EPOCH="2" +ARG AIRFLOW_CI_BUILD_EPOCH="6" ENV AIRFLOW_CI_BUILD_EPOCH=${AIRFLOW_CI_BUILD_EPOCH} ARG AIRFLOW_PRE_CACHED_PIP_PACKAGES="true" diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh index f47a818..706d2ed 100644 --- a/scripts/ci/libraries/_initialization.sh +++ b/scripts/ci/libraries/_initialization.sh @@ -153,7 +153,7 @@ function initialization::initialize_base_variables() { function initialization::initialize_branch_variables() { # Default branch used - this will be different in different branches export DEFAULT_BRANCH=${DEFAULT_BRANCH="master"} - export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-master"} + export DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH="constraints-pipcheck"} readonly DEFAULT_BRANCH readonly DEFAULT_CONSTRAINTS_BRANCH diff --git a/setup.py b/setup.py index 9226c04..a40eac0 100644 --- a/setup.py +++ b/setup.py @@ -188,7 +188,6 @@ azure = [ 'azure-mgmt-datalake-store>=0.5.0', 'azure-mgmt-resource>=2.2.0', 'azure-storage>=0.34.0, <0.37.0', - 'azure-storage-blob<12.0', ] cassandra = [ 'cassandra-driver>=3.13.0,<3.21.0', @@ -463,8 +462,7 @@ devel = [ 'ipdb', 'jira', 'mongomock', - 'moto==1.3.14', # TODO - fix Datasync issues to get higher version of moto: - # See: https://github.com/apache/airflow/issues/10985 + 'moto', 'parameterized', 'paramiko', 'pipdeptree',
