Update vendoring scripts

- Update appveyor script to respect PR updates
- Add vendoring script to CI
- Closes #2428
This commit is contained in:
Dan Ryan
2018-06-26 18:46:53 -04:00
parent 6a15ee2456
commit d2dbbf4363
3 changed files with 5 additions and 15 deletions
+2 -9
View File
@@ -1,6 +1,5 @@
build: off
version: 1.0.{build}
skip_branch_with_pr: true
init:
@@ -13,23 +12,15 @@ init:
git config --global core.autocrlf input
if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
Write-Host "There are newer queued builds for this pull request, skipping build."
Exit-AppveyorBuild
}
If (($env:SKIP_NOTAG -eq "true") -and ($env:APPVEYOR_REPO_TAG -ne "true")) {
Write-Host "Skipping build, not at a tag."
Exit-AppveyorBuild
}
@@ -37,6 +28,8 @@ environment:
PYPI_VENDOR_DIR: '.\tests\pypi\'
GIT_ASK_YESNO: 'false'
APPVEYOR_SAVE_CACHE_ON_ERROR: 'true'
APPVEYOR_SKIP_FINALIZE_ON_EXIT: 'true'
SHELL: 'windows'
PYTHON_ARCH: '64'
PYTHONIOENCODING: 'utf-8'
+1 -1
View File
@@ -34,7 +34,7 @@ requirementslib==1.0.7
pyparsing==2.2.0
pytoml==0.1.16
requirements-parser==0.2.0
shellingham==1.1.0dev0
shellingham==1.1.0
six==1.11.0
semver==2.8.0
shutilwhich==1.1.0
+2 -5
View File
@@ -41,10 +41,8 @@ fi
echo "Installing dependencies…"
PIPENV_PYTHON=2.7 pipenv run pip install -e . --upgrade
PIPENV_PYTHON=3.6 pipenv run pip install -e . --upgrade
PIPENV_PYTHON=3.7 pipenv run pip install -e . --upgrade
PIPENV_PYTHON=2.7 pipenv install --dev
PIPENV_PYTHON=3.6 pipenv install --dev
PIPENV_PYTHON=3.7 pipenv install --dev
echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\""
# PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" | prefix 2.7 &
@@ -52,10 +50,9 @@ echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\""
# Better to run them sequentially.
PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE"
PIPENV_PYTHON=3.6 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE"
PIPENV_PYTHON=3.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE"
# test revendoring
pip install --upgrade invoke
inv vendoring.update
pip3 install --upgrade invoke requests parver
python3 -m invoke vendoring.update
# Cleanup junk.
rm -fr .venv