Geode-solutions · JulienChampagnol · Mar 13, 2024 · Mar 7, 2024 · Mar 11, 2024 · Mar 11, 2024
diff --git a/.github/workflows/CD.yml → .github/workflows/CICD.yml b/.github/workflows/CD.yml → .github/workflows/CICD.yml
@@ -1,12 +1,27 @@
-name: CD
+name: CICD
 
 on:
   push:
-    branches: [master, next, json_import_viewer]
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+      - name: Test
+        run: |
+          pip install pytest pytest-xprocess
+          pip install https://www.vtk.org/files/release/9.3/vtk_osmesa-9.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+          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

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,8 @@ venv/
 .vscode/
 __pycache__/
 .env
-data/
 /node_modules
 latest_logs
 schemas.json
+build
+*.egg-info
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,98 @@
 
 
 
+## v0.1.1-rc.2 (2024-03-13)
+
+### Fix
+
+* fix(CPU): handle vtk cpu ([`9fc05dc`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/9fc05dc37c37a7692850e57d5a7a2feea13aef76))
+
+### Unknown
+
+* Merge pull request #18 from Geode-solutions/vtk-cpu
+
+fix(CPU): handle vtk cpu ([`4cc9f76`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/4cc9f7653b571065538723b4502603ef0d8f88ac))
+
+* test ([`6ba1ce5`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6ba1ce5c73f1f59a980aee2e8bbb938dc2036838))
+
+
+## v0.1.1-rc.1 (2024-03-13)
+
+### Fix
+
+* fix(tests): tests in src and fix paths ([`2688759`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/2688759121f1176bca6b1cec7aa9e054b8f4fd26))
+
+### Unknown
+
+* Merge pull request #17 from Geode-solutions/fix/github_actions
+
+Fix/GitHub actions ([`24b50ee`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/24b50ee0a684590a5cfb6195430c908eec1542ee))
+
+* test remove tests data in package ([`fbc4a97`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/fbc4a973d5ce0e93b7fad0491a908883a3c52896))
+
+* gpu mode ([`27c12ef`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/27c12ef4369888b403a928798bbcd4266bd4bed8))
+
+* test test_config path ([`b2ba02a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b2ba02a4426fbdc2a6f6600177907d6c3e08446f))
+
+* test optional-dependencies ([`ba98f64`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/ba98f641b2d537b940d0f5421bdb16d23a1ed509))
+
+* test without vtk ([`21758c6`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/21758c636719aa72b3da4d9dfded1f5c3c59322a))
+
+* test on all branches build on next/master ([`37e0234`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/37e0234520a3d07a3117860c3a269b6abb50e691))
+
+* test ([`6b0128c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/6b0128cd41ea3af740447524317cc72c318636d3))
+
+* test ([`b12f219`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b12f2193a1757ac30821823f27c4cd3583765cd6))
+
+* no pip install . ([`de9b14c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/de9b14ccc5edd5539c00f8d0339a5fdc3a6d9a2b))
+
+* container ([`58ddf2f`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/58ddf2f24b4f5de35f811b786a1b9bdf7943a32a))
+
+* test print ([`8a2f131`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8a2f131a01371eb6e5d1b10dc8dbd6607d9ef221))
+
+* test remove timeout ([`f9680d2`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/f9680d2ff167b912dae7ea3be15d30433b8406a6))
+
+* install python-dotenv ([`2c1d428`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/2c1d428487f4fc5b5ab04ea23fdd1a56644eb104))
+
+* install pytest-xprocess ([`8769f65`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/8769f6588be2604fd8bbe372ecd39249088127bf))
+
+* install xprocess ([`1bd3aaa`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/1bd3aaa887cf3683028229f98a1b66f8df88de28))
+
+* add websocket-client ([`2de61bb`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/2de61bbe6a349ea83807774f71d14267074cdd9d))
+
+* test pip install . ([`b86f686`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/b86f68652b87928066f9167978b992f9c6ff52ae))
+
+* Merge pull request #16 from Geode-solutions/fix/tests
+
+Fix/tests ([`5f20bf7`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/5f20bf7d64746cc4bcbfc7f71eae1f492cd55c63))
+
+* pyproject.toml ([`617833e`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/617833e071e264a08450e582498c7d7827919eb0))
+
+* remove CI ([`e629346`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/e629346646f3556196cd0110f96b87cda6d4556a))
+
+* Merge branch &#39;fix/tests&#39; of https://github.com/Geode-solutions/OpenGeodeWeb-Viewer into fix/tests ([`7fabf4a`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/7fabf4a1632eb9bd6c37bdd93915608ece00e156))
+
+* change start command ([`44b7c51`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/44b7c51c3dd7f98b53001871b69033246aac1fdf))
+
+* Update pyproject.toml
+
+Co-authored-by: Arnaud Botella &lt;[email protected]&gt; ([`19fb81b`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/19fb81b78c4c731788f8aeae06d2d170f1d14f45))
+
+* CICD pipeline ([`32dddc6`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/32dddc67d0bb07fa80bc763c37ffffdb8a55ae3e))
+
+* script ([`fb81a0c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/fb81a0c6cefc9b2db8953b238e67501e7942d2d8))
+
+* relative imports ([`c3a4f1e`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/c3a4f1e97791ee688069e15f5d9a1f0223a19c45))
+
+* add CI ([`c1cb848`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/c1cb848f8ad6b4adb3db85d8fc26d5c09ebf8e42))
+
+* add datas ([`0d512f8`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/0d512f8c835367f9ef13f1dab58bf11ceb3929fd))
+
+* uncomment tests ([`bb7f263`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/bb7f2639285fdc996dd5b72b2e60238b26caebe2))
+
+*  ([`25e758c`](https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/commit/25e758c1a340ef92aed8ae60300548fdc507d9da))
+
+
 ## v0.1.0 (2024-03-07)
 
 ### Unknown

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "0.1.0"
+version = "0.1.1-rc.2"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },
@@ -19,18 +19,24 @@ 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"
 
