Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit 588434f

Browse files
authored
Ci maintenance (#373)
* fix pypi upload * lessons learned from morphio
1 parent 9d1a62e commit 588434f

6 files changed

+20
-31
lines changed

.github/workflows/clang_format_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Fetch repository
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 2
1616
- name: Install packages

.github/workflows/coverage_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: Fetch repository
1515
run: git fetch --prune --unshallow
1616
- name: Get submodules

.github/workflows/docstring_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Fetch repository
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
with:
1515
submodules: recursive
1616

.github/workflows/publish-sdist-wheels.yml

+10-21
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66

77
CIBW_BUILD_VERBOSITY: 3
88
CIBW_BUILD: 'cp*'
9-
CIBW_SKIP: 'cp35-* cp36-* cp37-* *-musllinux_* *-manylinux_i686'
9+
CIBW_SKIP: 'cp35-* cp36-* cp37-* cp38-* *-musllinux_* *-manylinux_i686'
1010
CIBW_TEST_COMMAND: ( cd {project}/python/tests; python -m unittest -v )
1111
UNIXY_HDF5_VERSION: 1.14.3
1212

@@ -19,14 +19,15 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
matrix:
22-
os: [ubuntu-20.04, macos-latest]
22+
# macos-13 is an intel runner, macos-14 is apple silicon
23+
os: [ubuntu-20.04, macos-13, macos-14]
2324

2425
steps:
25-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2627
with:
2728
submodules: 'true'
2829

29-
- uses: actions/setup-python@v4
30+
- uses: actions/setup-python@v5
3031
name: Install Python
3132
with:
3233
python-version: '3.11'
@@ -68,7 +69,7 @@ jobs:
6869
if: runner.os == 'macOS'
6970

7071
env:
71-
CIBW_ENVIRONMENT_PASS: "STATIC_HDF5 CMAKE_PREFIX_PATH CMAKE_OSX_ARCHITECTURES MACOSX_DEPLOYMENT_TARGET"
72+
CIBW_ENVIRONMENT_PASS: "STATIC_HDF5 CMAKE_PREFIX_PATH"
7273
CIBW_BEFORE_BUILD: |
7374
# CMake complains if the dependencies come from within the same tree
7475
# as the source, so we'll just pretend they are elsewhere
@@ -79,19 +80,7 @@ jobs:
7980
# used by setup.py to decide if to set `FindHDF5` to use static hdf5 libraries
8081
export STATIC_HDF5=True
8182
82-
# x86_64 macOS allows for cross compilation; first we do arm64,
83-
# only for the 11.0 target; and store in the cache the compiled code...
84-
export CIBW_ARCHS_MACOS="arm64"
85-
export CMAKE_OSX_ARCHITECTURES="arm64"
86-
export MACOSX_DEPLOYMENT_TARGET="11.0"
87-
export CMAKE_PREFIX_PATH=/Users/runner/work/src-cache/install-$CIBW_ARCHS_MACOS/install
88-
python -m cibuildwheel --output-dir dist
89-
90-
# ...and now we do both targets for x86_64
91-
export CIBW_ARCHS_MACOS="x86_64"
92-
export CMAKE_OSX_ARCHITECTURES="x86_64"
93-
unset MACOSX_DEPLOYMENT_TARGET
94-
export CMAKE_PREFIX_PATH=/Users/runner/work/src-cache/install-$CIBW_ARCHS_MACOS/install
83+
export CMAKE_PREFIX_PATH=/Users/runner/work/src-cache/install-`uname -m`/install
9584
python -m cibuildwheel --output-dir dist
9685
9786
- name: Store wheel as artifact
@@ -106,12 +95,12 @@ jobs:
10695

10796
runs-on: ubuntu-latest
10897
steps:
109-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
11099
with:
111100
submodules: 'true'
112101

113102
- name: Set up Python 3.11
114-
uses: actions/setup-python@v4
103+
uses: actions/setup-python@v5
115104
with:
116105
python-version: 3.11
117106

@@ -141,7 +130,7 @@ jobs:
141130
- name: Download artifacts produced during the build_wheels and build_sdist jobs
142131
uses: actions/download-artifact@v4
143132
with:
144-
name: dist-*
133+
pattern: dist-*
145134
path: dist/
146135
merge-multiple: true
147136

.github/workflows/run-tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
CXX: g++
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
with:
2828
submodules: 'true'
2929

@@ -49,7 +49,7 @@ jobs:
4949
CXX: g++
5050
steps:
5151
- name: Checkout repository
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
with:
5454
submodules: 'true'
5555

@@ -71,15 +71,15 @@ jobs:
7171

7272
strategy:
7373
matrix:
74-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
74+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
7575

7676
steps:
7777
- name: Checkout repository
78-
uses: actions/checkout@v3
78+
uses: actions/checkout@v4
7979
with:
8080
submodules: 'true'
8181

82-
- uses: actions/setup-python@v4
82+
- uses: actions/setup-python@v5
8383
name: Install Python
8484
with:
8585
python-version: ${{ matrix.python-version }}
@@ -101,7 +101,7 @@ jobs:
101101

102102
steps:
103103
- name: Checkout repository
104-
uses: actions/checkout@v3
104+
uses: actions/checkout@v4
105105
with:
106106
submodules: 'true'
107107

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def build_extension(self, ext):
126126
extras_require={
127127
'docs': ['sphinx-bluebrain-theme'],
128128
},
129-
python_requires=">=3.8",
129+
python_requires=">=3.9",
130130
use_scm_version={"local_scheme": "no-local-version",
131131
},
132132
package_dir={"": "python"},

0 commit comments

Comments
 (0)