Skip to content

Commit 76108c5

Browse files
committed
move data
1 parent 9f83701 commit 76108c5

25 files changed

+16
-16
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def read(*names, **kwargs):
5555
project_urls={},
5656
packages=["compas_viewer"],
5757
package_dir={"": "src"},
58-
package_data={"": "data/*"},
58+
package_data={},
5959
data_files=[],
6060
include_package_data=True,
6161
zip_safe=False,

src/compas_viewer/configurations/controller_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from PySide6.QtCore import Qt
55

6-
from compas_viewer import DATA
6+
from compas_viewer import HERE
77
from compas_viewer.utilities import key_mapper
88

99
from .config import Config
@@ -124,7 +124,7 @@ def __init__(
124124

125125
@classmethod
126126
def from_default(cls) -> "ControllerConfig":
127-
controller_config = ControllerConfig.from_json(Path(DATA, "default_config", "controller.json"))
127+
controller_config = ControllerConfig.from_json(Path(HERE, "configurations", "default_config", "controller.json"))
128128
if not isinstance(controller_config, ControllerConfig):
129129
raise TypeError(f"The {controller_config} is not a valid controller configuration file.")
130130
return controller_config
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/compas_viewer/configurations/layout_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import Literal
33
from typing import TypedDict
44

5-
from compas_viewer import DATA
5+
from compas_viewer import HERE
66

77
from .config import Config
88

@@ -252,7 +252,7 @@ def from_default(cls) -> "LayoutConfig":
252252
"""
253253
Load the default configuration.
254254
"""
255-
layout_config = LayoutConfig.from_json(Path(DATA, "default_config", "layout.json"))
255+
layout_config = LayoutConfig.from_json(Path(HERE, "configurations", "default_config", "layout.json"))
256256
if not isinstance(layout_config, LayoutConfig):
257257
raise TypeError(f"The {layout_config} is not a valid layout configuration file.")
258258
return layout_config

src/compas_viewer/configurations/renderer_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from compas.colors import Color
66

7-
from compas_viewer import DATA
7+
from compas_viewer import HERE
88

99
from .config import Config
1010

@@ -171,7 +171,7 @@ def from_default(cls) -> "RendererConfig":
171171
"""
172172
Load the default configuration.
173173
"""
174-
render_config = RendererConfig.from_json(Path(DATA, "default_config", "renderer.json"))
174+
render_config = RendererConfig.from_json(Path(HERE, "configurations", "default_config", "renderer.json"))
175175
if not isinstance(render_config, RendererConfig):
176176
raise TypeError(f"The {render_config} is not a valid renderer configuration file.")
177177
return render_config

src/compas_viewer/configurations/scene_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from compas.colors import Color
55

6-
from compas_viewer import DATA
6+
from compas_viewer import HERE
77

88
from .config import Config
99

@@ -91,7 +91,7 @@ def from_default(cls) -> "SceneConfig":
9191
"""
9292
Load the default configuration.
9393
"""
94-
scene_config = SceneConfig.from_json(Path(DATA, "default_config", "scene.json"))
94+
scene_config = SceneConfig.from_json(Path(HERE, "configurations", "default_config", "scene.json"))
9595
if not isinstance(scene_config, SceneConfig):
9696
raise TypeError(f"The {scene_config} is not a valid scene configuration file.")
9797
return scene_config

0 commit comments

Comments
 (0)