From 4b938483171eebd11e049a3c733c9686363a52f7 Mon Sep 17 00:00:00 2001
From: Thomas VINCENT <thomas.vincent@esrf.fr>
Date: Tue, 14 Jan 2025 13:44:15 +0100
Subject: [PATCH 1/2] Test and build wheel for python3.13

---
 .github/workflows/ci.yml      |  4 ++--
 .github/workflows/release.yml | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ce7297e1d..139ea75a22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
 
@@ -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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 951d5b3840..659ac0d46b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -132,19 +132,14 @@ 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
@@ -152,7 +147,7 @@ jobs:
         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"
@@ -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 }}
@@ -176,7 +171,8 @@ 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:
@@ -184,7 +180,15 @@ jobs:
           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:

From ccbf850c2f3fe8630f0dfd0ff366eba5eb1c8740 Mon Sep 17 00:00:00 2001
From: Thomas VINCENT <thomas.vincent@esrf.fr>
Date: Tue, 14 Jan 2025 16:35:36 +0100
Subject: [PATCH 2/2] bump to version 2.2.0b0

---
 src/silx/_version.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/silx/_version.py b/src/silx/_version.py
index 886a30d5ab..3d016564a8 100644
--- a/src/silx/_version.py
+++ b/src/silx/_version.py
@@ -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__