From 936ad945988cd98d033bb5d8581996c5b32aac12 Mon Sep 17 00:00:00 2001
From: Stephane Rigaud <stephane.rigaud@pasteur.fr>
Date: Thu, 11 Jul 2024 10:45:44 +0200
Subject: [PATCH 1/4] update pyproject and workflow

---
 .github/workflows/wheels.yml |  9 ++++-----
 pyproject.toml               | 10 ++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index ddce07e4..8ff836c3 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -39,7 +39,7 @@ jobs:
         env:
           CIBW_ARCHS_MACOS: x86_64 arm64
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
 
@@ -53,7 +53,7 @@ jobs:
       - name: Build sdist
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*.tar.gz
 
@@ -61,8 +61,6 @@ jobs:
     name: publish (PyPI)
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
-    # upload to PyPI on every tag starting with 'v'
-    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     # upload to PyPI on release event
     if: github.event_name == 'release' && success()
     steps:
@@ -72,8 +70,9 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          pattern: artifacts-*
           path: dist
+          merge-multiple: true
 
       - uses: pypa/gh-action-pypi-publish@v1.9.0
         with:
diff --git a/pyproject.toml b/pyproject.toml
index 913f9a0e..46bed19a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,7 +55,9 @@ addopts = "-ra -q"
 testpaths = ["tests"]
 
 [tool.cibuildwheel]
-build = ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
+# build = ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
+build = "cp3{7..12}-*"
+skip = ["cp27-*", "pp*", "*-win32", "*-musllinux*", "*_i686", "*_universal2"]
 build-frontend = "build"
 build-verbosity = 1
 test-command = "pytest {project}/tests/test_import.py"
@@ -64,16 +66,16 @@ test-requires = ["pytest", "pytest-cov", "pytest-benchmark", "scikit-image"]
 [tool.cibuildwheel.linux]
 before-all = ["bash {package}/scripts/build-opencl-linux.sh"]
 repair-wheel-command = "auditwheel show {wheel} && auditwheel repair --lib-sdir .libs -w {dest_dir} {wheel}"
-skip = ["cp27-*", "pp*", "*-musllinux*", "*_i686"]
+# skip = ["cp27-*", "pp*", "*-musllinux*", "*_i686"]
 
 [tool.cibuildwheel.windows]
 before-all = "bash {package}/scripts/build-opencl-windows.sh"
 environment = { SKBUILD_CMAKE_ARGS = "-DOpenCL_LIBRARIES:FILEPATH='C:/Program Files/OpenCL-ICD-Loader/lib/OpenCL.lib';-DOpenCL_INCLUDE_DIRS:PATH='C:/Program Files/OpenCL-ICD-Loader/include/'" }
-skip = ["cp27-*", "pp*", "*-win32"]
+# skip = ["cp27-*", "pp*", "*-win32"]
 
 [tool.cibuildwheel.macos]
 environment = { MACOSX_DEPLOYMENT_TARGET = '10.14' }
-skip = ["cp27-*", "pp*", "*_universal2"]
+# skip = ["cp27-*", "pp*", "*_universal2"]
 
 [tool.isort]
 profile = "black"

From c6942b8e2244cceeef3e225b67e263abc3ddd1dc Mon Sep 17 00:00:00 2001
From: Stephane Rigaud <stephane.rigaud@pasteur.fr>
Date: Thu, 11 Jul 2024 11:04:44 +0200
Subject: [PATCH 2/4] test add cp313

---
 pyproject.toml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 46bed19a..572db573 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,8 +55,15 @@ addopts = "-ra -q"
 testpaths = ["tests"]
 
 [tool.cibuildwheel]
-# build = ["cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
-build = "cp3{7..12}-*"
+build = [
+  "cp37-*",
+  "cp38-*",
+  "cp39-*",
+  "cp310-*",
+  "cp311-*",
+  "cp312-*",
+  "cp313-*",
+]
 skip = ["cp27-*", "pp*", "*-win32", "*-musllinux*", "*_i686", "*_universal2"]
 build-frontend = "build"
 build-verbosity = 1

From 1c5acd64866efacd6cc397c74b40fa9c1263c4c7 Mon Sep 17 00:00:00 2001
From: Stephane Rigaud <stephane.rigaud@pasteur.fr>
Date: Thu, 11 Jul 2024 11:27:14 +0200
Subject: [PATCH 3/4] add artifacts name

---
 .github/workflows/wheels.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 8ff836c3..8d58663a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -42,6 +42,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
+          name: artifacts-${{ matrix.os }}
 
   build_sdist:
     name: build dist
@@ -56,6 +57,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           path: dist/*.tar.gz
+          name: artifacts-sdist
 
   upload_all:
     name: publish (PyPI)

From bf5cfe685b2482e609952ef1bdd838b178bb31e0 Mon Sep 17 00:00:00 2001
From: Stephane Rigaud <stephane.rigaud@pasteur.fr>
Date: Thu, 11 Jul 2024 12:57:01 +0200
Subject: [PATCH 4/4] skip 3.6

---
 pyproject.toml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 572db573..bf36f88b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -64,7 +64,15 @@ build = [
   "cp312-*",
   "cp313-*",
 ]
-skip = ["cp27-*", "pp*", "*-win32", "*-musllinux*", "*_i686", "*_universal2"]
+skip = [
+  "cp27-*",
+  "cp36*",
+  "pp*",
+  "*-win32",
+  "*-musllinux*",
+  "*_i686",
+  "*_universal2",
+]
 build-frontend = "build"
 build-verbosity = 1
 test-command = "pytest {project}/tests/test_import.py"