Merge branch 'next' into fix/is_loadable

MaxNumerique · web-flow · commit aa04081045d1 · 2025-08-04T16:49:38.000+02:00
diff --git a/.github/workflows/Branch-protection.yml b/.github/workflows/Branch-protection.yml
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,12 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    uses: Geode-solutions/actions/.github/workflows/py-deploy.yml@master
+    with:
+      npm: true
+    secrets: inherit
+    
diff --git a/.github/workflows/pr_update.yml b/.github/workflows/pr_update.yml
@@ -0,0 +1,11 @@
+name: Pull request
+
+on:
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - master
+
+jobs:
+  update-branch:
+    uses: Geode-solutions/actions/.github/workflows/update-branch.yml@master
diff --git a/.github/workflows/prepare_deploy.yml b/.github/workflows/prepare_deploy.yml
@@ -0,0 +1,9 @@
+name: Prepare deploy
+
+on:
+  workflow_dispatch:
+
+jobs:
+  prepare:
+    uses: Geode-solutions/actions/.github/workflows/py-prepare-deploy.yml@master
+    secrets: inherit
diff --git a/.github/workflows/prepare_pr.yml b/.github/workflows/prepare_pr.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,14 @@
+name: Test
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - next
+
+jobs:
+  test:
+    uses: Geode-solutions/actions/.github/workflows/py-test.yml@master
+    with:
+      repos: ${{ vars.REPOS }}
+    secrets: inherit
diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -0,0 +1,12 @@
+name: Test PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  test:
+    uses: Geode-solutions/actions/.github/workflows/py-test-pr.yml@master
+    with:
+      repos: ${{ vars.REPOS }}
+    secrets: inherit
diff --git a/requirements.in b/requirements.in
@@ -1,15 +1,10 @@
-OpenGeode-core
-OpenGeode-IO
-OpenGeode-Inspector
-OpenGeode-Geosciences
-OpenGeode-GeosciencesIO
-Geode-Viewables
-geode-numerics
-geode-simplex
-geode-explicit
-geode-implicit
-geode-common
-fastjsonschema
-Flask[async]
-Flask-Cors
-werkzeug
+OpenGeode-core==15.24.1
+OpenGeode-IO==7.3.1
+OpenGeode-Inspector==6.7.0
+OpenGeode-Geosciences==9.2.1
+OpenGeode-GeosciencesIO==5.7.1
+Geode-Viewables==3.2.0
+fastjsonschema==2.16.2
+Flask[async]==3.0.3
+Flask-Cors==6.0.1
+werkzeug==3.0.3
diff --git a/requirements.txt b/requirements.txt
@@ -2,27 +2,23 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile requirements.in
+#    pip-compile --pre requirements.in
 #
 asgiref==3.9.1
     # via flask
 blinker==1.9.0
     # via flask
 click==8.2.1
     # via flask
-fastjsonschema==2.21.1
+fastjsonschema==2.16.2
     # via -r requirements.in
-flask[async]==3.1.1
+flask[async]==3.0.3
     # via
     #   -r requirements.in
+    #   flask
     #   flask-cors
 flask-cors==6.0.1
     # via -r requirements.in
-geode-background==9.4.0
-    # via
-    #   geode-explicit
-    #   geode-implicit
-    #   geode-simplex
 geode-common==33.9.0
     # via
     #   -r requirements.in
@@ -60,19 +56,12 @@ jinja2==3.1.6
     # via flask
 markupsafe==3.0.2
     # via
-    #   flask
     #   jinja2
     #   werkzeug
 opengeode-core==15.24.2
     # via
     #   -r requirements.in
-    #   geode-background
     #   geode-common
-    #   geode-conversion
-    #   geode-explicit
-    #   geode-implicit
-    #   geode-numerics
-    #   geode-simplex
     #   geode-viewables
     #   opengeode-geosciences
     #   opengeode-geosciencesio
@@ -81,7 +70,6 @@ opengeode-core==15.24.2
 opengeode-geosciences==9.2.2
     # via
     #   -r requirements.in
-    #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
 opengeode-geosciencesio==5.7.2
@@ -97,10 +85,9 @@ opengeode-inspector==6.7.1
 opengeode-io==7.3.2
     # via
     #   -r requirements.in
-    #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
-werkzeug==3.1.3
+werkzeug==3.0.3
     # via
     #   -r requirements.in
     #   flask
diff --git a/src/opengeodeweb_back/utils_functions.py b/src/opengeodeweb_back/utils_functions.py
@@ -154,11 +154,8 @@ def create_unique_data_folder() -> tuple[str, str]:
 
 
 def save_all_viewables_and_return_info(
-        geode_object, 
-        data, generated_id, 
-        data_path, 
-        additional_files=None
-    ):
+    geode_object, data, generated_id, data_path, additional_files=None
+):
     saved_native_file_path = geode_functions.save(
         geode_object,
         data,
@@ -185,30 +182,31 @@ def save_all_viewables_and_return_info(
         "input_files": additional_files or [],
     }
 
-def generate_native_viewable_and_light_viewable_from_object(
-        geode_object, 
-        data
-    ):
+
+def generate_native_viewable_and_light_viewable_from_object(geode_object, data):
     generated_id, data_path = create_unique_data_folder()
-    return save_all_viewables_and_return_info(geode_object, data, generated_id, data_path)
+    return save_all_viewables_and_return_info(
+        geode_object, data, generated_id, data_path
+    )
 
 
-def generate_native_viewable_and_light_viewable_from_file(
-        geode_object, 
-        input_filename
-    ):
+def generate_native_viewable_and_light_viewable_from_file(geode_object, input_filename):
     generated_id, data_path = create_unique_data_folder()
 
     full_input_filename = geode_functions.upload_file_path(input_filename)
-    copied_full_path = os.path.join(data_path, werkzeug.utils.secure_filename(input_filename))
+    copied_full_path = os.path.join(
+        data_path, werkzeug.utils.secure_filename(input_filename)
+    )
     shutil.copy2(full_input_filename, copied_full_path)
 
     additional_files_copied = []
     additional = geode_functions.additional_files(geode_object, full_input_filename)
     for additional_file in additional.mandatory_files + additional.optional_files:
         if additional_file.is_missing:
             continue
-        source_path = os.path.join(os.path.dirname(full_input_filename), additional_file.filename)
+        source_path = os.path.join(
+            os.path.dirname(full_input_filename), additional_file.filename
+        )
         if not os.path.exists(source_path):
             continue
         dest_path = os.path.join(data_path, additional_file.filename)
diff --git a/tests/test_utils_functions.py b/tests/test_utils_functions.py
@@ -85,7 +85,6 @@ def test_create_unique_data_folder(client):
         assert not os.path.exists(data_path)
 
 
-
 def test_save_all_viewables_and_return_info(client):
     app = client.application
     with app.app_context():
