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/23 06:56:21 UTC

[airflow] branch v1-10-test updated (cc76857 -> 33b2c82)

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.


    from cc76857  Include airflow/contrib/executors in the dist package
     new 2320984  Reset PIP version after eager upgrade (#13251)
     new 33b2c82  Click should be limited for Python 2.7

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:
 Dockerfile.ci | 2 ++
 setup.py      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


[airflow] 02/02: Click should be limited for Python 2.7

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 33b2c82fcf4b8efc264360a7f54a541daf8c0025
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Dec 23 07:54:09 2020 +0100

    Click should be limited for Python 2.7
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f60b7c9..733cc9f 100644
--- a/setup.py
+++ b/setup.py
@@ -345,7 +345,6 @@ papermill = [
     'pyarrow<1.0.0',
     'fsspec<0.8.0;python_version=="3.5"',
     'black==20.8b0;python_version>="3.6"'  # we need to limit black version as we have click < 7
-
 ]
 password = [
     'bcrypt>=2.0.0',
@@ -601,6 +600,7 @@ INSTALL_REQUIREMENTS = [
     # cattrs >= 1.1.0 dropped support for Python 3.6
     'cattrs>=1.0, <1.1.0;python_version<="3.6"',
     'cattrs>=1.0, <2.0;python_version>"3.6"',
+    'click<8.0.0;python_version<"3.0"',  # click >8 is python 3.6 only but not marked as such yet
     'colorlog==4.0.2',
     'configparser>=3.5.0, <3.6.0',
     'croniter>=0.3.17, <0.4',


[airflow] 01/02: Reset PIP version after eager upgrade (#13251)

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 2320984d642f5f2f0543e362a103b180551e889c
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Tue Dec 22 14:23:54 2020 +0100

    Reset PIP version after eager upgrade (#13251)
    
    PIP upgrades itself after eager update, and since we (for now)
    stick with the 20.2.4 version we want to reset PIP to that
    version after eager upgrade.
    
    (cherry picked from commit c44092f8df9aa8555ef594d9fae4f28011a3a5a6)
---
 Dockerfile.ci | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 67e5bb1..9a39aa1 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -320,8 +320,10 @@ ENV UPGRADE_TO_LATEST_CONSTRAINTS=${UPGRADE_TO_LATEST_CONSTRAINTS}
 RUN if [[ ${INSTALL_FROM_PYPI} == "true" ]]; then \
         if [[ "${UPGRADE_TO_LATEST_CONSTRAINTS}" != "false" ]]; then \
             pip install -e ".[${AIRFLOW_EXTRAS}]" --upgrade --upgrade-strategy eager; \
+            pip install --upgrade "pip==${PIP_VERSION}"; \
         else \
             pip install -e ".[${AIRFLOW_EXTRAS}]" --upgrade --upgrade-strategy only-if-needed; \
+            pip install --upgrade "pip==${PIP_VERSION}"; \
         fi; \
     fi