Merge pull request #17 from Geode-solutions/fix/github_actions

Fix/GitHub actions

Author: JulienChampagnol

.github/workflows/CICD.yml

@@ -2,7 +2,6 @@ name: CICD
 
 on:
   push:
-    branches: [master, next]
 
 jobs:
   test:
@@ -13,19 +12,13 @@ jobs:
     - name: Test
       run: |
         pip install pytest pytest-xprocess
-        pip install -r requirements.txt
-        pip install .
-        echo "toto"
-        ls  /usr/local/lib/python3.9/site-packages/opengeodeweb_viewer
-        echo "tutu"
-        ls  /usr/local/lib/python3.9/site-packages/opengeodeweb_viewer/tests
-        echo "titi"
-        ls  /usr/local/lib/python3.9/site-packages/opengeodeweb_viewer/tests/data
+        pip install -e .
         pytest
 
   build:
     runs-on: ubuntu-latest
     needs: test
+    if: github.ref == 'refs/heads/next' || github.ref == 'refs/heads/master'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

pyproject.toml

@@ -19,6 +19,9 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 
+[project.optional-dependencies]
+gpu = ["vtk == 9.*"]
+
 [project.urls]
 "Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer"
 "Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/issues"
@@ -34,8 +37,6 @@ where = ["src"]
 
 [tool.setuptools.package-data]
 "opengeodeweb_viewer.rpc.schemas" = ["*.json"]
-"tests.images" = ["*.*"]
-"tests.data" = ["*.*"]
 
 [tool.semantic_release]
 version_toml = [

requirements.in

@@ -1,5 +1,4 @@
 jsonschema
 python-dotenv
-vtk
 wslink
 websocket-client

requirements.txt

@@ -15,44 +15,20 @@ attrs==23.2.0
     #   aiohttp
     #   jsonschema
     #   referencing
-contourpy==1.2.0
-    # via matplotlib
-cycler==0.12.1
-    # via matplotlib
-fonttools==4.49.0
-    # via matplotlib
 frozenlist==1.4.1
     # via
     #   aiohttp
     #   aiosignal
 idna==3.6
     # via yarl
-importlib-resources==6.1.3
-    # via matplotlib
 jsonschema==4.21.1
     # via -r requirements.in
 jsonschema-specifications==2023.12.1
     # via jsonschema
-kiwisolver==1.4.5
-    # via matplotlib
-matplotlib==3.8.3
-    # via vtk
 multidict==6.0.5
     # via
     #   aiohttp
     #   yarl
-numpy==1.26.4
-    # via
-    #   contourpy
-    #   matplotlib
-packaging==24.0
-    # via matplotlib
-pillow==10.2.0
-    # via matplotlib
-pyparsing==3.1.2
-    # via matplotlib
-python-dateutil==2.9.0.post0
-    # via matplotlib
 python-dotenv==1.0.1
     # via -r requirements.in
 referencing==0.33.0
@@ -63,15 +39,9 @@ rpds-py==0.18.0
     # via
     #   jsonschema
     #   referencing
-six==1.16.0
-    # via python-dateutil
-vtk==9.3.0
-    # via -r requirements.in
 websocket-client==1.7.0
     # via -r requirements.in
 wslink==1.12.4
     # via -r requirements.in
 yarl==1.9.4
     # via aiohttp
-zipp==3.17.0
-    # via importlib-resources

src/opengeodeweb_viewer/config.py

@@ -26,6 +26,7 @@ def dev_config():
 
 def test_config():
     default_config()
+    print(f"{os.path.dirname(__file__)=}", flush=True)
     os.environ["DATA_FOLDER_PATH"] = os.path.join(
-        os.path.dirname(__file__), "tests", "data"
+        os.path.dirname(__file__), "..", "tests", "data"
     )