From 6b1c38deac56c8fa87f2d24174f978a78fb64734 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:47:34 -0800
Subject: [PATCH 1/8] Fix to generate proper Apple Silicon wheels, bump
 versions to mitigate GH warnings

---
 .github/workflows/build_wheels.yml | 10 +++++++---
 pyproject.toml                     |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index a668a676..54d139f8 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -69,10 +69,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.x
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -88,8 +88,12 @@ jobs:
       - name: Build wheels
         run: python -m cibuildwheel --output-dir dist
         env:
+          CIBW_ENVIRONMENT_MACOS: CMAKE_OSX_ARCHITECTURES=${{ matrix.config.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.config.cibw-arch == 'macosx_arm64' && 'arm64' || '' }}
           CIBW_BUILD: "*-${{ matrix.config.cibw-arch }}"
+          MACOSX_DEPLOYMENT_TARGET: "10.14" # min supporting c++17
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: pypi_wheels
           path: ./dist/*.whl
+          compression-level: 0 # contents are already compressed
diff --git a/pyproject.toml b/pyproject.toml
index ff2becd5..5c584ec2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,6 +36,3 @@ before-build = "yum remove -y cmake"
 
 [tool.cibuildwheel.macos]
 archs = ["x86_64", "arm64"]
-
-# Minimum version for proper C++17 support on MacOS
-environment = { MACOSX_DEPLOYMENT_TARGET = "10.14" }

From 684f62e0ec9c3a7cb3c6d73102c8725a1c86f186 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:55:25 -0800
Subject: [PATCH 2/8] version bump dependencies for other workflows

---
 .github/workflows/ci.yml     | 4 ++--
 .github/workflows/sphinx.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index adddde12..ae2699c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,9 +35,9 @@ jobs:
             
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python 3.x
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         # 3.x uses the latest minor version of python3. This may break briefly when there is a new version
         # but dependent libraries (e.g. numpy) have not yet released a compatible update.
         # May need to enable version pinning (e.g. 3.10) temporarily at times.
diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml
index 1b30f344..12e864f6 100644
--- a/.github/workflows/sphinx.yml
+++ b/.github/workflows/sphinx.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Install Datasketches and Sphinx

From 5c47bce5f45ec9bdd36c7b96f87c70e5d74a68df Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:58:16 -0800
Subject: [PATCH 3/8] don't try to name aritfact

---
 .github/workflows/build_wheels.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 54d139f8..7a6704c3 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -94,6 +94,5 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: pypi_wheels
           path: ./dist/*.whl
           compression-level: 0 # contents are already compressed

From df73ee7bb545d5aac9ba38063557294315265ce5 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 18:02:06 -0800
Subject: [PATCH 4/8] bump versions for source artifact

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

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 7a6704c3..c41dbc25 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -12,9 +12,9 @@ jobs:
     name: Source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.x'
@@ -25,9 +25,11 @@ jobs:
       - name: Build sdist
         run: python -m build --sdist --outdir dist
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*.tar.gz
+          compression-level: 0 # contents are already compressed
+
 
   build_wheels:
     name: ${{ matrix.config.name }}

From 074643a1ccdcd325a27a33a5161937ac27916980 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:04:59 -0800
Subject: [PATCH 5/8] unique artifact names and merge into one at the end

---
 .github/workflows/build_wheels.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index c41dbc25..2350e943 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -6,6 +6,7 @@ on:
 env:
   BUILD_TYPE: Release
   MIN_CIBUILDWHEEL_VERSION: 2.16.2
+  PYTHON_VERSION: 3.11
 
 jobs:
   build_sdist:
@@ -17,7 +18,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.x'
+          python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Install build package
         run: python -m pip install build --user
@@ -27,6 +28,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: sdist
           path: dist/*.tar.gz
           compression-level: 0 # contents are already compressed
 
@@ -96,5 +98,19 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: wheel-${{ matrix.config.os }}-${{ matrix.config.cibw-arch }}
           path: ./dist/*.whl
           compression-level: 0 # contents are already compressed
+
+
+  aggregate_artifact:
+    name: Aggregate artifact
+    runs-on: ubuntu-latest
+    needs: [build_sdist, build_wheels]
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: python_wheels
+          compression-level: 0
+          delete-merged: true

From 5592101b9d89225b51f419c3ebfd1c4d6bad2106 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:06:07 -0800
Subject: [PATCH 6/8] use PYTHON_VERSION variable consistently

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

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 2350e943..96e84145 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -75,10 +75,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up Python 3.x
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up QEMU for linux/arm64 builds
         if: runner.os == 'Linux' && matrix.config.use-qemu == true

From c4ba296de73fdadc6e94572289d031633c259554 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:43:33 -0800
Subject: [PATCH 7/8] Bump qemu version, tidy up naming

---
 .github/workflows/build_wheels.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 96e84145..c7453e27 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -6,7 +6,7 @@ on:
 env:
   BUILD_TYPE: Release
   MIN_CIBUILDWHEEL_VERSION: 2.16.2
-  PYTHON_VERSION: 3.11
+  PYTHON_VERSION: 3.x
 
 jobs:
   build_sdist:
@@ -75,14 +75,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up Python ${{ env.PYTHON_VERSION }}
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up QEMU for linux/arm64 builds
         if: runner.os == 'Linux' && matrix.config.use-qemu == true
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
@@ -98,13 +98,13 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheel-${{ matrix.config.os }}-${{ matrix.config.cibw-arch }}
+          name: wheels-${{ matrix.config.os }}-${{ matrix.config.cibw-arch }}
           path: ./dist/*.whl
           compression-level: 0 # contents are already compressed
 
 
-  aggregate_artifact:
-    name: Aggregate artifact
+  aggregate_artifacts:
+    name: Aggregate artifacts
     runs-on: ubuntu-latest
     needs: [build_sdist, build_wheels]
     steps:

From 3e71a481f31917c0292b70aa9b5a092a9e225718 Mon Sep 17 00:00:00 2001
From: Jon Malkin <786705+jmalkin@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:14:04 -0800
Subject: [PATCH 8/8] v5.0.1

---
 version.cfg.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.cfg.in b/version.cfg.in
index 0062ac97..6b244dcd 100644
--- a/version.cfg.in
+++ b/version.cfg.in
@@ -1 +1 @@
-5.0.0
+5.0.1