From 07227b70c6c08f53a58264d455697d232a162fe6 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Mon, 1 Nov 2021 06:32:03 -0500
Subject: [PATCH] Fix azure-cli requirements
Signed-off-by: Major Hayden <major@redhat.com>
---
src/azure-cli-core/setup.py | 6 +-
src/azure-cli-telemetry/setup.py | 2 +-
src/azure-cli-testsdk/setup.py | 2 +-
src/azure-cli/requirements.py3.Linux.txt | 87 +++++++++++-------------
src/azure-cli/setup.py | 18 ++---
5 files changed, 55 insertions(+), 60 deletions(-)
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index 921cf29eff..b27694f4fa 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -48,7 +48,7 @@ DEPENDENCIES = [
'azure-cli-telemetry==1.0.6.*',
'azure-mgmt-core>=1.2.0,<1.3.0', # the preview version of azure-mgmt-core is 1.3.0b1, it cannot fit azure-core >=1.14.0
'cryptography',
- 'humanfriendly>=4.7,<10.0',
+ 'humanfriendly>=4.7',
'jmespath',
'knack~=0.8.2',
'msal>=1.10.0,<2.0.0',
@@ -56,9 +56,9 @@ DEPENDENCIES = [
'pkginfo>=1.5.0.1',
'PyJWT>=2.1.0',
'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612
- 'requests[socks]~=2.25.1',
+ 'requests[socks]>=2.25.1',
'six~=1.12',
- 'urllib3[secure]>=1.26.5',
+ 'urllib3>=1.26.5',
]
# dependencies for specific OSes
diff --git a/src/azure-cli-telemetry/setup.py b/src/azure-cli-telemetry/setup.py
index 38b0b0a1c9..4e2b1b7fc5 100755
--- a/src/azure-cli-telemetry/setup.py
+++ b/src/azure-cli-telemetry/setup.py
@@ -41,7 +41,7 @@ setup(
classifiers=CLASSIFIERS,
install_requires=[
'applicationinsights>=0.11.1,<0.12',
- 'portalocker~=1.6',
+ 'portalocker>=1.5',
],
packages=[
'azure.cli.telemetry',
diff --git a/src/azure-cli-testsdk/setup.py b/src/azure-cli-testsdk/setup.py
index 4b02dafb52..a6b7adc518 100644
--- a/src/azure-cli-testsdk/setup.py
+++ b/src/azure-cli-testsdk/setup.py
@@ -25,7 +25,7 @@ CLASSIFIERS = [
DEPENDENCIES = [
'jmespath',
'vcrpy>=1.10.3',
- 'azure-devtools==1.2.0',
+ 'azure-devtools>=1.2.0',
'pytest'
]
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
index 5bf9557df3..8dfe28f94a 100644
--- a/src/azure-cli/requirements.py3.Linux.txt
+++ b/src/azure-cli/requirements.py3.Linux.txt
@@ -1,13 +1,10 @@
adal==1.2.7
-antlr4-python3-runtime==4.7.2
+antlr4-python3-runtime>=4.7.2
applicationinsights==0.11.9
-argcomplete==1.11.1
-asn1crypto==0.24.0
+argcomplete>=1.11.1
+asn1crypto>=0.24.0
azure-appconfiguration==1.1.1
azure-batch==11.0.0
-azure-cli-core==2.29.2
-azure-cli-telemetry==1.0.6
-azure-cli==2.29.2
azure-common==1.1.22
azure-core==1.13.0
azure-cosmos==3.2.0
@@ -39,7 +36,6 @@ azure-mgmt-core==1.2.1
azure-mgmt-cosmosdb==6.4.0
azure-mgmt-databoxedge==1.0.0
azure-mgmt-datalake-analytics==0.2.1
-azure-mgmt-datalake-nspkg==3.0.1
azure-mgmt-datalake-store==0.5.0
azure-mgmt-datamigration==9.0.0
azure-mgmt-deploymentmanager==0.2.0
@@ -87,57 +83,56 @@ azure-mgmt-synapse==2.0.0
azure-mgmt-trafficmanager==0.51.0
azure-mgmt-web==4.0.0
azure-multiapi-storage==0.6.2
-azure-nspkg==3.0.2
azure-storage-common==1.4.2
azure-synapse-accesscontrol==0.5.0
azure-synapse-artifacts==0.8.0
azure-synapse-spark==0.2.0
azure-synapse-managedprivateendpoints==0.3.0
bcrypt==3.2.0
-certifi==2019.6.16
-cffi==1.14.4
-chardet==3.0.4
-colorama==0.4.1
-ConfigArgParse==0.14.0
-cryptography==3.3.2
+certifi>=2019.6.16
+cffi>=1.14.4
+chardet>=3.0.4
+colorama>=0.4.1
+ConfigArgParse>=0.14.0
+cryptography>=3.3.2
distro==1.6.0
-fabric==2.4.0
-humanfriendly==9.1
-idna==2.8
-invoke==1.2.0
+fabric>=2.4.0
+humanfriendly>=8.2
+idna>=2.8
+invoke>=1.2.0
isodate==0.6.0
-Jinja2==2.11.3
-jmespath==0.9.5
+Jinja2>=2.11.3
+jmespath>=0.9.5
knack==0.8.2
-MarkupSafe==1.1.1
-msal==1.10.0
+MarkupSafe>=1.1.1
+msal>=1.10.0
msrest==0.6.21
-msrestazure==0.6.3
-oauthlib==3.0.1
-packaging==20.9
-paramiko==2.6.0
-pbr==5.3.1
-portalocker==1.7.1
+msrestazure>=0.6.3
+oauthlib>=3.0.1
+packaging>=20.9
+paramiko>=2.6.0
+pbr>=5.3.1
+portalocker>=1.5
psutil==5.8.0
-pycparser==2.19
-PyGithub==1.38
-PyJWT==2.1.0
+pycparser>=2.19
+PyGithub>=1.38
+PyJWT>=2.1.0
PyNaCl==1.4.0
-pyOpenSSL==19.0.0
-python-dateutil==2.8.0
-pytz==2019.1
-requests-oauthlib==1.2.0
-requests[socks]==2.25.1
-scp==0.13.2
+pyOpenSSL>=19.0.0
+python-dateutil>=2.8.0
+pytz>=2019.1
+requests-oauthlib>=1.2.0
+requests[socks]>=2.25.1
+scp>=0.13.2
semver==2.13.0
-six==1.14.0
-sshtunnel==0.1.5
-tabulate==0.8.3
-urllib3==1.26.5
+six>=1.14.0
+sshtunnel>=0.1.5
+tabulate>=0.8.3
+urllib3>=1.26.5
vsts==0.1.25
-wcwidth==0.1.7
-websocket-client==0.56.0
-wrapt==1.11.2
+wcwidth>=0.1.7
+websocket-client>=0.56.0
+wrapt>=1.11.2
xmltodict==0.12.0
-jsondiff==1.2.0
-javaproperties==0.5.1
+jsondiff>=1.2.0
+javaproperties>=0.5.1
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index 4d1c6f3e7c..af2a81aabf 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -50,7 +50,7 @@ CLASSIFIERS = [
]
DEPENDENCIES = [
- 'antlr4-python3-runtime~=4.7.2',
+ 'antlr4-python3-runtime>=4.7.2',
'azure-appconfiguration~=1.1.1',
'azure-batch~=11.0.0',
'azure-cli-core=={}'.format(VERSION),
@@ -137,18 +137,18 @@ DEPENDENCIES = [
'azure-synapse-spark~=0.2.0',
'azure-synapse-managedprivateendpoints~=0.3.0',
'fabric~=2.4',
- 'javaproperties~=0.5.1',
- 'jsondiff~=1.2.0',
- 'packaging~=20.9',
+ 'javaproperties>=0.5.1',
+ 'jsondiff>=1.2.0',
+ 'packaging>=20.9',
'PyGithub~=1.38',
'PyNaCl~=1.4.0',
- 'pytz==2019.1',
- 'scp~=0.13.2',
+ 'pytz>=2019.1',
+ 'scp>=0.13.2',
'semver==2.13.0',
- 'sshtunnel~=0.1.4',
- 'websocket-client~=0.56.0',
+ 'sshtunnel>=0.1.4',
+ 'websocket-client>=0.56.0',
'xmltodict~=0.12',
- 'chardet~=3.0.4'
+ 'chardet>=3.0.4'
]
# On Linux, the distribution (Ubuntu, Debian, etc) and version are checked
--
2.33.1