From a38bf095d88a751d4dff46a79a7c530c24e7b8e4 Mon Sep 17 00:00:00 2001
From: Matthias Wittgen <matthias.michael.wittgen@cern.ch>
Date: Fri, 6 Sep 2024 13:55:32 -0700
Subject: [PATCH 1/2] Enable linux_aarch64

---
 .github/workflows/build.yaml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cfdf989..fc730cd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -104,23 +104,21 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "macos-12"]
+        python-version: ["38", "39", "310", "311", "312", "313"]
     runs-on: ${{ matrix.os }}
     needs: [build_and_test]
     if: startsWith(github.ref, 'refs/tags/')
     env:
-      CIBW_BUILD: "cp3{8,9,10,11,12,13}-{manylinux_x86_64,manylinux_aarch64,macosx_arm64,macosx_x86_64}"
+      CIBW_BUILD: "cp${{ matrix.python-version }}-{manylinux_x86_64,manylinux_aarch64,macosx_arm64,macosx_x86_64}"
       CIBW_ARCHS_MACOS: "x86_64 arm64"
-      # use line below to enable aarch64 builds
-      # CIBW_ARCHS_LINUX: "auto aarch64"
-      CIBW_ARCHS_LINUX: "auto"
+      CIBW_ARCHS_LINUX: "auto aarch64"
 
     steps:
-      # uncomment when building aarch64
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v2
-      #   if: runner.os == 'Linux'
-      #   with:
-      #     platforms: arm64
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        if: runner.os == 'Linux'
+        with:
+          platforms: arm64
 
       - uses: actions/checkout@v4
         with:
@@ -141,7 +139,7 @@ jobs:
           python -m cibuildwheel --output-dir dist
       - uses: actions/upload-artifact@v4
         with:
-          name: sphgeom-${{ matrix.os }}
+          name: sphgeom-${{ matrix.os }}-${{ matrix.python-version }}
           path: dist/*
 
   pipy_upload:

From 9d92248cec112e6002b4c50e715e6383544629b5 Mon Sep 17 00:00:00 2001
From: Matthias Wittgen <matthias.michael.wittgen@cern.ch>
Date: Fri, 6 Sep 2024 14:05:42 -0700
Subject: [PATCH 2/2] Remove python2 case

---
 tests/test_RangeSet.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/test_RangeSet.py b/tests/test_RangeSet.py
index 05101f3..79481b6 100644
--- a/tests/test_RangeSet.py
+++ b/tests/test_RangeSet.py
@@ -26,7 +26,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import pickle
-import sys
 import unittest
 
 from lsst.sphgeom import RangeSet
@@ -90,13 +89,8 @@ def testRanges(self):
 
     def testString(self):
         s = RangeSet(1, 10)
-        if sys.version_info[0] >= 3:
-            self.assertEqual(str(s), "[(1, 10)]")
-            self.assertEqual(repr(s), "RangeSet([(1, 10)])")
-        else:
-            # pybind11 maps C++ integers to Python long instances in Python 2.
-            self.assertEqual(str(s), "[(1L, 10L)]")
-            self.assertEqual(repr(s), "RangeSet([(1L, 10L)])")
+        self.assertEqual(str(s), "[(1, 10)]")
+        self.assertEqual(repr(s), "RangeSet([(1, 10)])")
         self.assertEqual(s, eval(repr(s), {"RangeSet": RangeSet}))
 
     def testPickle(self):