Skip to content

CI Migrates pypy3 test to Azure #21005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 10, 2021
Merged

CI Migrates pypy3 test to Azure #21005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1ca08a
MAINT Adds pypy3 to azure
thomasjpfan Sep 10, 2021
5af0730
DOC Adds comment
thomasjpfan Sep 10, 2021
1080b31
CI Enable pytest-xdist
thomasjpfan Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,6 @@ jobs:
name: linting
command: ./build_tools/circle/linting.sh

pypy3:
docker:
- image: condaforge/miniforge3
environment:
# Avoid the interactive dialog when installing tzdata
- DEBIAN_FRONTEND: noninteractive
steps:
- restore_cache:
keys:
- pypy3-ccache-{{ .Branch }}
- pypy3-ccache
- run: apt-get -yq update && apt-get -yq install git ssh
- checkout
- run: conda init bash && source ~/.bashrc
- run: ./build_tools/circle/build_test_pypy.sh
- save_cache:
key: pypy3-ccache-{{ .Branch }}-{{ .BuildNum }}
paths:
- ~/.ccache
- ~/.cache/pip

linux-arm64:
machine:
image: ubuntu-2004:202101-01
Expand Down Expand Up @@ -190,16 +169,6 @@ workflows:
- deploy:
requires:
- doc
pypy:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only:
- main
jobs:
- pypy3
linux-arm64:
jobs:
- linux-arm64
10 changes: 8 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ jobs:
TEST_DOCSTRINGS: 'true'
CHECK_WARNINGS: 'true'

- template: build_tools/azure/posix-32.yml
- template: build_tools/azure/posix-docker.yml
parameters:
name: Linux32
name: Linux_Docker
vmImage: ubuntu-20.04
dependsOn: [linting, git_commit]
condition: |
Expand All @@ -194,8 +194,14 @@ jobs:
ne(variables['Build.Reason'], 'Schedule')
)
matrix:
pypy3:
DISTRIB: 'conda-mamba-pypy3'
DOCKER_CONTAINER: 'condaforge/mambaforge-pypy3:4.10.3-5'
PILLOW_VERSION: 'none'
PANDAS_VERSION: 'none'
debian_atlas_32bit:
DISTRIB: 'debian-32'
DOCKER_CONTAINER: 'i386/debian:10.9'
JOBLIB_VERSION: 'min'
# disable pytest xdist due to unknown bug with 32-bit container
PYTEST_XDIST_VERSION: 'none'
Expand Down
22 changes: 19 additions & 3 deletions build_tools/azure/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,19 @@ set -x

UNAMESTR=`uname`

if [[ "$DISTRIB" == "conda-mamba-pypy3" ]]; then
# condaforge/mambaforge-pypy3 needs compilers
apt-get -yq update
apt-get -yq install build-essential
fi

make_conda() {
TO_INSTALL="$@"
conda create -n $VIRTUALENV --yes $TO_INSTALL
if [[ "$DISTRIB" == *"mamba"* ]]; then
mamba create -n $VIRTUALENV --yes $TO_INSTALL
else
conda create -n $VIRTUALENV --yes $TO_INSTALL
fi
source activate $VIRTUALENV
}

Expand All @@ -25,15 +35,21 @@ setup_ccache() {
# imports get_dep
source build_tools/shared.sh

if [[ "$DISTRIB" == "conda" ]]; then
if [[ "$DISTRIB" == "conda" || "$DISTRIB" == *"mamba"* ]]; then

if [[ "$CONDA_CHANNEL" != "" ]]; then
TO_INSTALL="-c $CONDA_CHANNEL"
else
TO_INSTALL=""
fi

TO_INSTALL="$TO_INSTALL python=$PYTHON_VERSION ccache pip blas[build=$BLAS]"
if [[ "$DISTRIB" == *"pypy"* ]]; then
TO_INSTALL="$TO_INSTALL pypy"
else
TO_INSTALL="$TO_INSTALL python=$PYTHON_VERSION"
fi

TO_INSTALL="$TO_INSTALL ccache pip blas[build=$BLAS]"

TO_INSTALL="$TO_INSTALL $(get_dep numpy $NUMPY_VERSION)"
TO_INSTALL="$TO_INSTALL $(get_dep scipy $SCIPY_VERSION)"
Expand Down
9 changes: 7 additions & 2 deletions build_tools/azure/posix-32.yml → build_tools/azure/posix-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ jobs:
THREADPOOLCTL_VERSION: 'latest'
COVERAGE: 'false'
TEST_DOCSTRINGS: 'false'
BLAS: 'openblas'
# Set in azure-pipelines.yml
DISTRIB: ''
DOCKER_CONTAINER: ''
strategy:
matrix:
${{ insert }}: ${{ parameters.matrix }}
Expand All @@ -45,7 +49,7 @@ jobs:
-w /io
--detach
--name skcontainer
-e DISTRIB=debian-32
-e DISTRIB=$DISTRIB
-e TEST_DIR=/temp_dir
-e JUNITXML=$JUNITXML
-e VIRTUALENV=testvenv
Expand All @@ -63,7 +67,8 @@ jobs:
-e OMP_NUM_THREADS=$OMP_NUM_THREADS
-e OPENBLAS_NUM_THREADS=$OPENBLAS_NUM_THREADS
-e SKLEARN_SKIP_NETWORK_TESTS=$SKLEARN_SKIP_NETWORK_TESTS
i386/debian:10.9
-e BLAS=$BLAS
$DOCKER_CONTAINER
sleep 1000000
displayName: 'Start container'
- script: >
Expand Down