diff options
| author | bors <bors@rust-lang.org> | 2019-07-21 18:59:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-21 18:59:36 +0000 |
| commit | 273f42b5964c29dda2c5a349dd4655529767b07f (patch) | |
| tree | 02a637ddb88f414cb69775a7235ef851a33d1bfe | |
| parent | 83dfe7b27cf2debecebedd3b038f9a1c2e05e051 (diff) | |
| parent | ace3684286530b06d464893b935f967736ae049f (diff) | |
| download | rust-273f42b5964c29dda2c5a349dd4655529767b07f.tar.gz rust-273f42b5964c29dda2c5a349dd4655529767b07f.zip | |
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
| -rw-r--r-- | .azure-pipelines/steps/run.yml | 4 | ||||
| -rw-r--r-- | src/ci/awscli-requirements.txt | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index 795eb73507c..0b3e2376349 100644 --- a/.azure-pipelines/steps/run.yml +++ b/.azure-pipelines/steps/run.yml @@ -142,11 +142,11 @@ steps: set -e source src/ci/shared.sh sudo apt-get install -y python3-setuptools - retry pip3 install awscli --upgrade --user + retry pip3 install -r src/ci/awscli-requirements.txt --upgrade --user echo "##vso[task.prependpath]$HOME/.local/bin" displayName: Install awscli (Linux) condition: and(succeeded(), not(variables.SKIP_JOB), eq(variables['Agent.OS'], 'Linux')) -- script: pip install awscli +- script: pip install -r src/ci/awscli-requirements.txt displayName: Install awscli (non-Linux) condition: and(succeeded(), not(variables.SKIP_JOB), ne(variables['Agent.OS'], 'Linux')) diff --git a/src/ci/awscli-requirements.txt b/src/ci/awscli-requirements.txt new file mode 100644 index 00000000000..c1ffa525a1b --- /dev/null +++ b/src/ci/awscli-requirements.txt @@ -0,0 +1,13 @@ +awscli==1.16.201 +botocore==1.12.191 +colorama==0.3.9 +docutils==0.14 +jmespath==0.9.4 +pyasn1==0.4.5 +python-dateutil==2.8.0 +PyYAML==5.1 +rsa==3.4.2 +s3transfer==0.2.1 +six==1.12.0 +urllib3==1.25.3 +futures==3.3.0; python_version < '3.0' |