Skip to content

Commit f1057ac

Browse files
jamesobutlerjamesobutler
committed
Remove 32bit testing in CI
1 parent 661f038 commit f1057ac

4 files changed

Lines changed: 21 additions & 42 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33

44
variables:
55
# Change the following along with adding new TEST_START_INDEX.
6-
TEST_COUNT: 20
6+
TEST_COUNT: 19
77

88
jobs:
99
# Mac and Linux use the same template with different matrixes
@@ -29,99 +29,92 @@ jobs:
2929
name: Linux
3030
vmImage: ubuntu-20.04
3131
matrix:
32-
py38_np118_32bit:
33-
# 32 bit linux only has np 1.15
34-
PYTHON: '3.8'
35-
NUMPY: '1.18'
36-
CONDA_ENV: azure_ci
37-
BITS32: yes
38-
TEST_START_INDEX: 2
3932
py38_np118_vanilla:
4033
PYTHON: '3.8'
4134
NUMPY: '1.18'
4235
CONDA_ENV: azure_ci
4336
VANILLA_INSTALL: yes
44-
TEST_START_INDEX: 3
37+
TEST_START_INDEX: 2
4538
py38_np118_cov:
4639
PYTHON: '3.8'
4740
NUMPY: '1.18'
4841
CONDA_ENV: azure_ci
4942
RUN_COVERAGE: yes
5043
RUN_FLAKE8: yes
5144
RUN_MYPY: yes
52-
TEST_START_INDEX: 4
45+
TEST_START_INDEX: 3
5346
py38_np119_tbb:
5447
PYTHON: '3.8'
5548
NUMPY: '1.19.2=*_0'
5649
CONDA_ENV: azure_ci
5750
TEST_THREADING: 'tbb'
58-
TEST_START_INDEX: 5
51+
TEST_START_INDEX: 4
5952
py38_np119_omp:
6053
PYTHON: '3.8'
6154
NUMPY: '1.19.2=*_0'
6255
CONDA_ENV: azure_ci
6356
TEST_THREADING: omp
64-
TEST_START_INDEX: 6
57+
TEST_START_INDEX: 5
6558
py38_np119_workqueue:
6659
PYTHON: '3.8'
6760
NUMPY: '1.19.2=*_0'
6861
CONDA_ENV: azure_ci
6962
TEST_THREADING: workqueue
70-
TEST_START_INDEX: 7
63+
TEST_START_INDEX: 6
7164
py38_np120_doc:
7265
PYTHON: '3.8'
7366
NUMPY: '1.20'
7467
CONDA_ENV: azure_ci
7568
BUILD_DOC: yes
76-
TEST_START_INDEX: 8
69+
TEST_START_INDEX: 7
7770
py38_np120_pickle5:
7871
PYTHON: '3.8'
7972
NUMPY: '1.20'
8073
CONDA_ENV: azure_ci
8174
TEST_PICKLE5: yes
82-
TEST_START_INDEX: 9
75+
TEST_START_INDEX: 8
8376
py38_np120_svml:
8477
PYTHON: '3.8'
8578
NUMPY: '1.20'
8679
CONDA_ENV: azure_ci
8780
TEST_SVML: yes
88-
TEST_START_INDEX: 10
81+
TEST_START_INDEX: 9
8982
py38_np122:
9083
PYTHON: '3.8'
9184
NUMPY: '1.22'
9285
CONDA_ENV: azure_ci
93-
TEST_START_INDEX: 11
86+
TEST_START_INDEX: 10
9487
py39_np119:
9588
PYTHON: '3.9'
9689
NUMPY: '1.19.2=*_0'
9790
CONDA_ENV: azure_ci
98-
TEST_START_INDEX: 12
91+
TEST_START_INDEX: 11
9992
py39_np120_typeguard:
10093
PYTHON: '3.9'
10194
NUMPY: '1.20'
10295
CONDA_ENV: azure_ci
10396
RUN_TYPEGUARD: yes
104-
TEST_START_INDEX: 13
97+
TEST_START_INDEX: 12
10598
py39_np121:
10699
PYTHON: '3.9'
107100
NUMPY: '1.21'
108101
CONDA_ENV: azure_ci
109-
TEST_START_INDEX: 14
102+
TEST_START_INDEX: 13
110103
py39_np122:
111104
PYTHON: '3.9'
112105
NUMPY: '1.22'
113106
CONDA_ENV: azure_ci
114-
TEST_START_INDEX: 15
107+
TEST_START_INDEX: 14
115108
py310_np121:
116109
PYTHON: '3.10'
117110
NUMPY: '1.21'
118111
CONDA_ENV: azure_ci
119-
TEST_START_INDEX: 16
112+
TEST_START_INDEX: 15
120113
py310_np122:
121114
PYTHON: '3.10'
122115
NUMPY: '1.22'
123116
CONDA_ENV: azure_ci
124-
TEST_START_INDEX: 17
117+
TEST_START_INDEX: 16
125118

