From bfd960538623f01132d4877c36d316d8308f6619 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Thu, 25 Apr 2019 08:15:49 -0400 Subject: [PATCH 1/3] quote floats --- azure-pipelines.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6dda98580..e77e85698 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,11 +42,11 @@ jobs: displayName: notify code climate of new build - template: azure-run-tox-env.yml - parameters: {tox: fix_lint, python: 3.7} + parameters: {tox: fix_lint, python: '3.7'} - template: azure-run-tox-env.yml - parameters: {tox: docs, python: 3.7} + parameters: {tox: docs, python: '3.7'} - template: azure-run-tox-env.yml - parameters: {tox: package_description, python: 3.7} + parameters: {tox: package_description, python: '3.7'} - template: azure-run-tox-env.yml parameters: {tox: pypy, python: pypy, os: linux} @@ -54,31 +54,31 @@ jobs: parameters: {tox: pypy3, python: pypy3, os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py37, python: 3.7, os: windows} + parameters: {tox: py37, python: '3.7', os: windows} - template: azure-run-tox-env.yml - parameters: {tox: py36, python: 3.6, os: windows} + parameters: {tox: py36, python: '3.6', os: windows} - template: azure-run-tox-env.yml - parameters: {tox: py35, python: 3.5, os: windows} + parameters: {tox: py35, python: '3.5', os: windows} - template: azure-run-tox-env.yml - parameters: {tox: py34, python: 3.4, os: windows} + parameters: {tox: py34, python: '3.4', os: windows} - template: azure-run-tox-env.yml - parameters: {tox: py27, python: 2.7, os: windows} + parameters: {tox: py27, python: '2.7', os: windows} - template: azure-run-tox-env.yml - parameters: {tox: py37, python: 3.7, os: linux} + parameters: {tox: py37, python: '3.7', os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py36, python: 3.6, os: linux} + parameters: {tox: py36, python: '3.6', os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py35, python: 3.5, os: linux} + parameters: {tox: py35, python: '3.5', os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py34, python: 3.4, os: linux} + parameters: {tox: py34, python: '3.4', os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py27, python: 2.7, os: linux} + parameters: {tox: py27, python: '2.7', os: linux} - template: azure-run-tox-env.yml - parameters: {tox: py37, python: 3.7, os: macOs} + parameters: {tox: py37, python: '3.7', os: macOs} - template: azure-run-tox-env.yml - parameters: {tox: py27, python: 2.7, os: macOs} + parameters: {tox: py27, python: '2.7', os: macOs} - job: report_coverage pool: {vmImage: "Ubuntu-16.04"} From 9303d1a0a21da87f6622a987c545167428268dc5 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Thu, 25 Apr 2019 08:17:18 -0400 Subject: [PATCH 2/3] remove PyPy special cases --- azure-run-tox-env.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/azure-run-tox-env.yml b/azure-run-tox-env.yml index 449f03a7e..9d04ad73d 100644 --- a/azure-run-tox-env.yml +++ b/azure-run-tox-env.yml @@ -18,18 +18,13 @@ jobs: TMPDIR: $(Build.BinariesDirectory) ${{ if in(parameters.tox, 'pypy', 'py27', 'py34') }}: PYTHONWARNINGS: 'ignore:::pip._internal.cli.base_command' - ${{ if in(parameters.python, 'pypy', 'pypy3') }}: - python: ${{ parameters.python }} - ${{ if notIn(parameters.python, 'pypy', 'pypy3') }}: - python: "python" steps: # ensure the required Python versions are available - - ${{ if notIn(parameters.python, 'pypy', 'pypy3') }}: - - task: UsePythonVersion@0 - displayName: setup python - inputs: - versionSpec: ${{ parameters.python }} + - task: UsePythonVersion@0 + displayName: setup python + inputs: + versionSpec: ${{ parameters.python }} - script: 'python -c "import sys; print(sys.version); print(sys.executable);"' displayName: show python information From 1630e430aa7b2df10895adf0007ef456ecd102fc Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Thu, 25 Apr 2019 15:26:06 -0400 Subject: [PATCH 3/3] pypy2 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e77e85698..75d7fbe57 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,7 +49,7 @@ jobs: parameters: {tox: package_description, python: '3.7'} - template: azure-run-tox-env.yml - parameters: {tox: pypy, python: pypy, os: linux} + parameters: {tox: pypy, python: pypy2, os: linux} - template: azure-run-tox-env.yml parameters: {tox: pypy3, python: pypy3, os: linux}