diff --git a/scripts/release/debian/Dockerfile b/scripts/release/debian/Dockerfile index 3f621ac5c7d..6fd8d9d2b20 100644 --- a/scripts/release/debian/Dockerfile +++ b/scripts/release/debian/Dockerfile @@ -28,8 +28,7 @@ COPY . . RUN mkdir -p ./bin/pypi && \ BUILD_STAGINGDIRECTORY=/azure-cli/bin/pypi ./scripts/release/pypi/build.sh && \ if [ -d ./privates ]; then find ./privates -name '*.whl' | xargs pip install; fi && \ - find ./bin/pypi -name '*.whl' | xargs pip install && \ - pip install --force-reinstall urllib3==1.25.9 + find ./bin/pypi -name '*.whl' | xargs pip install && ARG cli_version=0.0.0-dev ARG cli_version_revision=1 @@ -44,4 +43,4 @@ FROM $base_image AS execution-env COPY --from=build-env /azure-cli_all.deb /azure-cli_all.deb RUN dpkg -i /azure-cli_all.deb && \ - rm /azure-cli_all.deb \ No newline at end of file + rm /azure-cli_all.deb diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 7c9c24af0e0..c90cb9e8234 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -53,16 +53,13 @@ 'jmespath', 'knack~=0.8.2', 'msal>=1.10.0,<2.0.0', - # Dependencies of the vendored subscription SDK - # https://github.com/Azure/azure-sdk-for-python/blob/ab12b048ddf676fe0ccec16b2167117f0609700d/sdk/resources/azure-mgmt-resource/setup.py#L82-L86 - 'msrest>=0.5.0', - 'msrestazure>=0.6.3', 'paramiko>=2.0.8,<3.0.0', 'pkginfo>=1.5.0.1', 'PyJWT==1.7.1', 'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612 'requests~=2.22', 'six~=1.12', + 'urllib3[secure]>=1.26.4', ] # dependencies for specific OSes diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index b8ee3f2fc98..0948649d597 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -125,13 +125,13 @@ pyOpenSSL==19.0.0 python-dateutil==2.8.0 pytz==2019.1 requests-oauthlib==1.2.0 -requests==2.22.0 +requests==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.25.9 +urllib3==1.26.4 vsts-cd-manager==1.0.2 vsts==0.1.25 wcwidth==0.1.7 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 6f921596d6a..88291e9d2c8 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -125,13 +125,13 @@ pyOpenSSL==19.0.0 python-dateutil==2.8.0 pytz==2019.1 requests-oauthlib==1.2.0 -requests==2.22.0 +requests==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.25.9 +urllib3==1.26.4 vsts-cd-manager==1.0.2 vsts==0.1.25 wcwidth==0.1.7 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 0e507e80bd9..526d4dcc087 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -126,13 +126,13 @@ python-dateutil==2.8.0 pytz==2019.1 pywin32==300 requests-oauthlib==1.2.0 -requests==2.22.0 +requests==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.25.9 +urllib3==1.26.4 vsts-cd-manager==1.0.2 vsts==0.1.25 wcwidth==0.1.7 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index ed47564fc16..2a179b4e9c9 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -143,7 +143,6 @@ 'scp~=0.13.2', 'semver==2.13.0', 'sshtunnel~=0.1.4', - 'urllib3[secure]>=1.25.9,<2.0.0', 'vsts-cd-manager~=1.0.0,>=1.0.2', 'websocket-client~=0.56.0', 'xmltodict~=0.12'