Skip to content

Commit 9cb504c

Browse files
committed
Add same environments to Azure as have in AppVeyor, except py37-freeze
py37-freeze will be tackled in pytest-dev#4807
1 parent f0a9f90 commit 9cb504c

File tree

3 files changed

+61
-3
lines changed

3 files changed

+61
-3
lines changed

azure-pipelines.yml

+59-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ trigger:
44

55
variables:
66
PYTEST_ADDOPTS: "--junitxml=build/test-results/$(tox.env).xml"
7+
python.needs_vc: False
8+
python.exe: "python"
79

810
jobs:
911

@@ -15,6 +17,26 @@ jobs:
1517
py27:
1618
python.version: '2.7'
1719
tox.env: 'py27'
20+
py27-xdist:
21+
python.version: '2.7'
22+
tox.env: 'py27-xdist'
23+
py27-numpy/nobyte:
24+
python.version: '2.7'
25+
tox.env: 'py27-numpy,py27-nobyte'
26+
py27-trial:
27+
python.version: '2.7'
28+
tox.env: 'py27-trial'
29+
python.needs_vc: True
30+
py27-pluggymaster:
31+
python.version: '2.7'
32+
tox.env: 'pluggymaster'
33+
pypy:
34+
python.version: 'pypy'
35+
tox.env: 'pypy'
36+
python.exe: 'pypy'
37+
py34:
38+
python.version: '3.4'
39+
tox.env: 'py34'
1840
py35:
1941
python.version: '3.5'
2042
tox.env: 'py35'
@@ -24,18 +46,52 @@ jobs:
2446
py37:
2547
python.version: '3.7'
2648
tox.env: 'py37'
27-
maxParallel: 4
49+
py37-linting/docs/doctesting:
50+
python.version: '3.7'
51+
tox.env: 'linting,docs,doctesting'
52+
py37-xdist:
53+
python.version: '3.7'
54+
tox.env: 'py37-xdist'
55+
py37-trial/numpy:
56+
python.version: '3.7'
57+
tox.env: 'py37-trial,py37-numpy'
58+
py37-pluggymaster:
59+
python.version: '3.7'
60+
tox.env: 'py37-pluggymaster'
61+
maxParallel: 10
2862

2963
steps:
3064
- task: UsePythonVersion@0
65+
condition: not(startsWith(variables['python.exe'], 'pypy'))
3166
inputs:
3267
versionSpec: '$(python.version)'
3368
architecture: 'x64'
3469

35-
- script: python -m pip install --upgrade pip && pip install tox
70+
- script: choco install vcpython27
71+
condition: eq(variables['python.needs_vc'], True)
72+
displayName: 'Install VC for py27'
73+
74+
- script: choco install python.pypy
75+
condition: eq(variables['python.exe'], 'pypy')
76+
displayName: 'Install pypy'
77+
78+
- script: choco install pypy3
79+
condition: eq(variables['python.exe'], 'pypy3')
80+
displayName: 'Install pypy3'
81+
82+
- task: PowerShell@2
83+
inputs:
84+
targetType: 'inline'
85+
script: |
86+
Invoke-WebRequest -Uri "https://bootstrap.pypa.io/get-pip.py" -OutFile "get-pip.py"
87+
$(python.exe) get-pip.py
88+
condition: startsWith(variables['python.exe'], 'pypy')
89+
displayName: 'Install pip'
90+
91+
- script: $(python.exe) -m pip install --upgrade pip && $(python.exe) -m pip install tox
3692
displayName: 'Install tox'
3793

38-
- script: python -m tox -e $(tox.env)
94+
- script: $(python.exe) -m tox -e $(tox.env)
3995
displayName: 'Run tests'
4096

4197
- task: PublishTestResults@2

testing/freeze/create_executable.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
hidden = []
99
for x in pytest.freeze_includes():
1010
hidden.extend(["--hidden-import", x])
11+
hidden.extend(["--hidden-import", "distutils"])
1112
args = ["pyinstaller", "--noconfirm"] + hidden + ["runtests_script.py"]
1213
subprocess.check_call(" ".join(args), shell=True)

tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ envlist =
1212
py37
1313
py38
1414
pypy
15+
pypy3
1516
{py27,py37}-{pexpect,xdist,trial,numpy,pluggymaster}
1617
py27-nobyte
1718
doctesting

0 commit comments

Comments
 (0)