Merge branch 'dev' of github.com:cinemascience/pycinema into dev

cinemascience · Sep 30, 2024 · d1f5f6e · d1f5f6e
2 parents 65458c5 + aabcc80
commit d1f5f6e
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 48 deletions.
diff --git a/.github/workflows/MLPredictionTest.yml b/.github/workflows/MLPredictionTest.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v4
@@ -19,21 +19,22 @@ jobs:
       - name: Test Environment
         run: |
           python -m pip install --upgrade pip
+          sudo apt-get install libglu1-mesa-dev xvfb
           python -m pip install pytest pytest-xvfb
       - name: Dependencies
         run: |
           python setup.py install
-      - name: Test reader 
+      - name: Test reader
         run: |
           python -m pytest -s testing/MLPredictTest.py
 
   macos:
     strategy:
       matrix:
-        python-version: [3.9, '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
         os-version: [macos-12, macos-13]
 
-    runs-on: ${{ matrix.os-version }} 
+    runs-on: ${{ matrix.os-version }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -45,6 +46,6 @@ jobs:
           python -m pip install --upgrade pip setuptools
           python -m pip install pytest
           python setup.py install
-      - name: Test reader 
+      - name: Test reader
         run: |
           python -m pytest -s testing/MLPredictTest.py
diff --git a/.github/workflows/RenderTest.yml b/.github/workflows/RenderTest.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v4
@@ -31,10 +31,10 @@ jobs:
   macos:
     strategy:
       matrix:
-        python-version: [3.9, '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
         os-version: [macos-12, macos-13]
 
-    runs-on: ${{ matrix.os-version }} 
+    runs-on: ${{ matrix.os-version }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

diff --git a/.github/workflows/UberTest.yml b/.github/workflows/UberTest.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9,'3.10','3.11']
+        python-version: ['3.9','3.10','3.11']
 
     steps:
       - uses: actions/checkout@v4
@@ -19,6 +19,7 @@ jobs:
       - name: Test Environment
         run: |
           python -m pip install --upgrade pip
+          sudo apt-get install libglu1-mesa-dev xvfb
           python -m pip install pytest pytest-xvfb
       - name: Dependencies
         run: |
@@ -35,7 +36,7 @@ jobs:
   macos:
     strategy:
       matrix:
-        python-version: [3.9,'3.10','3.11']
+        python-version: ['3.9','3.10','3.11']
         os-version: [macos-12, macos-13]
 
     runs-on: ${{ matrix.os-version }}
@@ -59,25 +60,25 @@ jobs:
           python -m pytest -s testing/SqliteDatabaseReader.py
           python -m pytest -s testing/TableQueryTest.py
 
-  windows:
-    strategy:
-      matrix:
-        python-version: [3.9,'3.10','3.11']
-        os-version: [windows-latest]
+  # windows:
+  #   strategy:
+  #     matrix:
+  #       python-version: [3.9,'3.10','3.11']
+  #       os-version: [windows-latest]
 
-    runs-on: ${{ matrix.os-version }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools
-          python -m pip install pytest
-          python setup.py install
-      - name: Test script
-        run: |
-          cinema --version
-          cinema --help
+  #   runs-on: ${{ matrix.os-version }}
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Set up Python ${{ matrix.python-version }}
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     - name: Dependencies
+  #       run: |
+  #         python -m pip install --upgrade pip setuptools
+  #         python -m pip install pytest
+  #         python setup.py install
+  #     - name: Test script
+  #       run: |
+  #         cinema --version
+  #         cinema --help
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,15 @@
+numpy<2.0.0
+scipy==1.13.1
+h5py
+matplotlib
+py
+Pillow
+moderngl
+opencv-python-headless
+ipycanvas
+ipywidgets
+PySide6
+igraph
+requests
+pyqtgraph
+tensorflow
diff --git a/setup.py b/setup.py
@@ -1,5 +1,9 @@
 import setuptools
 
+def parse_requirements(filename):
+    with open(filename) as f:
+        return f.read().splitlines()
+
 # read the description file
 from os import path
 this_directory = path.abspath(path.dirname(__file__))
@@ -22,23 +26,7 @@
     include_package_data=True,
     zip_safe=False,
     packages=[  "pycinema", "pycinema.filters", "pycinema.scripts", "pycinema.theater", "pycinema.theater.node_editor", "pycinema.theater.views", "pycinema.ipy" ],
-    install_requires=[
-        "numpy==1.26.4",
-        "scipy==1.14.1",
-        "h5py>=3.10.0",
-        "matplotlib==3.6.0",
-        "py==1.11.0",
-        "Pillow==9.4.0",
-        "moderngl==5.10.0",
-        "opencv-python>=4.7.0",
-        "ipycanvas==0.13.1",
-        "ipywidgets==8.0.6",
-        "PySide6>=6.7.2",
-        "igraph>=0.10.5",
-        "requests>=2.31.0",
-        "pyqtgraph>=0.13.3",
-        "tensorflow>=2.17.0"
-    ],
+    install_requires=parse_requirements('requirements.txt'),
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: BSD License",