Skip to content

Commit d9018de

Browse files
authored
Merge pull request #4201 from t20100/ci-py313
CI: Added tests and wheel generation for Python 3.13
2 parents 22fd9e9 + ccbf850 commit d9018de

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
QT_API: PyQt6
2929
with_opencl: true
3030
- os: ubuntu-latest
31-
python-version: "3.12"
31+
python-version: "3.13"
3232
QT_API: PySide6
3333
with_opencl: true
3434

@@ -37,7 +37,7 @@ jobs:
3737
QT_API: PyQt5
3838
with_opencl: true
3939
- os: macos-13
40-
python-version: "3.12"
40+
python-version: "3.13"
4141
QT_API: PyQt6
4242
with_opencl: true
4343
- os: macos-13

.github/workflows/release.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,27 +132,22 @@ jobs:
132132
include:
133133
- os: ubuntu-20.04
134134
cibw_archs: "auto64"
135-
with_sse2: true
136135
- os: ubuntu-20.04
137136
cibw_archs: "aarch64"
138-
with_sse2: false
139137
- os: ubuntu-20.04
140138
cibw_archs: "ppc64le"
141-
with_sse2: false
142139
- os: windows-2019
143140
cibw_archs: "auto64"
144-
with_sse2: true
145-
- os: macos-12
141+
- os: macos-13
146142
cibw_archs: "universal2"
147-
with_sse2: true
148143

149144
steps:
150145
- uses: actions/checkout@v4
151146
- uses: docker/setup-qemu-action@v3
152147
if: runner.os == 'Linux'
153148
with:
154149
platforms: all
155-
- uses: pypa/cibuildwheel@v2.16.5
150+
- uses: pypa/cibuildwheel@v2.22.0
156151
env:
157152
# Configure silx build
158153
SILX_FORCE_CYTHON: "True"
@@ -166,7 +161,7 @@ jobs:
166161
CIBW_ENVIRONMENT_PASS_LINUX: SILX_FORCE_CYTHON SILX_WITH_OPENMP WITH_QT_TEST WITH_GL_TEST SILX_OPENCL SILX_TEST_LOW_MEM
167162

168163
CIBW_BUILD_VERBOSITY: 1
169-
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
164+
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*
170165
# Do not build for pypy and muslinux
171166
CIBW_SKIP: pp* *-musllinux_*
172167
CIBW_ARCHS: ${{ matrix.cibw_archs }}
@@ -176,15 +171,24 @@ jobs:
176171
CIBW_TEST_COMMAND: python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=3))"
177172
# Skip tests for emulated architectures and arm64 macos
178173
# Skip cp38 test on macos: Issue with libOpenGL
179-
CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64 cp38-macosx*"
174+
# Skip tests for Python3.13: Missing pyopencl wheel and fails to build
175+
CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *-macosx_arm64 *-macosx_universal2:arm64 cp38-macosx* cp313-*"
180176

181177
- uses: actions/upload-artifact@v4
182178
with:
183179
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
184180
path: ./wheelhouse/*.whl
185181

186182
pypi-publish:
187-
needs: [build_doc, build_sdist, build_wheels, test_sdist, build_windows_installer, test_windows_installer]
183+
needs:
184+
[
185+
build_doc,
186+
build_sdist,
187+
build_wheels,
188+
test_sdist,
189+
build_windows_installer,
190+
test_windows_installer,
191+
]
188192
name: Upload release to PyPI
189193
runs-on: ubuntu-latest
190194
environment:

src/silx/_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
PRERELEASE_NORMALIZED_NAME = {"dev": "a", "alpha": "a", "beta": "b", "candidate": "rc"}
6969

7070
MAJOR = 2
71-
MINOR = 1
72-
MICRO = 1
73-
RELEV = "dev" # <16
71+
MINOR = 2
72+
MICRO = 0
73+
RELEV = "beta" # <16
7474
SERIAL = 0 # <16
7575

7676
date = __date__

0 commit comments

Comments
 (0)