Skip to content

Commit

Permalink
Merge pull request #4201 from t20100/ci-py313
Browse files Browse the repository at this point in the history
CI: Added tests and wheel generation for Python 3.13
  • Loading branch information
t20100 authored Jan 14, 2025
2 parents 22fd9e9 + ccbf850 commit d9018de
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
QT_API: PyQt6
with_opencl: true
- os: ubuntu-latest
python-version: "3.12"
python-version: "3.13"
QT_API: PySide6
with_opencl: true

Expand All @@ -37,7 +37,7 @@ jobs:
QT_API: PyQt5
with_opencl: true
- os: macos-13
python-version: "3.12"
python-version: "3.13"
QT_API: PyQt6
with_opencl: true
- os: macos-13
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,27 +132,22 @@ jobs:
include:
- os: ubuntu-20.04
cibw_archs: "auto64"
with_sse2: true
- os: ubuntu-20.04
cibw_archs: "aarch64"
with_sse2: false
- os: ubuntu-20.04
cibw_archs: "ppc64le"
with_sse2: false
- os: windows-2019
cibw_archs: "auto64"
with_sse2: true
- os: macos-12
- os: macos-13
cibw_archs: "universal2"
with_sse2: true

steps:
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v3
if: runner.os == 'Linux'
with:
platforms: all
- uses: pypa/cibuildwheel@v2.16.5
- uses: pypa/cibuildwheel@v2.22.0
env:
# Configure silx build
SILX_FORCE_CYTHON: "True"
Expand All @@ -166,7 +161,7 @@ jobs:
CIBW_ENVIRONMENT_PASS_LINUX: SILX_FORCE_CYTHON SILX_WITH_OPENMP WITH_QT_TEST WITH_GL_TEST SILX_OPENCL SILX_TEST_LOW_MEM

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

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

pypi-publish:
needs: [build_doc, build_sdist, build_wheels, test_sdist, build_windows_installer, test_windows_installer]
needs:
[
build_doc,
build_sdist,
build_wheels,
test_sdist,
build_windows_installer,
test_windows_installer,
]
name: Upload release to PyPI
runs-on: ubuntu-latest
environment:
Expand Down
6 changes: 3 additions & 3 deletions src/silx/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
PRERELEASE_NORMALIZED_NAME = {"dev": "a", "alpha": "a", "beta": "b", "candidate": "rc"}

MAJOR = 2
MINOR = 1
MICRO = 1
RELEV = "dev" # <16
MINOR = 2
MICRO = 0
RELEV = "beta" # <16
SERIAL = 0 # <16

date = __date__
Expand Down

0 comments on commit d9018de

Please sign in to comment.