From 687fb1f5de65cb096b34a5af74c0b7656022ad57 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Thu, 27 Jun 2024 21:21:06 +0100
Subject: [PATCH 01/14] updated github workflows

---
 .github/workflows/cbuild.yml       | 47 ++++++++++++++++++++++++++++++
 .github/workflows/cibuild-pypi.yml | 23 ++++++++++-----
 2 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/cbuild.yml

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
new file mode 100644
index 0000000..8945357
--- /dev/null
+++ b/.github/workflows/cbuild.yml
@@ -0,0 +1,47 @@
+name: Build and upload to PyPI
+
+# Build on every branch push, tag push, and pull request change:
+#on: [push]
+# Alternatively, to publish when a (published) GitHub Release is created, use the following:
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+
+    steps:
+      - uses: actions/checkout@v4
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v5
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==2.19.1
+
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+        # to supply options, put them in 'env', like:
+        # env:
+        #   CIBW_SOME_OPTION: value
+
+      - uses: actions/upload-artifact@v4
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          path: dist/*.tar.gz
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index b690acd..4061e0e 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -19,25 +19,34 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v5
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==2.19.1
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.19.1
+        run: python -m cibuildwheel --output-dir wheelhouse
+        # to supply options, put them in 'env', like:
+        # env:
+        #   CIBW_SOME_OPTION: value
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build sdist
         run: pipx run build --sdist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*.tar.gz
 
@@ -49,14 +58,14 @@ jobs:
     # alternatively, to publish when a GitHub Release is created, use the following rule:
     # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           # unpacks default artifact into dist/
           # if `name: artifact` is omitted, the action will create extra parent dir
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.5.0
+      - uses: pypa/gh-action-pypi-publish@v1.9.0
         with:
           user: ${{ secrets.pypi_username }}
           password: ${{ secrets.pypi_password }}

From 313a697599f474345340c41460a3c2e4d7422d09 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Thu, 27 Jun 2024 21:31:27 +0100
Subject: [PATCH 02/14] try again with the new actions

---
 .github/workflows/cbuild.yml       | 5 ++++-
 .github/workflows/cibuild-pypi.yml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 8945357..2e7b087 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -1,4 +1,4 @@
-name: Build and upload to PyPI
+name: cBuild
 
 # Build on every branch push, tag push, and pull request change:
 #on: [push]
@@ -32,6 +32,9 @@ jobs:
         #   CIBW_SOME_OPTION: value
 
       - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
 
   build_sdist:
     name: Build source distribution
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 4061e0e..0a4dbd7 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -1,4 +1,4 @@
-name: Build and upload to PyPI
+name: cBuild and upload to PyPI
 
 # Build on every branch push, tag push, and pull request change:
 #on: [push]

From 6e9d916f6d47adc1768c216ef1f6931f44e7ae25 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Thu, 27 Jun 2024 22:51:35 +0100
Subject: [PATCH 03/14] try the cbuildwheel updated suggested syntax

---
 .github/workflows/cbuild.yml       | 32 +++++++++++++++++++++---------
 .github/workflows/cibuild-pypi.yml | 11 ++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 2e7b087..d51624b 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -19,17 +19,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      # Used to host cibuildwheel
-      - uses: actions/setup-python@v5
-
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.19.1
 
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
-        # to supply options, put them in 'env', like:
-        # env:
-        #   CIBW_SOME_OPTION: value
+        uses: pypa/cibuildwheel@v2.19.1
 
       - uses: actions/upload-artifact@v4
         with:
@@ -47,4 +39,26 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: dist/*.tar.gz
+
+  upload_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')
+    # alternatively, to publish when a GitHub Release is created, use the following rule:
+    # if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks default artifact into dist/
+          # if `name: artifact` is omitted, the action will create extra parent dir
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@v1.9.0
+        with:
+          user: ${{ secrets.pypi_username }}
+          password: ${{ secrets.pypi_password }}
+          repository_url: https://test.pypi.org/legacy/
\ No newline at end of file
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 0a4dbd7..48b592b 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -20,17 +20,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      # Used to host cibuildwheel
-      - uses: actions/setup-python@v5
-
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.19.1
 
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
-        # to supply options, put them in 'env', like:
-        # env:
-        #   CIBW_SOME_OPTION: value
+        uses: pypa/cibuildwheel@v2.19.1
 
       - uses: actions/upload-artifact@v4
         with:
@@ -48,6 +40,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: dist/*.tar.gz
 
   upload_pypi:

From dd67a5d237d0127f5c55a763f3646608e80b503c Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Thu, 27 Jun 2024 23:20:21 +0100
Subject: [PATCH 04/14] disable pypy builds

---
 .github/workflows/cbuild.yml       | 4 ++++
 .github/workflows/cibuild-pypi.yml | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index d51624b..65e1b70 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -17,11 +17,15 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
+
     steps:
       - uses: actions/checkout@v4
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.1
+        env:
+          # Disable building PyPy wheels on all platforms
+          CIBW_SKIP: pp*
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 48b592b..1211a77 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -23,6 +23,9 @@ jobs:
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.1
+        env:
+          # Disable building PyPy wheels on all platforms
+          CIBW_SKIP: pp*
 
       - uses: actions/upload-artifact@v4
         with:

From 395eaae1ef6f5178243f3028752049eac899c548 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 00:50:03 +0100
Subject: [PATCH 05/14] updated upload_pypi, also removed ubuntu and windows
 build to test upload to pypi

---
 .github/workflows/cbuild.yml       | 21 +++++++++++----------
 .github/workflows/cibuild-pypi.yml | 18 ++++++++++--------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 65e1b70..296cc21 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,8 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-
+        os: [macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -49,19 +48,21 @@ jobs:
   upload_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')
-    # alternatively, to publish when a GitHub Release is created, use the following rule:
-    # if: github.event_name == 'release' && github.event.action == 'published'
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/download-artifact@v4
         with:
-          # unpacks default artifact into dist/
-          # if `name: artifact` is omitted, the action will create extra parent dir
-          name: artifact
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@v1.9.0
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: ${{ secrets.pypi_username }}
           password: ${{ secrets.pypi_password }}
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 1211a77..5e4525f 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -49,19 +49,21 @@ jobs:
   upload_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')
-    # alternatively, to publish when a GitHub Release is created, use the following rule:
-    # if: github.event_name == 'release' && github.event.action == 'published'
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/download-artifact@v4
         with:
-          # unpacks default artifact into dist/
-          # if `name: artifact` is omitted, the action will create extra parent dir
-          name: artifact
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@v1.9.0
+      - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: ${{ secrets.pypi_username }}
           password: ${{ secrets.pypi_password }}

From 21cf4e8c26555dbb84067309659541a3a16fcf9d Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 01:14:14 +0100
Subject: [PATCH 06/14] test upload to pypi

---
 .github/workflows/cbuild.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 296cc21..1945d76 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -51,7 +51,6 @@ jobs:
     environment: pypi
     permissions:
       id-token: write
-    if: github.event_name == 'release' && github.event.action == 'published'
     # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this)
     # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     steps:

From 1178f9ee8fc293c28b0ef14260bfb8efcab81255 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 01:22:35 +0100
Subject: [PATCH 07/14] updated version number

---
 setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index a501ba1..8cdaac9 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
     name="spectresc",
     maintainer="Marco C Lam",
     maintainer_email="mlam@roe.ac.uk",
-    version="1.0.3",
+    version="1.0.4",
     install_requires=[
         "numpy",
     ],
@@ -22,7 +22,6 @@
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Programming Language :: C",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

From 02dcfab45029a1475e09e9c41023337be00d96dc Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 02:41:57 +0100
Subject: [PATCH 08/14] testing with new pypi api

---
 .github/workflows/cbuild.yml       | 4 ++--
 .github/workflows/cibuild-pypi.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 1945d76..261415f 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -63,6 +63,6 @@ jobs:
 
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: ${{ secrets.pypi_username }}
+          user: __token__
           password: ${{ secrets.pypi_password }}
           repository_url: https://test.pypi.org/legacy/
\ No newline at end of file
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 5e4525f..b7e2043 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -65,6 +65,6 @@ jobs:
 
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          user: ${{ secrets.pypi_username }}
+          user: __token__
           password: ${{ secrets.pypi_password }}
           repository_url: https://upload.pypi.org/legacy/
\ No newline at end of file

From 817c6d4e2cd337fda6bc516939ebda0facde293b Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 02:55:45 +0100
Subject: [PATCH 09/14] fixed token

---
 .github/workflows/cbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 261415f..416c7f8 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -64,5 +64,5 @@ jobs:
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
-          password: ${{ secrets.pypi_password }}
+          password: ${{ secrets.test_pypi_password }}
           repository_url: https://test.pypi.org/legacy/
\ No newline at end of file

From 20bb3064b837735bf97f451e37f2f5ddd0cf296d Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 03:01:53 +0100
Subject: [PATCH 10/14] add back ubuntu and windows

---
 .github/workflows/cbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 416c7f8..3b5058c 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4

From 7a6f55c4d6e22b38af17d4dc6985b1423735bd6a Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 12:51:49 +0100
Subject: [PATCH 11/14] try skip-existing in pypi workflow

---
 .github/workflows/cbuild.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 3b5058c..aadf5e3 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -65,4 +65,5 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.test_pypi_password }}
-          repository_url: https://test.pypi.org/legacy/
\ No newline at end of file
+          repository_url: https://test.pypi.org/legacy/
+          skip-existing: true
\ No newline at end of file

From 5d5cadee3e67c99f3052cf137eb8a404f8de70c7 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 13:41:51 +0100
Subject: [PATCH 12/14] try spawning job arrays for linus and windows builds

---
 .github/workflows/cbuild.yml       | 19 ++++++++++++++++++-
 .github/workflows/cibuild-pypi.yml | 20 ++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index aadf5e3..3bd1463 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,7 +15,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, macos-14]
+        include:
+          - {os: macos-latest, arch: x86_64, build: "*"}
+          - {os: macos-latest, arch: arm64, build: "*"}
+          - {os: windows-latest, arch: AMD64, build: "*"}
+          - {os: windows-latest, arch: x86, build: "*"}          
+          - {os: ubuntu-latest, arch: x86_64, build: "*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: ppc64le, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: s390x, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: x86_64, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: i686, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: ppc64le, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: s390x, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: x86_64, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: i686, build: "*-musllinux*"}
 
     steps:
       - uses: actions/checkout@v4
@@ -25,6 +40,8 @@ jobs:
         env:
           # Disable building PyPy wheels on all platforms
           CIBW_SKIP: pp*
+          CIBW_ARCHS: ${{ matrix.arch }}
+          CIBW_BUILD: ${{ matrix.build }}
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index b7e2043..4d98b35 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -16,8 +16,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-
+        include:
+          - {os: macos-latest, arch: x86_64, build: "*"}
+          - {os: macos-latest, arch: arm64, build: "*"}
+          - {os: windows-latest, arch: AMD64, build: "*"}
+          - {os: windows-latest, arch: x86, build: "*"}          
+          - {os: ubuntu-latest, arch: x86_64, build: "*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: ppc64le, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: s390x, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: x86_64, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: i686, build: "*-manylinux*"}
+          - {os: ubuntu-latest, arch: aarch64, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: ppc64le, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: s390x, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: x86_64, build: "*-musllinux*"}
+          - {os: ubuntu-latest, arch: i686, build: "*-musllinux*"}
     steps:
       - uses: actions/checkout@v4
 
@@ -26,6 +40,8 @@ jobs:
         env:
           # Disable building PyPy wheels on all platforms
           CIBW_SKIP: pp*
+          CIBW_ARCHS: ${{ matrix.arch }}
+          CIBW_BUILD: ${{ matrix.build }}
 
       - uses: actions/upload-artifact@v4
         with:

From 7bd5a212aa0afb4c62ac5eeefc28256ae25f34f6 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 13:58:33 +0100
Subject: [PATCH 13/14] added qemu docker for linux builds

---
 .github/workflows/cbuild.yml       | 3 +++
 .github/workflows/cibuild-pypi.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 3bd1463..05eea73 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -35,6 +35,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: docker/setup-qemu-action@v2
+        if: matrix.os == 'ubuntu-latest'
+
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.1
         env:
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 4d98b35..0a6a755 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -35,6 +35,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: docker/setup-qemu-action@v2
+        if: matrix.os == 'ubuntu-latest'
+
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.1
         env:

From be50018e38d44a928d35a5d29fbee8184ae07d85 Mon Sep 17 00:00:00 2001
From: cylammarco <cylammarco@gmail.com>
Date: Fri, 28 Jun 2024 14:58:48 +0100
Subject: [PATCH 14/14] distributed build isn't faster, revert...

---
 .github/workflows/cbuild.yml       | 22 +---------------------
 .github/workflows/cibuild-pypi.yml | 23 ++---------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/cbuild.yml b/.github/workflows/cbuild.yml
index 05eea73..1208202 100644
--- a/.github/workflows/cbuild.yml
+++ b/.github/workflows/cbuild.yml
@@ -15,36 +15,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        include:
-          - {os: macos-latest, arch: x86_64, build: "*"}
-          - {os: macos-latest, arch: arm64, build: "*"}
-          - {os: windows-latest, arch: AMD64, build: "*"}
-          - {os: windows-latest, arch: x86, build: "*"}          
-          - {os: ubuntu-latest, arch: x86_64, build: "*"}
-          - {os: ubuntu-latest, arch: aarch64, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: ppc64le, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: s390x, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: x86_64, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: i686, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: aarch64, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: ppc64le, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: s390x, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: x86_64, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: i686, build: "*-musllinux*"}
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: docker/setup-qemu-action@v2
-        if: matrix.os == 'ubuntu-latest'
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.1
         env:
           # Disable building PyPy wheels on all platforms
           CIBW_SKIP: pp*
-          CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD: ${{ matrix.build }}
 
       - uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/cibuild-pypi.yml b/.github/workflows/cibuild-pypi.yml
index 0a6a755..b7e2043 100644
--- a/.github/workflows/cibuild-pypi.yml
+++ b/.github/workflows/cibuild-pypi.yml
@@ -16,35 +16,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        include:
-          - {os: macos-latest, arch: x86_64, build: "*"}
-          - {os: macos-latest, arch: arm64, build: "*"}
-          - {os: windows-latest, arch: AMD64, build: "*"}
-          - {os: windows-latest, arch: x86, build: "*"}          
-          - {os: ubuntu-latest, arch: x86_64, build: "*"}
-          - {os: ubuntu-latest, arch: aarch64, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: ppc64le, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: s390x, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: x86_64, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: i686, build: "*-manylinux*"}
-          - {os: ubuntu-latest, arch: aarch64, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: ppc64le, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: s390x, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: x86_64, build: "*-musllinux*"}
-          - {os: ubuntu-latest, arch: i686, build: "*-musllinux*"}
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+
     steps:
       - uses: actions/checkout@v4
 
-      - uses: docker/setup-qemu-action@v2
-        if: matrix.os == 'ubuntu-latest'
-
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19.1
         env:
           # Disable building PyPy wheels on all platforms
           CIBW_SKIP: pp*
-          CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD: ${{ matrix.build }}
 
       - uses: actions/upload-artifact@v4
         with: