This is an automated email from the ASF dual-hosted git repository. kaxilnaik pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit fda6667f7ffc10027e9ff0fb9cdf0f085751860a Author: Jarek Potiuk <[email protected]> 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) --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 83e8a98..5356a73 100644 --- a/setup.py +++ b/setup.py @@ -431,7 +431,8 @@ devel = [ 'click==6.7', 'contextdecorator;python_version<"3.4"', 'coverage', - 'docutils>=0.14, <0.16', + 'docutils>=0.14, <0.16; python_version<"3.0"', + 'docutils;python_version>="3.0"', 'ecdsa<0.15', # Required for moto 1.3.14 'flake8>=3.6.0', 'flake8-colors', @@ -649,7 +650,8 @@ INSTALL_REQUIREMENTS = [ 'sqlalchemy_jsonfield~=0.9;python_version>="3.5"', 'tabulate>=0.7.5, <0.9', 'tenacity==4.12.0', - 'thrift>=0.11.0', + 'thrift>=0.9.2;python_version>="3.0"', + 'thrift==0.9.3;python_version<"3.0"', # required by thrifts_sasl for python 2.0 'typing;python_version<"3.5"', 'typing-extensions>=3.7.4;python_version<"3.8"', 'tzlocal>=1.4,<2.0.0',
