Merge branch '63-update-versions'

Author: MattClarkson

.github/workflows/ci.yml

@@ -8,38 +8,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
-        python-ver: [3.9, "3.11"]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-ver: [3.9, '3.10', 3.11, 3.12, 3.13]
         experimental: [false]
-        include:
-          - python-ver: "3.10"
-            os: ubuntu-latest
-            experimental: false
-          - python-ver: "3.10"
-            os: macos-13
-            experimental: true
-          - python-ver: "3.10"
-            os: windows-latest
-            experimental: false
-          - python-ver: 3.12
-            os: ubuntu-latest
-            experimental: true
-          - python-ver: 3.12
-            os: macos-latest
-            experimental: true
-          - python-ver: 3.12
-            os: windows-latest
-            experimental: true
-          - python-ver: 3.13
-            os: ubuntu-latest
-            experimental: true
-          - python-ver: 3.13
-            os: macos-latest
-            experimental: true
-          - python-ver: 3.13
-            os: windows-latest
-            experimental: true
-
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     timeout-minutes: 10
@@ -123,7 +94,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - name: Install dependencies
         run: python -m pip install wheel twine setuptools
@@ -134,7 +105,7 @@ jobs:
 
       - name: Publish package if tagged release
         if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

requirements.txt

@@ -1,20 +1,15 @@
 # This file lists the python packages that your software depends on.
-# It is used by pip to manage software dependencies. It is not to be
-# confused with the software requirements, which are listed in
-# doc/requirements.rst
-
-# Numpy went to version 2 on June 16th 2024.
-# OpenCV released 4.10.0.84 on June 17th 2024.
-# However, scikit-surgerycalibration version 0.2.5,
-# specifies opencv-contrib-python-headless opencv-contrib-python-headless<4.6 due to Issue #48.
-# If you google, you find lots of changes of opencv between 4.6 and 4.10, e.g. ArUco changes that affect our calibration.
-# So, for now, until scikit-surgerycalibration Issue #48 is fixed, so that we can upgrade to
-# opencv-contrib-python-headless >= 4.10.0.84 and beyond, numpy must be restricted to <2.0.
-numpy<2.0.0
+# Note: Numpy went to version 2 on June 16th 2024.
+#       OpenCV released 4.10.0.84 on June 17th 2024.
+# This requires: scikit-surgeryimage>=1.0.0
+#                scikit-surgeryvtk>=2.2.1
+#                scikit-surgerycalibration>=1.0.0
+# And these libraries now work on python 3.9 to 3.13.
+numpy>=2.0.0
 PySide6>=6.5.1.1
-opencv-contrib-python-headless>=4.2.0.32
+opencv-contrib-python-headless>=4.10.0.84
 scikit-surgerycore>=0.1.7
-scikit-surgeryimage>=0.10.1
-scikit-surgeryvtk>=2.2.1
-scikit-surgeryarucotracker
-scikit-surgerycalibration>=0.2.5
+scikit-surgeryimage>=1.0.0
+scikit-surgeryvtk>=2.3.0
+scikit-surgeryarucotracker>=1.1.0
+scikit-surgerycalibration>=1.0.0

setup.py

@@ -50,14 +50,14 @@
     ),
 
     install_requires=[
-        'numpy<2.0.0',
+        'numpy>=2.0.0',
         'PySide6>=6.5.1.1',
-        'opencv-contrib-python-headless>=4.2.0.32',
+        'opencv-contrib-python-headless>=4.10.0.84',
         'scikit-surgerycore>=0.1.7',
-        'scikit-surgeryimage>=0.10.1',
-        'scikit-surgeryvtk>=2.2.1',
-        'scikit-surgeryarucotracker',
-        'scikit-surgerycalibration>=0.2.5'
+        'scikit-surgeryimage>=1.0.0',
+        'scikit-surgeryvtk>=2.3.0',
+        'scikit-surgeryarucotracker>=1.1.0',
+        'scikit-surgerycalibration>=1.0.0'
     ],
 
     entry_points={