Skip to content

Commit 3f0c5fe

Browse files
thomasjpfanogrisel
authored andcommitted
[MRG] Adds Azure Tests For Windows 32 bit Python 3.5 (#13296)
1 parent d31b67f commit 3f0c5fe

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

azure-pipelines.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ jobs:
6464
name: Windows
6565
vmImage: vs2017-win2016
6666
matrix:
67-
py37:
68-
CONDA_PY: '3.7'
67+
py37_64:
68+
PYTHON_VERSION: '3.7'
6969
CHECK_WARNINGS: 'true'
70-
py35:
71-
CONDA_PY: '3.5'
70+
PYTHON_ARCH: '64'
71+
py35_32:
72+
PYTHON_VERSION: '3.5'
73+
PYTHON_ARCH: '32'
74+

build_tools/azure/install.cmd

+10-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ set PIP_INSTALL=pip install -q
66

77
@echo on
88

9-
@rem Deactivate any environment
10-
call deactivate
11-
@rem Clean up any left-over from a previous build
12-
conda remove --all -q -y -n %VIRTUALENV%
13-
conda create -n %VIRTUALENV% -q -y python=%CONDA_PY% numpy scipy cython pytest wheel pillow
9+
IF "%PYTHON_ARCH%"=="64" (
10+
@rem Deactivate any environment
11+
call deactivate
12+
@rem Clean up any left-over from a previous build
13+
conda remove --all -q -y -n %VIRTUALENV%
14+
conda create -n %VIRTUALENV% -q -y python=%PYTHON_VERSION% numpy scipy cython pytest wheel pillow
1415

15-
call activate %VIRTUALENV%
16+
call activate %VIRTUALENV%
17+
) else (
18+
pip install numpy scipy cython pytest wheel pillow
19+
)
1620
python -m pip install -U pip
1721
python --version
1822
pip --version

build_tools/azure/windows.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@ jobs:
1919

2020
steps:
2121
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
22-
displayName: Add conda to PATH
22+
displayName: Add conda to PATH for 64 bit Python
23+
condition: eq(variables['PYTHON_ARCH'], '64')
24+
- task: UsePythonVersion@0
25+
inputs:
26+
versionSpec: '$(PYTHON_VERSION)'
27+
addToPath: true
28+
architecture: 'x86'
29+
displayName: Use 32 bit System Python
30+
condition: eq(variables['PYTHON_ARCH'], '32')
2331
- script: |
2432
build_tools\\azure\\install.cmd
2533
displayName: 'Install'

0 commit comments

Comments
 (0)