Add new feature toggle for VCS dependency resolution (#3661)

Add new feature toggle for VCS dependency resolution
pypa · May 27, 2019 · 9ea2702 · 9ea2702
2 parents 89fc565 + 9a2772a
commit 9ea2702
Show file tree

Hide file tree

Showing 17 changed files with 177 additions and 173 deletions.
diff --git a/.azure-pipelines/steps/run-tests-linux.yml b/.azure-pipelines/steps/run-tests-linux.yml
@@ -1,3 +1,6 @@
+parameters:
+ python_version: ''
+
 steps:
 - script: |
  # Fix Git SSL errors
@@ -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'
diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml
@@ -1,3 +1,6 @@
+parameters:
+ python_version: ''
+
 steps:
 - powershell: |
  subst T: "$env:TEMP"
@@ -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'
diff --git a/.azure-pipelines/steps/run-tests.yml b/.azure-pipelines/steps/run-tests.yml
@@ -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

diff --git a/.azure-pipelines/steps/run-vendor-scripts.yml b/.azure-pipelines/steps/run-vendor-scripts.yml
@@ -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
@@ -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'