Skip to content
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

Jump to bottom

Add new feature toggle for VCS dependency resolution #3661

Merged
merged 5 commits into from
May 27, 2019
Merged

Add new feature toggle for VCS dependency resolution #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0e3bba
parent 8ae44bc90b336c44c66d0273c2208b28d0023da7
techalchemy Mar 31, 2019
6d5a510
Fix missing timeout error
techalchemy May 27, 2019
a035132
Fix marker generation and update lockfile
techalchemy May 27, 2019
c10a2e3
Update azure steps
techalchemy May 27, 2019
9a2772a
Merge branch 'master' into feature/3577
techalchemy May 27, 2019
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
7 changes: 5 additions & 2 deletions .azure-pipelines/steps/run-tests-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
python_version: ''

steps:
- script: |
# Fix Git SSL errors
Expand All @@ -9,7 +12,7 @@ steps:
PY_EXE: $(PY_EXE)
GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)
LANG: $(LANG)
PIP_PROCESS_DEPENDENCY_LINKS: $(PIP_PROCESS_DEPENDENCY_LINKS)
PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
PIP_PROCESS_DEPENDENCY_LINKS: '$(PIP_PROCESS_DEPENDENCY_LINKS)'
PIPENV_DEFAULT_PYTHON_VERSION: '${{ parameters.python_version }}'
PYTHONWARNINGS: ignore:DEPRECATION
PIPENV_NOSPIN: '1'
5 changes: 4 additions & 1 deletion .azure-pipelines/steps/run-tests-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
python_version: ''

steps:
- powershell: |
subst T: "$env:TEMP"
Expand All @@ -11,6 +14,6 @@ steps:
pipenv run pytest -ra --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests
displayName: Run integration tests
env:
PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
PIPENV_DEFAULT_PYTHON_VERSION: '${{ parameters.python_version }}'
PYTHONWARNINGS: 'ignore:DEPRECATION'
PIPENV_NOSPIN: '1'
8 changes: 6 additions & 2 deletions .azure-pipelines/steps/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,22 @@ steps:
- template: install-dependencies.yml

- script: |
echo '##vso[task.setvariable variable=PIPENV_DEFAULT_PYTHON_VERSION]$PYTHON_VERSION'
echo '##vso[task.setvariable variable=PIPENV_DEFAULT_PYTHON_VERSION]$(python.version)'
env:
PYTHON_VERSION: $(python.version)

- template: create-virtualenv.yml
parameters:
python.version: $(python.version)
python_version: $(python.version)

- ${{ if eq(parameters.vmImage, 'windows-2019') }}:
- template: run-tests-windows.yml
parameters:
python_version: $(python.version)
- ${{ if ne(parameters.vmImage, 'windows-2019') }}:
- template: run-tests-linux.yml
parameters:
python_version: $(python.version)

- task: PublishTestResults@2
displayName: Publish Test Results
Expand Down
5 changes: 4 additions & 1 deletion .azure-pipelines/steps/run-vendor-scripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
python_version: ''

steps:
- script: |
python -m pip install --upgrade invoke requests parver bs4 vistir towncrier pip setuptools wheel --upgrade-strategy=eager
Expand All @@ -7,6 +10,6 @@ steps:
PY_EXE: $(PY_EXE)
GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)
LANG: $(LANG)
PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
PIPENV_DEFAULT_PYTHON_VERSION: '${{ parameters.python_version }}'
PYTHONWARNINGS: ignore:DEPRECATION
PIPENV_NOSPIN: '1'
Loading