Skip to content

Commit 184d4e1

Browse files
mayeutmayeut
authored
fix(ci): CircleCI / Azure Pipelines / GitLab (#1899)
* fix(ci): CircleCI CircleCI does not support Intel macOS runners anymore. c.f. https://discuss.circleci.com/t/macos-intel-support-deprecation-in-january-2024/48718 * fix(ci): Azure Pipelines * fix(ci): GitLab
1 parent 08165ff commit 184d4e1

File tree

8 files changed

+30
-25
lines changed

8 files changed

+30
-25
lines changed

‎.circleci/config.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
version: 2
22

33
jobs:
4-
osx-python3.9:
4+
osx-python3.12:
55
macos:
6-
xcode: 12.5.1
6+
xcode: 15.4.0
7+
resource_class: macos.m1.medium.gen1
78
environment:
89
PYTHON: python3
910
steps:
@@ -17,9 +18,9 @@ jobs:
1718
command: venv/bin/python ./bin/run_tests.py
1819
no_output_timeout: 30m
1920

20-
linux-python3.9:
21+
linux-python3.12:
2122
docker:
22-
- image: circleci/python:3.9
23+
- image: cimg/python:3.12
2324
environment:
2425
PYTHON: python3
2526
# Temporarily restrict the tests that are run on CircleCI to prevent
@@ -61,6 +62,6 @@ workflows:
6162
version: 2
6263
all-tests:
6364
jobs:
64-
- osx-python3.9
65-
- linux-python3.9
65+
- osx-python3.12
66+
- linux-python3.12
6667
- linux-aarch64

‎.circleci/prepare.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
set -o errexit
33
set -o xtrace
44

5+
if [ "$(uname -s)" == "Darwin" ]; then
6+
sudo softwareupdate --install-rosetta --agree-to-license
7+
fi
8+
59
$PYTHON --version
6-
$PYTHON -m pip --version
7-
$PYTHON -m virtualenv --version
8-
$PYTHON -m virtualenv --no-setuptools --no-wheel -p "$PYTHON" venv
10+
$PYTHON -m venv venv
911
venv/bin/python -m pip install -U pip
1012
venv/bin/python -m pip install -e ".[dev]"
1113
venv/bin/python -m pip freeze

‎.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
linux:
2-
image: python:3.8
2+
image: python:3.12
33
services:
44
- name: docker:dind
55
entrypoint: ["env", "-u", "DOCKER_HOST"]
@@ -23,9 +23,9 @@ windows:
2323
variables:
2424
PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code
2525
before_script:
26-
- choco install python -y --version 3.8.6
26+
- choco install python -y --version 3.12.4
2727
script:
2828
- py -m pip install -e ".[dev]" pytest-custom-exit-code
2929
- py bin\run_tests.py
3030
tags:
31-
- windows
31+
- saas-windows-medium-amd64

‎CI.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
This is a summary of the host Python versions and platforms covered by the different CI platforms:
22

3-
| | 3.8 | 3.9 | 3.10 | 3.12 |
4-
|---------|--------------------------------------------------------|-----------------------|-----------|----------------|
5-
| Linux | AppVeyor¹ / Azure Pipelines / GitLab¹ / GitHub Actions | CircleCI¹ / Travis CI | Cirrus CI | GitHub Actions |
6-
| macOS | AppVeyor¹ / Azure Pipelines | CircleCI¹ / Travis CI | Cirrus CI | GitHub Actions |
7-
| Windows | AppVeyor¹ / Azure Pipelines / GitLab¹ | Travis CI | Cirrus CI | GitHub Actions |
3+
| | 3.8 | 3.9 | 3.10 | 3.12 |
4+
|---------|----------------------------------------------|-----------|-----------|--------------------------------------|
5+
| Linux | AppVeyor¹ / Azure Pipelines / GitHub Actions | Travis CI | Cirrus CI | CircleCI¹ / GitHub Actions / GitLab¹ |
6+
| macOS | AppVeyor¹ / Azure Pipelines | | Cirrus CI | CircleCI¹ / GitHub Actions |
7+
| Windows | AppVeyor¹ / Azure Pipelines | Travis CI | Cirrus CI | GitHub Actions / GitLab¹ |
88

99
> ¹ Runs a reduced set of tests to reduce CI load
1010

‎azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
python ./bin/run_tests.py
1818
1919
- job: macos_38
20-
pool: {vmImage: 'macOS-11'}
20+
pool: {vmImage: 'macOS-12'}
2121
steps:
2222
- task: UsePythonVersion@0
2323
inputs:

‎examples/azure-pipelines-minimal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
inputs: {pathtoPublish: 'wheelhouse'}
1515

1616
- job: macos
17-
pool: {vmImage: 'macOS-11'}
17+
pool: {vmImage: 'macOS-12'}
1818
steps:
1919
- task: UsePythonVersion@0
2020
- bash: |

‎examples/circleci-minimal.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ jobs:
44
linux-wheels:
55
working_directory: ~/linux-wheels
66
docker:
7-
- image: circleci/python:3.9
7+
- image: cimg/python:3.12
88
steps:
99
- checkout
1010
- setup_remote_docker
1111
- run:
1212
name: Build the Linux wheels.
1313
command: |
14-
pip3 install --user cibuildwheel==2.19.1
14+
python3 -m pip install --user cibuildwheel==2.19.1
1515
cibuildwheel --output-dir wheelhouse
1616
- store_artifacts:
1717
path: wheelhouse/
@@ -36,12 +36,14 @@ jobs:
3636
osx-wheels:
3737
working_directory: ~/osx-wheels
3838
macos:
39-
xcode: 12.5.1
39+
xcode: 15.4.0
40+
resource_class: macos.m1.medium.gen1
4041
steps:
4142
- checkout
4243
- run:
4344
name: Build the OS X wheels.
4445
command: |
46+
sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests
4547
pip3 install cibuildwheel==2.19.1
4648
cibuildwheel --output-dir wheelhouse
4749
- store_artifacts:

‎examples/gitlab-minimal.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
linux:
2-
image: python:3.8
2+
image: python:3.12
33
# make a docker daemon available for cibuildwheel to use
44
services:
55
- name: docker:dind
@@ -21,7 +21,7 @@ linux:
2121
windows:
2222
image: mcr.microsoft.com/windows/servercore:1809
2323
before_script:
24-
- choco install python -y --version 3.8.6
24+
- choco install python -y --version 3.12.4
2525
- choco install git.install -y
2626
- py -m pip install cibuildwheel==2.19.1
2727
script:
@@ -30,4 +30,4 @@ windows:
3030
paths:
3131
- wheelhouse/
3232
tags:
33-
- windows
33+
- saas-windows-medium-amd64

0 commit comments

Comments
 (0)