Merge pull request #17 from SciKit-Surgery/py313

Uses https://github.com/pypa/cibuildwheel to build wheels for many targets.

Author: thompson318

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+on: push
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v6
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==4.0.0
+
+      - 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@v6
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
+  make_sdist:
+    name: Make SDist
+    runs-on: ubuntu-slim
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+
+    - name: Build SDist
+      run: pipx run build --sdist
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: cibw-sdist
+        path: dist/*.tar.gz
+
+
+  upload_all:
+    needs: [build_wheels, make_sdist]
+    environment: pypi
+    permissions:
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/download-artifact@v5
+      with:
+        pattern: cibw-*
+        path: dist
+        merge-multiple: true
+
+    - uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.PYPI_API_TOKEN }}
+        skip-existing: true

.github/workflows/wheels.yml

@@ -1,5 +1,3 @@
 .idea
 CMakeLists.txt.user
-/ndicapiExport.h
 /build
-setup.py

.gitignore

@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 4.0.0)
 PROJECT(ndicapi)
 
-SET(ndicapi_VERSION 3.7.3)
+SET(ndicapi_VERSION 3.7.4)
 
 # --------------------------------------------------------------------------
 # Configure output paths for libraries and executables.
@@ -65,20 +65,6 @@ IF(BUILD_PYTHON)
       " shared library (CMake option BUILD_SHARED_LIBS)."
       )
   ENDIF()
-  SET(SETUP_PY_FILEPATH ${CMAKE_CURRENT_SOURCE_DIR}/setup.py)
-  CONFIGURE_FILE(
-    ${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
-    ${SETUP_PY_FILEPATH}
-    )
-  MESSAGE(
-    "Successfully generated ${SETUP_PY_FILEPATH} for the Python"
-    " extension module. To install the Python extension module:"
-    "\n\t0) Install the C++ library: make && make install"
-    " (might need admin access)"
-    "\n\t1) Go to ${CMAKE_CURRENT_SOURCE_DIR}"
-    "\n\t2) Build and install the Python extension:"
-    " python setup.py install (might require admin access)"
-    )
 ENDIF()
 
 FIND_PACKAGE(Threads)

CMakeLists.txt

@@ -1,8 +1,6 @@
 include *.cxx
 include *.h
 include README.pypi.md
-include ndicapiExport.h.in
 include CMakeLists.txt
 include ndicapiConfig.cmake.in
 include ndicapiConfigVersion.cmake.in
-include ndicapiExport.h.in

MANIFEST.in

@@ -12,8 +12,6 @@
 #ifndef __ndicapiExport_h
 #define __ndicapiExport_h
 
-#cmakedefine ndicapi_STATIC
-
 #if defined(WIN32) && !defined(ndicapi_STATIC)
  #if defined(ndicapi_EXPORTS)
   #define ndicapiExport __declspec( dllexport )

ndicapiExport.h.in ndicapiExport.hndicapiExport.h.in renamed to ndicapiExport.h

@@ -32,7 +32,7 @@
                     )
 
 setuptools.setup(name='ndicapi',
-      version='3.7.3',
+      version='3.7.4',
       url='https://github.com/SciKit-Surgery/ndicapi',
       license='MIT',
       description='This package allows interfacing with NDI tracking devices',