Merge branch 'main' of github.com:atksh/python_prtree

Author: atksh

.github/workflows/cibuildwheel.yml

@@ -163,53 +163,52 @@ jobs:
             macosx_deployment_target: 10.14
             arch: x86_64
 
-          # MacOS arm
+          # MacOS arm64
           - os: macos-14
             python: 38
-            platform_id: macosx_arm
+            platform_id: macosx_arm64
             macosx_deployment_target: 11.7
-            arch: arm
+            arch: arm64
           - os: macos-14
             python: 39
-            platform_id: macosx_arm
+            platform_id: macosx_arm64
             macosx_deployment_target: 11.7
-            arch: arm
+            arch: arm64
           - os: macos-14
             python: 310
-            platform_id: macosx_arm
+            platform_id: macosx_arm64
             macosx_deployment_target: 11.7
-            arch: arm
+            arch: arm64
           - os: macos-14
             python: 311
-            platform_id: macosx_arm
+            platform_id: macosx_arm64
             macosx_deployment_target: 11.7
-            arch: arm
+            arch: arm64
           - os: macos-14
             python: 312
-            platform_id: macosx_arm
+            platform_id: macosx_arm64
             macosx_deployment_target: 11.7
-            arch: arm
+            arch: arm64
 
 
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Set up QEMU
         if: runner.os == 'Linux'
         uses: docker/setup-qemu-action@v1
         with:
           platforms: all
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.4.0
+        uses: pypa/cibuildwheel@v2.17.0
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
           CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
-          CIBW_TEST_SKIP: "*-macosx_arm"
           CIBW_BEFORE_BUILD: pip install pybind11
           CIBW_TEST_COMMAND: pytest {project}/tests -vv
           CIBW_TEST_REQUIRES: pytest numpy
@@ -227,10 +226,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Build sdist
         run: python setup.py sdist
       - uses: actions/upload-artifact@v2

requirements.txt

@@ -1,3 +1 @@
-numpy>=1.16,<2.0
-pybind11; platform_machine != "x86_64" and platform_machine != "amd64" and platform_machine != "AMD64" and sys_platform == 'darwin'  # for m1 mac
-cmake; platform_machine != "x86_64" and platform_machine != "amd64" and platform_machine != "AMD64" and sys_platform == 'darwin'  # for m1 mac
+numpy>=1.16,<2.0