+[project.scripts]
+opengeodeweb_viewer = "opengeodeweb_viewer.vtkw_server:run_server"
+
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 
 [tool.setuptools.packages.find]
 where = ["src"]
 
 [tool.setuptools.package-data]
-"opengeodeweb_Viewer.rpc.schemas" = ["*.json"]
+"opengeodeweb_viewer.rpc.schemas" = ["*.json"]
 
 [tool.semantic_release]
 version_toml = [

diff --git a/requirements.in b/requirements.in
@@ -1,4 +1,4 @@
 jsonschema
-numpy
-vtk
-wslink
+python-dotenv
+wslink
+websocket-client
diff --git a/requirements.txt b/requirements.txt
@@ -15,45 +15,22 @@ 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.2
-    # 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
-    #   -r requirements.in
-    #   contourpy
-    #   matplotlib
-packaging==23.2
-    # 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
     # via
     #   jsonschema
@@ -62,13 +39,9 @@ rpds-py==0.18.0
     # via
     #   jsonschema
     #   referencing
-six==1.16.0
-    # via python-dateutil
-vtk==9.3.0
+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
diff --git a/tests/__init__.py → src/__init__.py b/tests/__init__.py → src/__init__.py
diff --git a/src/opengeodeweb_viewer/__init__.py b/src/opengeodeweb_viewer/__init__.py
@@ -0,0 +1,3 @@
+from .config import *
+from .function import *
+from .vtk_protocol import *
diff --git a/src/opengeodeweb_viewer/config.py b/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"
     )
diff --git a/src/opengeodeweb_viewer/vtk_protocol.py b/src/opengeodeweb_viewer/vtk_protocol.py
@@ -3,7 +3,7 @@
 from vtk.web import protocols as vtk_protocols
 from wslink import register as exportRpc
 import vtk
-from function import validate_schemas
+from .function import validate_schemas
 
 schemas = os.path.join(os.path.dirname(__file__), "rpc/schemas")
 

diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py
@@ -1,14 +1,15 @@
 import sys
 import argparse
-import config
 import os
 
 from wslink import server
 from vtk.web import wslink as vtk_wslink
 from vtk.web import protocols as vtk_protocols
 import vtk
-from vtk_protocol import VtkView
+from .vtk_protocol import VtkView
 import dotenv
+from .config import *
+
 
 # =============================================================================
 # Server class
@@ -77,16 +78,16 @@ def initialize(self):
 # =============================================================================
 
 
-if __name__ == "__main__":
+def run_server():
     basedir = os.path.abspath(os.path.dirname(__file__))
     dot_env_path = os.path.join(basedir, "../../.env")
     if os.path.isfile(dot_env_path):
         dotenv.load_dotenv(dot_env_path)
     PYTHON_ENV = os.environ.get("PYTHON_ENV", default="prod").strip().lower()
     if PYTHON_ENV == "prod":
-        config.prod_config()
+        prod_config()
     elif PYTHON_ENV == "dev":
-        config.dev_config()
+        dev_config()
 
     parser = argparse.ArgumentParser(description="Vtk server")
     server.add_arguments(parser)
@@ -99,3 +100,7 @@ def initialize(self):
 
     _Server.configure(args)
     server.start_webserver(options=args, protocol=_Server)
+
+
+if __name__ == "__main__":
+    run_server()
diff --git a/src/tests/__init__.py b/src/tests/__init__.py