File tree 4 files changed +34
-38
lines changed
4 files changed +34
-38
lines changed Original file line number Diff line number Diff line change @@ -109,27 +109,6 @@ jobs:
109
109
name : linting
110
110
command : ./build_tools/circle/linting.sh
111
111
112
- pypy3 :
113
- docker :
114
- - image : condaforge/miniforge3
115
- environment :
116
- # Avoid the interactive dialog when installing tzdata
117
- - DEBIAN_FRONTEND : noninteractive
118
- steps :
119
- - restore_cache :
120
- keys :
121
- - pypy3-ccache-{{ .Branch }}
122
- - pypy3-ccache
123
- - run : apt-get -yq update && apt-get -yq install git ssh
124
- - checkout
125
- - run : conda init bash && source ~/.bashrc
126
- - run : ./build_tools/circle/build_test_pypy.sh
127
- - save_cache :
128
- key : pypy3-ccache-{{ .Branch }}-{{ .BuildNum }}
129
- paths :
130
- - ~/.ccache
131
- - ~/.cache/pip
132
-
133
112
linux-arm64 :
134
113
machine :
135
114
image : ubuntu-2004:202101-01
@@ -190,16 +169,6 @@ workflows:
190
169
- deploy :
191
170
requires :
192
171
- doc
193
- pypy :
194
- triggers :
195
- - schedule :
196
- cron : " 0 0 * * *"
197
- filters :
198
- branches :
199
- only :
200
- - main
201
- jobs :
202
- - pypy3
203
172
linux-arm64 :
204
173
jobs :
205
174
- linux-arm64
Original file line number Diff line number Diff line change @@ -182,9 +182,9 @@ jobs:
182
182
TEST_DOCSTRINGS : ' true'
183
183
CHECK_WARNINGS : ' true'
184
184
185
- - template : build_tools/azure/posix-32 .yml
185
+ - template : build_tools/azure/posix-docker .yml
186
186
parameters :
187
- name : Linux32
187
+ name : Linux_Docker
188
188
vmImage : ubuntu-20.04
189
189
dependsOn : [linting, git_commit]
190
190
condition : |
@@ -194,8 +194,14 @@ jobs:
194
194
ne(variables['Build.Reason'], 'Schedule')
195
195
)
196
196
matrix :
197
+ pypy3 :
198
+ DISTRIB : ' conda-mamba-pypy3'
199
+ DOCKER_CONTAINER : ' condaforge/mambaforge-pypy3:4.10.3-5'
200
+ PILLOW_VERSION : ' none'
201
+ PANDAS_VERSION : ' none'
197
202
debian_atlas_32bit :
198
203
DISTRIB : ' debian-32'
204
+ DOCKER_CONTAINER : ' i386/debian:10.9'
199
205
JOBLIB_VERSION : ' min'
200
206
# disable pytest xdist due to unknown bug with 32-bit container
201
207
PYTEST_XDIST_VERSION : ' none'
Original file line number Diff line number Diff line change 5
5
6
6
UNAMESTR=` uname`
7
7
8
+ if [[ " $DISTRIB " == " conda-mamba-pypy3" ]]; then
9
+ # condaforge/mambaforge-pypy3 needs compilers
10
+ apt-get -yq update
11
+ apt-get -yq install build-essential
12
+ fi
13
+
8
14
make_conda () {
9
15
TO_INSTALL=" $@ "
10
- conda create -n $VIRTUALENV --yes $TO_INSTALL
16
+ if [[ " $DISTRIB " == * " mamba" * ]]; then
17
+ mamba create -n $VIRTUALENV --yes $TO_INSTALL
18
+ else
19
+ conda create -n $VIRTUALENV --yes $TO_INSTALL
20
+ fi
11
21
source activate $VIRTUALENV
12
22
}
13
23
@@ -25,15 +35,21 @@ setup_ccache() {
25
35
# imports get_dep
26
36
source build_tools/shared.sh
27
37
28
- if [[ " $DISTRIB " == " conda" ]]; then
38
+ if [[ " $DISTRIB " == " conda" || " $DISTRIB " == * " mamba " * ]]; then
29
39
30
40
if [[ " $CONDA_CHANNEL " != " " ]]; then
31
41
TO_INSTALL=" -c $CONDA_CHANNEL "
32
42
else
33
43
TO_INSTALL=" "
34
44
fi
35
45
36
- TO_INSTALL=" $TO_INSTALL python=$PYTHON_VERSION ccache pip blas[build=$BLAS ]"
46
+ if [[ " $DISTRIB " == * " pypy" * ]]; then
47
+ TO_INSTALL=" $TO_INSTALL pypy"
48
+ else
49
+ TO_INSTALL=" $TO_INSTALL python=$PYTHON_VERSION "
50
+ fi
51
+
52
+ TO_INSTALL=" $TO_INSTALL ccache pip blas[build=$BLAS ]"
37
53
38
54
TO_INSTALL=" $TO_INSTALL $( get_dep numpy $NUMPY_VERSION ) "
39
55
TO_INSTALL=" $TO_INSTALL $( get_dep scipy $SCIPY_VERSION ) "
Original file line number Diff line number Diff line change 30
30
THREADPOOLCTL_VERSION : ' latest'
31
31
COVERAGE : ' false'
32
32
TEST_DOCSTRINGS : ' false'
33
+ BLAS : ' openblas'
34
+ # Set in azure-pipelines.yml
35
+ DISTRIB : ' '
36
+ DOCKER_CONTAINER : ' '
33
37
strategy :
34
38
matrix :
35
39
${{ insert }} : ${{ parameters.matrix }}
45
49
-w /io
46
50
--detach
47
51
--name skcontainer
48
- -e DISTRIB=debian-32
52
+ -e DISTRIB=$DISTRIB
49
53
-e TEST_DIR=/temp_dir
50
54
-e JUNITXML=$JUNITXML
51
55
-e VIRTUALENV=testvenv
63
67
-e OMP_NUM_THREADS=$OMP_NUM_THREADS
64
68
-e OPENBLAS_NUM_THREADS=$OPENBLAS_NUM_THREADS
65
69
-e SKLEARN_SKIP_NETWORK_TESTS=$SKLEARN_SKIP_NETWORK_TESTS
66
- i386/debian:10.9
70
+ -e BLAS=$BLAS
71
+ $DOCKER_CONTAINER
67
72
sleep 1000000
68
73
displayName: 'Start container'
69
74
- script : >
You can’t perform that action at this time.
0 commit comments