Skip to content

Commit 273f42b

Browse files
committed
Auto merge of #62856 - pietroalbini:fix-awscli, r=Mark-Simulacrum
ci: pin awscli dependencies docutils 0.15, a dependency of awscli, broke our CI since it's not compatible with Python 2 due to a bug. This pins all the dependencies of awscli with docutils 0.14, to make sure this kind of regressions doesn't happen again. r? @Mark-Simulacrum @alexcrichton
2 parents 83dfe7b + ace3684 commit 273f42b

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.azure-pipelines/steps/run.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ steps:
142142
set -e
143143
source src/ci/shared.sh
144144
sudo apt-get install -y python3-setuptools
145-
retry pip3 install awscli --upgrade --user
145+
retry pip3 install -r src/ci/awscli-requirements.txt --upgrade --user
146146
echo "##vso[task.prependpath]$HOME/.local/bin"
147147
displayName: Install awscli (Linux)
148148
condition: and(succeeded(), not(variables.SKIP_JOB), eq(variables['Agent.OS'], 'Linux'))
149-
- script: pip install awscli
149+
- script: pip install -r src/ci/awscli-requirements.txt
150150
displayName: Install awscli (non-Linux)
151151
condition: and(succeeded(), not(variables.SKIP_JOB), ne(variables['Agent.OS'], 'Linux'))
152152

src/ci/awscli-requirements.txt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
awscli==1.16.201
2+
botocore==1.12.191
3+
colorama==0.3.9
4+
docutils==0.14
5+
jmespath==0.9.4
6+
pyasn1==0.4.5
7+
python-dateutil==2.8.0
8+
PyYAML==5.1
9+
rsa==3.4.2
10+
s3transfer==0.2.1
11+
six==1.12.0
12+
urllib3==1.25.3
13+
futures==3.3.0; python_version < '3.0'

0 commit comments

Comments
 (0)