Skip to content

Commit

Permalink
Merge branch master into 'doc_zh'
Browse files Browse the repository at this point in the history
  • Loading branch information
frostming committed Jul 20, 2019
2 parents 5ba2a14 + 9208ec9 commit 5566dff
Show file tree
Hide file tree
Showing 117 changed files with 7,152 additions and 2,260 deletions.
21 changes: 0 additions & 21 deletions .azure-pipelines/docs.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .azure-pipelines/jobs/run-manifest-check.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .azure-pipelines/jobs/run-tests-windows.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .azure-pipelines/jobs/run-tests.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .azure-pipelines/jobs/run-vendor-scripts.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .azure-pipelines/jobs/test.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .azure-pipelines/linux.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .azure-pipelines/steps/create-virtualenv-linux.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .azure-pipelines/steps/create-virtualenv-windows.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .azure-pipelines/steps/reinstall-pythons.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
steps:
- script: |
# When you paste this, please make sure the indentation is preserved
# Fail out if any setups fail
set -e
# Delete old Pythons
rm -rf $AGENT_TOOLSDIRECTORY/Python/2.7.16
rm -rf $AGENT_TOOLSDIRECTORY/Python/3.5.7
rm -rf $AGENT_TOOLSDIRECTORY/Python/3.7.3
[ -e $AGENT_TOOLSDIRECTORY/Python/3.7.2 ] && [ -e $AGENT_TOOLSDIRECTORY/Python/3.5.5 ] && [ -e $AGENT_TOOLSDIRECTORY/Python/2.7.15 ] && exit 0
# Download new Pythons
azcopy --recursive \
--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/2.7.15 \
--destination $AGENT_TOOLSDIRECTORY/Python/2.7.15
azcopy --recursive \
--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.5.5 \
--destination $AGENT_TOOLSDIRECTORY/Python/3.5.5
azcopy --recursive \
--source https://vstsagenttools.blob.core.windows.net/tools/hostedtoolcache/linux/Python/3.7.2 \
--destination $AGENT_TOOLSDIRECTORY/Python/3.7.2
# Install new Pythons
original_directory=$PWD
setups=$(find $AGENT_TOOLSDIRECTORY/Python -name setup.sh)
for setup in $setups; do
chmod +x $setup;
cd $(dirname $setup);
./$(basename $setup);
cd $original_directory;
done;
displayName: 'Workaround: roll back Python versions'
24 changes: 0 additions & 24 deletions .azure-pipelines/windows.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,8 @@ pytype.cfg
typeshed/
.dmypy.json
mypyhtml/
XDG_CACHE_HOME/
snap/
prime/
stage/
pip-wheel-metadata/
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
url = https://github.com/pinax/pinax.git
[submodule "tests/test_artifacts/git/requests"]
path = tests/test_artifacts/git/requests
url = https://github.com/requests/requests.git
url = https://github.com/kennethreitz/requests.git
[submodule "tests/test_artifacts/git/six"]
path = tests/test_artifacts/git/six
url = https://github.com/benjaminp/six.git
Expand All @@ -24,7 +24,7 @@
url = https://github.com/pallets/flask.git
[submodule "tests/test_artifacts/git/requests-2.18.4"]
path = tests/test_artifacts/git/requests-2.18.4
url = https://github.com/requests/requests
url = https://github.com/kennethreitz/requests
[submodule "tests/pypi"]
path = tests/pypi
url = https://github.com/sarugaku/pipenv-test-artifacts.git

0 comments on commit 5566dff

Please sign in to comment.