Skip to content

{Packaging} Bump urllib3 and requests #18213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiasli merged 1 commit into from
May 31, 2021
Merged

{Packaging} Bump urllib3 and requests #18213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions scripts/release/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

@jiasli jiasli May 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line used to work around #9257, which has already been fixed by the latest requests.

find ./bin/pypi -name '*.whl' | xargs pip install &&

ARG cli_version=0.0.0-dev
ARG cli_version_revision=1
Expand All @@ -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
rm /azure-cli_all.deb
5 changes: 1 addition & 4 deletions src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Comment on lines -56 to -59
Copy link
Member Author

@jiasli jiasli May 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be removed by #18047

'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',
Copy link
Member Author

@jiasli jiasli May 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dependency on urllib3 should go to azure-cli-core as requests is required here.

azure-cli/src/azure-cli-core/setup.py

Line 60 in f50cf6b

'requests~=2.22',

]

# dependencies for specific OSes
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member Author

@jiasli jiasli May 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As azure-cli-core/setup.py doesn't pin requests,

azure-cli/src/azure-cli-core/setup.py

Line 60 in f50cf6b

'requests~=2.22',

we can bump it at the same time.

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
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down