trying to fix imageio error

SteveDoyle2 · Feb 14, 2024 · 9ebb198 · 9ebb198
1 parent 689d5db
commit 9ebb198
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       matrix:
          # '3.9', '3.11-dev'
-         python-version: ['3.10', '3.11']
+         python-version: ['3.10', '3.11', '3.12']
          os: [ubuntu-latest]
          # , macos-latest, windows-latest
          mode: ['latest', 'latest_basic', 'old', 'latest_pyqt5_gui', 'latest_pyqt6_gui', 'latest_pyside2_gui', ]
@@ -194,33 +194,33 @@ jobs:
         if: ${{ (matrix.mode == 'latest_pyside2_gui' || matrix.mode == 'latest_pyside6_gui' ||
                  matrix.mode == 'latest_pyqt5_gui'   || matrix.mode == 'latest_pyqt6_gui') }}
         run: |
-          pip install imageio<2.33.0 pillow>=10.1.0
+          pip install imageio pillow>=10.1.0
 
       - name: Install latest packages (vtk)
-        #if: ${{ matrix.python-version != '3.12' && (
+        #if: ${{ matrix.python-version != '3.13' && (
         #       matrix.mode == 'latest_pyside2_gui' || matrix.mode == 'latest_pyside6_gui' ||
         #       matrix.mode == 'latest_pyqt5_gui'   || matrix.mode == 'latest_pyqt6_gui') }}
         if: ${{ (matrix.mode == 'latest_pyside2_gui' || matrix.mode == 'latest_pyside6_gui' ||
                  matrix.mode == 'latest_pyqt5_gui'   || matrix.mode == 'latest_pyqt6_gui') }}
         run: |
           pip install vtk
 
-      - if: ${{ matrix.mode == 'latest_pyside2_gui' && matrix.python-version != '3.12' }}
+      - if: ${{ matrix.mode == 'latest_pyside2_gui' && matrix.python-version != '3.13' }}
         name: Install PySide2
         run: |
           pip install PySide2
 
-      - if: ${{ matrix.mode == 'latest_pyside6_gui' && matrix.python-version != '3.12' }}
+      - if: ${{ matrix.mode == 'latest_pyside6_gui' && matrix.python-version != '3.13' }}
         name: Install PySide6
         run: |
           pip install PySide6
 
-      - if: ${{ matrix.mode == 'latest_pyqt5_gui' && matrix.python-version != '3.12' }}
+      - if: ${{ matrix.mode == 'latest_pyqt5_gui' && matrix.python-version != '3.13' }}
         name: Install PyQt5
         run: |
           pip install PyQt5
 
-      - if: ${{ matrix.mode == 'latest_pyqt6_gui' && matrix.python-version != '3.12' }}
+      - if: ${{ matrix.mode == 'latest_pyqt6_gui' && matrix.python-version != '3.13' }}
         name: Install PyQt6
         run: |
           pip install PyQt6

diff --git a/pyproject.toml b/pyproject.toml
@@ -223,7 +223,9 @@ requires = [
 # Conclusion:
 # - "pip wheel ." pulls the version from setup.py
 # - invents a version if setup.py doesn't exist
-# - version_file fixes the version somehow
+# - version_file doesn't seem to do a whole lot
+# - the version comes from the __init__.py regardless of
+#   setup.py being directly called or not 
 [tool.setuptools_scm]
 version_file = "pyNastran/_version.py"
 local_scheme = 'no-local-version'