8000 MAINT move PyPy back to scheduled build (#21645) · scikit-learn/scikit-learn@967e350 · GitHub
[go: up one dir, main page]
Skip to content

Commit 967e350

Browse files
ogriselthomasjpfan
authored and
glemaitre
committed
MAINT move PyPy back to scheduled build (#21645)
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
1 parent b8f9105 commit 967e350

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

‎azure-pipelines.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,28 @@ jobs:
106106
COVERAGE: 'false'
107107
BUILD_WITH_ICC: 'true'
108108

109+
- template: build_tools/azure/posix-docker.yml
110+
parameters:
111+
name: Linux_Nightly_PyPy
112+
vmImage: ubuntu-20.04
113+
dependsOn: [linting, git_commit]
114+
condition: |
115+
and(
116+
succeeded(),
117+
not(contains(dependencies['git_commit']['outputs']['commit.message'], '[ci skip]')),
118+
or(
119+
eq(variables['Build.Reason'], 'Schedule'),
120+
contains(dependencies['git_commit']['outputs']['commit.message'], '[pypy]')
121+
)
122+
)
123+
matrix:
124+
pypy3:
125+
DISTRIB: 'conda-mamba-pypy3'
126+
DOCKER_CONTAINER: 'condaforge/mambaforge-pypy3:4.10.3-5'
127+
PILLOW_VERSION: 'none'
128+
PANDAS_VERSION: 'none'
129+
CREATE_ISSUE_ON_TRACKER: 'true'
130+
109131
# Will run all the time regardless of linting outcome.
110132
- template: build_tools/azure/posix.yml
111133
parameters:
@@ -200,11 +222,6 @@ jobs:
200222
ne(variables['Build.Reason'], 'Schedule')
201223
)
202224
matrix:
203-
pypy3:
204-
DISTRIB: 'conda-mamba-pypy3'
205-
DOCKER_CONTAINER: 'condaforge/mambaforge-pypy3:4.10.3-5'
206-
PILLOW_VERSION: 'none'
207-
PANDAS_VERSION: 'none'
208225
debian_atlas_32bit:
209226
DISTRIB: 'debian-32'
210227
DOCKER_CONTAINER: 'i386/debian:10.9'

‎doc/developers/contributing.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ Continuous Integration (CI)
549549
* Azure pipelines are used for testing scikit-learn on Linux, Mac and Windows,
550550
with different dependencies and settings.
551551
* CircleCI is used to build the docs for viewing, for linting with flake8, and
552-
for testing with PyPy and ARM64 / aarch64 on Linux
552+
for testing with ARM64 / aarch64 on Linux
553553

554554
Please note that if one of the following markers appear in the latest commit
555555
message, the following actions are taken.
@@ -560,8 +560,9 @@ message, the following actions are taken.
560560
[ci skip] CI is skipped completely
561561
[cd build] CD is run (wheels and source distribution are built)
562562
[lint skip] Azure pipeline skips linting
563-
[scipy-dev] Add a Travis build with our dependencies (numpy, scipy, etc ...) development builds
564-
[icc-build] Add a Travis build with the Intel C compiler (ICC)
563+
[scipy-dev] Build & test with our dependencies (numpy, scipy, etc ...) development builds
564+
[icc-build] Build & test with the Intel C compiler (ICC)
565+
[pypy] Build & test with PyPy
565566
[doc skip] Docs are not built
566567
[doc quick] Docs built, but excludes example gallery plots
567568
[doc build] Docs built including example gallery plots (very long)

0 commit comments

Comments
 (0)
0