Skip to content

Commit bc1fb1c

Browse files
pull from next
2 parents 0b89bde + ce76d8c commit bc1fb1c

File tree

13 files changed

+85
-47
lines changed

13 files changed

+85
-47
lines changed

mypy.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[mypy]
22
strict = True
3-
files = src/
3+
files = src/
4+
disallow_untyped_decorators = False

pyproject.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ classifiers = [
1919
"Operating System :: OS Independent",
2020
]
2121

22-
[project.optional-dependencies]
23-
gpu = ["vtk == 9.3.1"]
24-
cpu = ["vtk-osmesa == 9.3.1"]
25-
2622
[project.urls]
2723
"Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer"
2824
"Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/issues"

requirements.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
wslink==1.12.4
2-
websocket_client==1.8.0
2+
websocket_client==1.8.0
3+
vtk==9.5.2

requirements.txt

Lines changed: 70 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,66 +2,106 @@
22
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
5-
# pip-compile --cert=None --client-cert=None --index-url=None --output-file=requirements.txt --pip-args=None requirements-internal.in requirements.in
5+
# pip-compile --output-file=./requirements.txt --pre ./requirements-internal.in ./requirements.in
66
#
7-
aiohappyeyeballs==2.6.1
7+
aiohappyeyeballs==2.*,>=2.6.1
88
# via aiohttp
9-
aiohttp==3.12.15
9+
aiohttp==3.*,>=3.12.15
1010
# via wslink
11-
aiosignal==1.4.0
11+
aiosignal==1.*,>=1.4.0
1212
# via aiohttp
13-
attrs==25.3.0
13+
attrs==25.*,>=25.3.0
1414
# via aiohttp
15-
blinker==1.9.0
16-
# via flask
17-
click==8.3.0
18-
# via flask
19-
fastjsonschema==2.21.1
15+
blinker==1.*,>=1.9.0
16+
# via
17+
# flask
18+
# opengeodeweb-microservice
19+
click==8.*,>=8.3.0
20+
# via
21+
# flask
22+
# opengeodeweb-microservice
23+
contourpy==1.*,>=1.3.3
24+
# via matplotlib
25+
cycler==0.*,>=0.12.1
26+
# via matplotlib
27+
fastjsonschema==2.*,>=2.21.1
2028
# via opengeodeweb-microservice
21-
flask==3.1.2
22-
# via flask-sqlalchemy
23-
flask-sqlalchemy==3.1.1
29+
flask==3.*,>=3.1.2
30+
# via
31+
# flask-sqlalchemy
32+
# opengeodeweb-microservice
33+
flask-sqlalchemy==3.*,>=3.1.1
2434
# via opengeodeweb-microservice
25-
frozenlist==1.7.0
35+
fonttools==4.*,>=4.60.1
36+
# via matplotlib
37+
frozenlist==1.*,>=1.7.0
2638
# via
2739
# aiohttp
2840
# aiosignal
29-
greenlet==3.2.4
30-
# via sqlalchemy
41+
greenlet==3.*,>=3.2.4
42+
# via
43+
# opengeodeweb-microservice
44+
# sqlalchemy
3145
idna==3.10
3246
# via yarl
33-
itsdangerous==2.2.0
34-
# via flask
35-
jinja2==3.1.6
36-
# via flask
37-
markupsafe==3.0.3
47+
itsdangerous==2.*,>=2.2.0
48+
# via
49+
# flask
50+
# opengeodeweb-microservice
51+
jinja2==3.*,>=3.1.6
52+
# via
53+
# flask
54+
# opengeodeweb-microservice
55+
kiwisolver==1.*,>=1.4.10rc0
56+
# via matplotlib
57+
markupsafe==3.*,>=3.0.2
3858
# via
3959
# flask
4060
# jinja2
4161
# werkzeug
42-
multidict==6.6.4
62+
matplotlib==3.*,>=3.10.6
63+
# via vtk
64+
multidict==6.*,>=6.6.4
4365
# via
4466
# aiohttp
4567
# yarl
46-
opengeodeweb-microservice==1.0.0
68+
numpy==2.*,>=2.3.3
69+
# via
70+
# contourpy
71+
# matplotlib
72+
opengeodeweb-microservice==1.*,>=1.0.1rc1
4773
# via -r requirements-internal.in
48-
propcache==0.3.2
74+
packaging==25.0
75+
# via matplotlib
76+
pillow==11.*,>=11.3.0
77+
# via matplotlib
78+
propcache==0.*,>=0.3.2
4979
# via
5080
# aiohttp
5181
# yarl
52-
sqlalchemy==2.0.43
82+
pyparsing==3.*,>=3.3.0a1
83+
# via matplotlib
84+
python-dateutil==2.9.*,>=2.9.0.post0
85+
# via matplotlib
86+
six==1.*,>=1.17.0
87+
# via python-dateutil
88+
sqlalchemy==2.*,>=2.0.43
5389
# via
5490
# flask-sqlalchemy
5591
# opengeodeweb-microservice
56-
typing-extensions==4.15.0
92+
typing-extensions==4.*,>=4.15.0
5793
# via
5894
# aiosignal
5995
# sqlalchemy
60-
websocket-client==1.8.0
96+
vtk==9.5.2
97+
# via -r requirements.in
98+
websocket-client==1.*,>=1.8.0
6199
# via -r requirements.in
62-
werkzeug==3.1.3
63-
# via flask
100+
werkzeug==3.*,>=3.1.3
101+
# via
102+
# flask
103+
# opengeodeweb-microservice
64104
wslink==1.12.4
65105
# via -r requirements.in
66-
yarl==1.20.1
106+
yarl==1.*,>=1.20.1
67107
# via aiohttp

src/opengeodeweb_viewer/object/object_methods.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ def SetPointsVisibility(self, id, visibility):
134134
self.SetVisibility(id, visibility)
135135
else:
136136
actor.GetProperty().SetVertexVisibility(visibility)
137-
actor.GetProperty().SetEdgeVisibility(visibility)
138137
self.render()
139138

140139
def SetPointsSize(self, id, size):

src/opengeodeweb_viewer/py.typed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
partial

src/opengeodeweb_viewer/rpc/utils_protocols.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
from opengeodeweb_viewer.vtk_protocol import VtkView
1010

1111

12-
class VtkUtilsView(VtkView):
13-
mesh_prefix = "opengeodeweb_viewer."
14-
mesh_schemas_dict = get_schemas_dict(
12+
class VtkUtilsView(VtkView): # type: ignore
13+
ogw_prefix = "opengeodeweb_viewer."
14+
ogw_schemas_dict = get_schemas_dict(
1515
os.path.join(os.path.dirname(__file__), "schemas")
1616
)
1717

1818
def __init__(self) -> None:
1919
super().__init__()
2020

21-
@exportRpc(mesh_prefix + mesh_schemas_dict["kill"]["rpc"])
21+
@exportRpc(ogw_prefix + ogw_schemas_dict["kill"]["rpc"])
2222
def kill(self) -> None:
2323
print("Manual viewer kill, shutting down...", flush=True)
2424
os._exit(0)
-1.59 KB
Loading
-2.37 KB
Loading
-3.44 KB
Loading

0 commit comments

Comments
 (0)