[airflow] branch v1-10-test updated: fixup! fixup! fixup! Update setup.py to get non-conflicting set of dependencies (#12636)

[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


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 104bd5c  fixup! fixup! fixup! Update setup.py to get non-conflicting set of dependencies (#12636)
104bd5c is described below

commit 104bd5cde2189f68fcb1cb7cf3c561abd73896eb
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Nov 30 00:32:03 2020 +0100

    fixup! fixup! fixup! Update setup.py to get non-conflicting set of dependencies (#12636)
---
 setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 4f566f6..10ac240 100644
--- a/setup.py
+++ b/setup.py
@@ -186,7 +186,8 @@ aws = [
 ]
 azure_blob_storage = [
     'azure-storage>=0.34.0, <0.37.0',
-    'azure-storage-blob',
+    'azure-storage-blob<12.0.0;python_version<"3.6"',
+    'azure-storage-blob;python_version>="3.6"',
     'azure-storage-common',
 ]
 azure_container_instances = [
@@ -199,6 +200,7 @@ azure_data_lake = [
     'azure-datalake-store>=0.0.45'
     'azure-mgmt-datalake-store>=0.5.0',
     'azure-mgmt-resource>=2.2.0',
+    'cffi<1.14.0;python_version<"3.0"'
 ]
 azure_secrets = [
     'azure-identity>=1.3.1',
@@ -428,8 +430,7 @@ devel = [
     'click==6.7',
     'contextdecorator;python_version<"3.4"',
     'coverage',
-    'docutils>=0.14, <0.16; python_version<"3.0"',
-    'docutils;python_version>="3.0"',
+    'docutils>=0.14, <0.16',
     'ecdsa<0.15',  # Required for moto 1.3.14
     'flake8>=3.6.0',
     'flake8-colors',