Skip to content

Commit c265e30

Browse files
fix: limite vtk version to 9.5 (#227)
* limite vtk version to 9.5 * Add setuptools to project dependencies * Add setuptools to requirements.txt * Last call added setuptools installation to settle selenium-base pytest conflict * Update python-package.yml --------- Co-authored-by: Jacques Franc <49998870+jafranc@users.noreply.github.com>
1 parent 0535dff commit c265e30

6 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/python-package.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
# working-directory: ./${{ matrix.package-name }}
109109
run: |
110110
python -m pip install --upgrade pip
111-
python -m pip install pytest yapf toml
111+
112112
113113
DEPS="${{ matrix.dependencies || '' }}"
114114
@@ -121,6 +121,10 @@ jobs:
121121
122122
echo "Installing main package..."
123123
python -m pip install ./${{ matrix.package-name }}/[test]
124+
# LWS Install setuptools first to provide pkg_resources for older plugins
125+
python -m pip install setuptools
126+
python -m pip install "pytest>=8.0.0" yapf toml "pytest-html>=4.0.0"
127+
124128
- name: Lint with yapf
125129
# working-directory: ./${{ matrix.package-name }}
126130
run: |

geos-geomechanics/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ classifiers = [
2424
]
2525
dependencies=[
2626
"geos-utils",
27-
"vtk >= 9.3",
27+
"vtk >= 9.3, < 9.6",
2828
"numpy >= 2.2",
2929
"pandas >= 2.2",
3030
"typing_extensions >= 4.12",

geos-mesh/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
requires-python = ">=3.10"
2929

3030
dependencies = [
31-
"vtk >= 9.3",
31+
"vtk >= 9.3, < 9.6",
3232
"networkx >= 2.4",
3333
"tqdm >= 4.67",
3434
"numpy >= 2.2",

geos-processing/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"geos-geomechanics",
3333
"geos-utils",
3434
"geos-mesh",
35-
"vtk >= 9.3",
35+
"vtk >= 9.3, < 9.6",
3636
"numpy >= 2.2",
3737
"typing_extensions >= 4.12",
3838
]
@@ -44,6 +44,7 @@ Documentation = "https://geosx-geosx.readthedocs-hosted.com/projects/geosx-geosp
4444
Repository = "https://github.com/GEOS-DEV/geosPythonPackages.git"
4545
"Bug Tracker" = "https://github.com/GEOS-DEV/geosPythonPackages/issues"
4646

47+
4748
[project.optional-dependencies]
4849
build = [
4950
"build ~= 1.2"

geos-trame/pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ keywords = [
3030
]
3131

3232
dependencies = [
33+
"setuptools",
3334
"typing-extensions==4.12.2",
3435
"trame==3.6.5",
3536
"trame-vuetify==2.7.1",
@@ -66,6 +67,7 @@ dev = [
6667
"pre-commit"
6768
]
6869
test = [
70+
"setuptools",
6971
"pytest==8.3.3",
7072
"pytest-seleniumbase==4.31.6",
7173
"pixelmatch==0.3.0",

geos-trame/tests/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
pytest
22
pytest-seleniumbase
33
pytest-xprocess
4+
setuptools

0 commit comments

Comments
 (0)