Merge pull request #67 from ashleyabraham/main

Updated to 2.11

Author: matsui528

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       matrix:
         # https://github.blog/2019-08-08-github-actions-now-supports-ci-cd/
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         # https://stackoverflow.com/questions/57810623/how-to-select-the-c-c-compiler-used-for-a-github-actions-job:
         compiler: [gcc, clang, cl]
         exclude:
@@ -27,19 +27,27 @@ jobs:
             compiler: clang
           - os: windows-latest
             compiler: gcc
+          - python-version: 3.8
+            os: macos-latest
+          - python-version: 3.9
+            os: macos-latest
+        include:
+          - python-version: 3.8
+            os: macos-13
+          - python-version: 3.9
+            os: macos-13
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-        architecture: x64
     - name: Print machine info
       run: |
         uname -a
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip setuptools wheel
         pip install -r requirements.txt
     - uses: ilammy/msvc-dev-cmd@v1
     - name: Install Rii
@@ -51,4 +59,4 @@ jobs:
       run: |
         make test
 
-        
+        

Makefile

@@ -1,7 +1,7 @@
 .PHONY: test clean build
 
 test:
-	python setup.py test
+	python -m unittest
 
 clean:
 	rm -rf build tmp dist *.egg-info *.so .eggs

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools>=64", "pybind11>=2.9"]
-build-backend = "setuptools.build_meta"
+requires = ["setuptools>=64", "pybind11>=2.9", "wheel"]
+build-backend = "setuptools.build_meta"

setup.py

@@ -88,7 +88,7 @@ def build_extensions(self):
             # For linux
             opts.append('-fopenmp')  # For pqk-means.
 
-        if sys.platform not in ['win32']:
+        if sys.platform not in ['darwin', 'win32']:
             # For linux and mac
             opts.append('-march=native')  # For fast SIMD computation of L2 distance
             opts.append('-mtune=native')  # Do optimization (It seems this doesn't boost, but just in case)