Merge branch 'master' into feature/3577

pypa · May 27, 2019 · 534e167 · 534e167
2 parents 28c00e2 + c37543b
commit 534e167
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/.azure-pipelines/steps/build-package.yml b/.azure-pipelines/steps/build-package.yml
@@ -0,0 +1,12 @@
+- script: |
+ python -m pip install --upgrade wheel pip setuptools twine readme_renderer[md]
+ python setup.py sdist bdist_wheel
+ twine check dist/*
+ displayName: Build and check package
+ env:
+ PY_EXE: $(PY_EXE)
+ GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)
+ LANG: $(LANG)
+ PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
+ PYTHONWARNINGS: ignore:DEPRECATION
+ PIPENV_NOSPIN: '1'
diff --git a/.azure-pipelines/steps/run-vendor-scripts.yml b/.azure-pipelines/steps/run-vendor-scripts.yml
@@ -0,0 +1,11 @@
+- script: |
+ python -m pip install --upgrade invoke requests parver bs4 vistir towncrier pip setuptools wheel --upgrade-strategy=eager
+ python -m invoke vendoring.update
+ displayName: Run Vendor Scripts
+ env:
+ PY_EXE: $(PY_EXE)
+ GIT_SSL_CAINFO: $(GIT_SSL_CAINFO)
+ LANG: $(LANG)
+ PIPENV_DEFAULT_PYTHON_VERSION: $(PIPENV_DEFAULT_PYTHON_VERSION)
+ PYTHONWARNINGS: ignore:DEPRECATION
+ PIPENV_NOSPIN: '1'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,17 +25,23 @@ jobs:
  strategy:
  matrix:
  Python27:
- python.version: '2.7'
+ python.version: '2.7.15'
+ python.architecture: x64
  Python36:
- python.version: '3.6'
+ python.version: '3.6.8'
+ python.architecture: x64
  Python37:
- python.version: '3.7'
+ python.version: '3.7.2'
+ python.architecture: x64
  maxParallel: 4
  steps:
  - template: .azure-pipelines/steps/run-tests.yml
  parameters:
  vmImage: 'Ubuntu-16.04'
- - template: .azure-pipelines/jobs/run-vendor-scripts.yml
+ - template: .azure-pipelines/steps/run-vendor-scripts.yml
+ parameters:
+ vmImage: 'Ubuntu-16.04'
+ - template: .azure-pipelines/steps/build-package.yml
  parameters:
  vmImage: 'Ubuntu-16.04'
 
@@ -65,11 +71,14 @@ jobs:
  strategy:
  matrix:
  Python27:
- python.version: '2.7'
+ python.version: '2.7.16'
+ python.architecture: x64
  Python36:
- python.version: '3.6'
+ python.version: '3.6.8'
+ python.architecture: x64
  Python37:
- python.version: '3.7'
+ python.version: '3.7.3'
+ python.architecture: x64
  maxParallel: 4
  steps:
  - template: .azure-pipelines/steps/run-tests.yml