diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 48f10cce..4db9621c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -108,7 +108,7 @@ jobs: # working-directory: ./${{ matrix.package-name }} run: | python -m pip install --upgrade pip - python -m pip install pytest yapf toml + DEPS="${{ matrix.dependencies || '' }}" @@ -121,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: | diff --git a/geos-geomechanics/pyproject.toml b/geos-geomechanics/pyproject.toml index be5ca963..62944402 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 06f278e6..e0138b0c 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 13391180..2e18ef4c 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", ] @@ -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" diff --git a/geos-trame/pyproject.toml b/geos-trame/pyproject.toml index 4e93319b..73d7a028 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", @@ -66,6 +67,7 @@ dev = [ "pre-commit" ] test = [ + "setuptools", "pytest==8.3.3", "pytest-seleniumbase==4.31.6", "pixelmatch==0.3.0", diff --git a/geos-trame/tests/requirements.txt b/geos-trame/tests/requirements.txt index bf9d17bc..afd7aff2 100644 --- a/geos-trame/tests/requirements.txt +++ b/geos-trame/tests/requirements.txt @@ -1,3 +1,4 @@ pytest pytest-seleniumbase pytest-xprocess +setuptools