From b8d1c62a19c549cc17c86b302fcc4c0ed32f6020 Mon Sep 17 00:00:00 2001 From: Romain Baville Date: Thu, 12 Feb 2026 14:48:42 +0100 Subject: [PATCH 01/11] limite vtk version to 9.5 --- geos-geomechanics/pyproject.toml | 2 +- geos-mesh/pyproject.toml | 2 +- geos-processing/pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geos-geomechanics/pyproject.toml b/geos-geomechanics/pyproject.toml index be5ca9638..629444027 100644 --- a/geos-geomechanics/pyproject.toml +++ b/geos-geomechanics/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ ] dependencies=[ "geos-utils", - "vtk >= 9.3", + "vtk >= 9.3, < 9.6", "numpy >= 2.2", "pandas >= 2.2", "typing_extensions >= 4.12", diff --git a/geos-mesh/pyproject.toml b/geos-mesh/pyproject.toml index 06f278e63..e0138b0c8 100644 --- a/geos-mesh/pyproject.toml +++ b/geos-mesh/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ requires-python = ">=3.10" dependencies = [ - "vtk >= 9.3", + "vtk >= 9.3, < 9.6", "networkx >= 2.4", "tqdm >= 4.67", "numpy >= 2.2", diff --git a/geos-processing/pyproject.toml b/geos-processing/pyproject.toml index 13391180b..95dd7b1c6 100644 --- a/geos-processing/pyproject.toml +++ b/geos-processing/pyproject.toml @@ -32,7 +32,7 @@ dependencies = [ "geos-geomechanics", "geos-utils", "geos-mesh", - "vtk >= 9.3", + "vtk >= 9.3, < 9.6", "numpy >= 2.2", "typing_extensions >= 4.12", ] From b16336522d97437793f44b2641b3e984841675b0 Mon Sep 17 00:00:00 2001 From: Romain Baville Date: Fri, 13 Feb 2026 09:54:56 +0100 Subject: [PATCH 02/11] commit to run the ci --- geos-processing/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/geos-processing/pyproject.toml b/geos-processing/pyproject.toml index 95dd7b1c6..2e18ef4c4 100644 --- a/geos-processing/pyproject.toml +++ b/geos-processing/pyproject.toml @@ -44,6 +44,7 @@ Documentation = "https://geosx-geosx.readthedocs-hosted.com/projects/geosx-geosp Repository = "https://github.com/GEOS-DEV/geosPythonPackages.git" "Bug Tracker" = "https://github.com/GEOS-DEV/geosPythonPackages/issues" + [project.optional-dependencies] build = [ "build ~= 1.2" From e3b1dbd81e2bc6a1ca1f58e35cec14c51fc6c59d Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 11:08:14 +0100 Subject: [PATCH 03/11] Add setuptools to project dependencies --- geos-trame/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/geos-trame/pyproject.toml b/geos-trame/pyproject.toml index 4e93319bc..eb651366c 100644 --- a/geos-trame/pyproject.toml +++ b/geos-trame/pyproject.toml @@ -30,6 +30,7 @@ keywords = [ ] dependencies = [ + "setuptools", "typing-extensions==4.12.2", "trame==3.6.5", "trame-vuetify==2.7.1", From a0be9ee31db12b32d1a6d334d5c1ac1e033a31f7 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 11:31:54 +0100 Subject: [PATCH 04/11] Add setuptools to requirements.txt --- geos-trame/tests/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/geos-trame/tests/requirements.txt b/geos-trame/tests/requirements.txt index bf9d17bcc..afd7aff26 100644 --- a/geos-trame/tests/requirements.txt +++ b/geos-trame/tests/requirements.txt @@ -1,3 +1,4 @@ pytest pytest-seleniumbase pytest-xprocess +setuptools From 5b239cf77ccf920344b7c714eebefdab367ec877 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 14:03:08 +0100 Subject: [PATCH 05/11] Modify pytest command to disable HTML output --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 48f10cce4..52ae529d4 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -130,7 +130,7 @@ jobs: run: # python -m pytest ./${{ matrix.package-name }} --doctest-modules --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html | # wrap pytest to avoid error when no tests in the package - sh -c 'python -m pytest ./${{ matrix.package-name }}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret' + sh -c 'python -m pytest -p no:html ./${{ matrix.package-name }}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret' # check if GEOS has label for testing GEOS integration check_integration_label: From 1b4cf5c1f804625e5af3c5bf9e197c057f45f8f2 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 14:15:47 +0100 Subject: [PATCH 06/11] Update Python package workflow to include setuptools Added installation of setuptools and pytest-html to the workflow. --- .github/workflows/python-package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 52ae529d4..623599a68 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -109,6 +109,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install pytest yapf toml + python -m pip install --upgrade pip setuptools pytest-html DEPS="${{ matrix.dependencies || '' }}" @@ -130,7 +131,7 @@ jobs: run: # python -m pytest ./${{ matrix.package-name }} --doctest-modules --junitxml=junit/test-results.xml --cov-report=xml --cov-report=html | # wrap pytest to avoid error when no tests in the package - sh -c 'python -m pytest -p no:html ./${{ matrix.package-name }}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret' + sh -c 'python -m pytest ./${{ matrix.package-name }}; ret=$?; [ $ret = 5 ] && exit 0 || exit $ret' # check if GEOS has label for testing GEOS integration check_integration_label: From 2fa626d99cb801dc3fb2b3373a7ed59f8bf11408 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 15:08:17 +0100 Subject: [PATCH 07/11] Update python-package.yml --- .github/workflows/python-package.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 623599a68..8b45554b2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -108,8 +108,7 @@ jobs: # working-directory: ./${{ matrix.package-name }} run: | python -m pip install --upgrade pip - python -m pip install pytest yapf toml - python -m pip install --upgrade pip setuptools pytest-html + python -m pip install pytest yapf toml "pytest-html>=4.0.0" DEPS="${{ matrix.dependencies || '' }}" From 146855ddf9c227fa971bfbdbc5dbbfb359e45552 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 15:42:00 +0100 Subject: [PATCH 08/11] Add setuptools to test dependencies --- geos-trame/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/geos-trame/pyproject.toml b/geos-trame/pyproject.toml index eb651366c..73d7a028d 100644 --- a/geos-trame/pyproject.toml +++ b/geos-trame/pyproject.toml @@ -67,6 +67,7 @@ dev = [ "pre-commit" ] test = [ + "setuptools", "pytest==8.3.3", "pytest-seleniumbase==4.31.6", "pixelmatch==0.3.0", From d229f16e7b7ab4e8fc00e8bce464c77ca08be516 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 16:02:22 +0100 Subject: [PATCH 09/11] Modify Python version and install setuptools Updated Python version matrix and added setuptools installation. --- .github/workflows/python-package.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 8b45554b2..6d53beae3 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -57,7 +57,7 @@ jobs: fail-fast: false max-parallel: 3 matrix: - python-version: ["3.10","3.11","3.12"] + python-version: ["3.12"] package-name: - geos-ats - geos-utils @@ -108,7 +108,9 @@ jobs: # working-directory: ./${{ matrix.package-name }} run: | python -m pip install --upgrade pip - python -m pip install pytest yapf toml "pytest-html>=4.0.0" + # Install setuptools first to provide pkg_resources for older plugins + python -m pip install setuptools + python -m pip install pytest yapf toml pytest-html DEPS="${{ matrix.dependencies || '' }}" From 9345b32465cf4a471a8d155f6e4c0a20f48d9ab7 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 16:28:41 +0100 Subject: [PATCH 10/11] Update python-package.yml --- .github/workflows/python-package.yml | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 6d53beae3..51f4e2229 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -59,18 +59,18 @@ jobs: matrix: python-version: ["3.12"] package-name: - - geos-ats - - geos-utils - - geos-geomechanics - - geos-mesh - - geos-processing - - geos-timehistory + # - geos-ats + # - geos-utils + # - geos-geomechanics + # - geos-mesh + # - geos-processing + # - geos-timehistory - geos-trame - - geos-xml-tools - - geos-xml-viewer - - mesh-doctor - - hdf5-wrapper - - pygeos-tools + # - geos-xml-tools + # - geos-xml-viewer + # - mesh-doctor + # - hdf5-wrapper + # - pygeos-tools include: - package-name: geos-geomechanics dependencies: "geos-utils" @@ -108,9 +108,7 @@ jobs: # working-directory: ./${{ matrix.package-name }} run: | python -m pip install --upgrade pip - # Install setuptools first to provide pkg_resources for older plugins - python -m pip install setuptools - python -m pip install pytest yapf toml pytest-html + DEPS="${{ matrix.dependencies || '' }}" @@ -123,6 +121,10 @@ jobs: echo "Installing main package..." python -m pip install ./${{ matrix.package-name }}/[test] + # LWS Install setuptools first to provide pkg_resources for older plugins + python -m pip install setuptools + python -m pip install "pytest>=8.0.0" yapf toml "pytest-html>=4.0.0" + - name: Lint with yapf # working-directory: ./${{ matrix.package-name }} run: | From 6038583957f59322e8b1d9068751e7f569ea1dc2 Mon Sep 17 00:00:00 2001 From: Jacques Franc <49998870+jafranc@users.noreply.github.com> Date: Fri, 13 Feb 2026 16:33:41 +0100 Subject: [PATCH 11/11] restore version --- .github/workflows/python-package.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 51f4e2229..4db9621cb 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -57,20 +57,20 @@ jobs: fail-fast: false max-parallel: 3 matrix: - python-version: ["3.12"] + python-version: ["3.10","3.11","3.12"] package-name: - # - geos-ats - # - geos-utils - # - geos-geomechanics - # - geos-mesh - # - geos-processing - # - geos-timehistory + - geos-ats + - geos-utils + - geos-geomechanics + - geos-mesh + - geos-processing + - geos-timehistory - geos-trame - # - geos-xml-tools - # - geos-xml-viewer - # - mesh-doctor - # - hdf5-wrapper - # - pygeos-tools + - geos-xml-tools + - geos-xml-viewer + - mesh-doctor + - hdf5-wrapper + - pygeos-tools include: - package-name: geos-geomechanics dependencies: "geos-utils"