Skip to content

Commit ff23f18

Browse files
rgommersmattip
authored andcommitted
CI: drop 32-bit Windows Azure testing, adjust 64-bit for Meson
Closes numpygh-23717
1 parent c204dd0 commit ff23f18

File tree

2 files changed

+8
-35
lines changed

2 files changed

+8
-35
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -249,30 +249,19 @@ stages:
249249
pool:
250250
vmImage: 'windows-2019'
251251
strategy:
252-
maxParallel: 5
252+
maxParallel: 3
253253
matrix:
254-
Python39-32bit-full:
255-
PYTHON_VERSION: '3.9'
256-
PYTHON_ARCH: 'x86'
257-
TEST_MODE: full
258-
BITS: 32
259254
Python310-64bit-fast:
260255
PYTHON_VERSION: '3.10'
261256
PYTHON_ARCH: 'x64'
262257
TEST_MODE: fast
263258
BITS: 64
264-
Python311-32bit-fast:
265-
PYTHON_VERSION: '3.11'
266-
PYTHON_ARCH: 'x86'
267-
TEST_MODE: fast
268-
BITS: 32
269259
Python311-64bit-full:
270260
PYTHON_VERSION: '3.11'
271261
PYTHON_ARCH: 'x64'
272262
TEST_MODE: full
273263
BITS: 64
274264
NPY_USE_BLAS_ILP64: '1'
275-
276265
PyPy39-64bit-fast:
277266
PYTHON_VERSION: 'pypy3.9'
278267
PYTHON_ARCH: 'x64'

azure-steps-windows.yml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,14 @@ steps:
3737

3838
- powershell: |
3939
ls openblas
40-
If ($(BITS) -eq 32) {
41-
$env:CFLAGS = "-m32"
42-
$env:LDFLAGS = "-m32"
43-
$env:PATH = "$env:RTOOLS40_HOME\\mingw32\\bin;$env:PATH"
44-
}
45-
Else
46-
{
47-
$env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
48-
}
40+
$env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
4941
If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
5042
$env:OPENBLAS64_ = "openblas"
5143
} else {
5244
$env:OPENBLAS = "openblas"
5345
}
5446
python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
55-
python -m pip wheel -v -v -v --no-build-isolation --no-use-pep517 --wheel-dir=dist .
56-
57-
ls dist -r | Foreach-Object {
58-
python -m pip install $_.FullName
59-
}
47+
python -m pip install .
6048
displayName: 'Build NumPy'
6149

6250
- script: |
@@ -65,16 +53,12 @@ steps:
6553
displayName: 'Check OpenBLAS version'
6654

6755
- powershell: |
68-
If ($(BITS) -eq 32) {
69-
$env:CFLAGS = "-m32"
70-
$env:LDFLAGS = "-m32"
71-
$env:PATH = "$env:RTOOLS40_HOME\\mingw32\\bin;$env:PATH"
72-
}
73-
Else
74-
{
75-
$env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
56+
$env:PATH = "$env:RTOOLS40_HOME\\mingw64\\bin;$env:PATH"
57+
If ( Test-Path env:TEST_MODE -eq full ) {
58+
pytest --pyargs numpy -rsx --junitxml=junit/test-results.xml
59+
} else {
60+
pytest --pyargs numpy -m "not slow" -rsx --junitxml=junit/test-results.xml
7661
}
77-
python runtests.py -n --show-build-log --mode=$(TEST_MODE) -- -rsx --junitxml=junit/test-results.xml
7862
displayName: 'Run NumPy Test Suite'
7963

8064
- task: PublishTestResults@2

0 commit comments

Comments
 (0)