126119
- template: buildscripts/azure/azure-windows.yml
127120
parameters:

‎buildscripts/azure/azure-linux-macos.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313

1414
steps:
1515
- script: |
16-
if [ "$(uname)" == "Linux" ] && [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]]; then sudo apt-get install -y libc6-dev-i386; fi
17-
if [ "$(uname)" == "Linux" ] && [[ "$CONDA_SUBDIR" != "linux-32" && "$BITS32" != "yes" ]]; then sudo apt-get install -y gdb; fi
16+
sudo apt-get install -y gdb
1817
echo "Installing Miniconda"
1918
buildscripts/incremental/install_miniconda.sh
2019
export PATH=$HOME/miniconda3/bin:$PATH

‎buildscripts/azure/azure-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
PYTHON: '3.10'
1313
NUMPY: '1.22'
1414
CONDA_ENV: 'testenv'
15-
TEST_START_INDEX: 18
15+
TEST_START_INDEX: 17
1616
py38_np118:
1717
PYTHON: '3.8'
1818
NUMPY: '1.18'
1919
CONDA_ENV: 'testenv'
20-
TEST_START_INDEX: 19
20+
TEST_START_INDEX: 18
2121

2222
steps:
2323
- task: CondaEnvironment@1

‎buildscripts/incremental/setup_conda_environment.sh‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,32 +60,19 @@ if [ "${VANILLA_INSTALL}" != "yes" ]; then
6060
# pexpect is used to run the gdb tests.
6161
# ipykernel is used for testing ipython behaviours.
6262
$CONDA_INSTALL ${EXTRA_CHANNELS} cffi jinja2 ipython ipykernel pygments pexpect
63-
# Only install scipy on 64bit, else it'll pull in NumPy, 32bit linux needs
64-
# to get scipy from pip
65-
if [[ "$CONDA_SUBDIR" != "linux-32" && "$BITS32" != "yes" ]] ; then
66-
$CONDA_INSTALL ${EXTRA_CHANNELS} scipy
67-
fi
63+
$CONDA_INSTALL ${EXTRA_CHANNELS} scipy
6864
fi
6965

7066
# Install the compiler toolchain
7167
if [[ $(uname) == Linux ]]; then
72-
if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]] ; then
73-
$CONDA_INSTALL gcc_linux-32 gxx_linux-32
74-
else
75-
$CONDA_INSTALL gcc_linux-64 gxx_linux-64
76-
fi
68+
$CONDA_INSTALL gcc_linux-64 gxx_linux-64
7769
elif [[ $(uname) == Darwin ]]; then
7870
$CONDA_INSTALL clang_osx-64 clangxx_osx-64
7971
# Install llvm-openmp on OSX for headers during build and runtime during
8072
# testing
8173
$CONDA_INSTALL llvm-openmp
8274
fi
8375

84-
# If on 32bit linux, now pip install NumPy (no conda package), SciPy is broken?!
85-
if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]] ; then
86-
$PIP_INSTALL numpy==$NUMPY
87-
fi
88-
8976
# Install latest correct build
9077
$CONDA_INSTALL -c numba/label/dev llvmlite=0.40
9178

0 commit comments

Comments
 (0)