Skip to content

Commit 36bf7cf

Browse files
authored
Merge pull request #51 from abelnation/package-py
create _package.py for storing package name info
2 parents 91110d1 + 8454fcf commit 36bf7cf

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

pythreejs/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from ._version import version_info, __version__
2+
from ._package import npm_pkg_name, py_pkg_name
23

34
from .pythreejs import (
45
Texture,
@@ -139,6 +140,6 @@ def _jupyter_nbextension_paths():
139140
return [{
140141
'section': 'notebook',
141142
'src': 'static',
142-
'dest': 'jupyter-threejs',
143-
'require': 'jupyter-threejs/extension'
143+
'dest': npm_pkg_name,
144+
'require': npm_pkg_name + '/extension'
144145
}]

pythreejs/_package.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
npm_pkg_name = 'jupyter-threejs'
2+
py_pkg_name = 'pythreejs'
3+

pythreejs/pythreejs.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from ipywidgets import Widget, DOMWidget, widget_serialization, Color
1616
from traitlets import (Unicode, Int, CInt, Instance, Enum, List, Dict, Float,
1717
CFloat, Bool)
18+
from ._package import npm_pkg_name
1819
from math import pi, sqrt
1920

2021
def vector3(trait_type=CFloat, default=None, **kwargs):
@@ -29,8 +30,8 @@ def vector2(trait_type=CFloat, default=None, **kwargs):
2930

3031

3132
class Texture(Widget):
32-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
33-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
33+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
34+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
3435
_view_name = Unicode('TextureView').tag(sync=True)
3536
_model_name = Unicode('TextureModel').tag(sync=True)
3637

@@ -92,8 +93,8 @@ class Object3d(Widget):
9293
"""
9394
If matrix is not None, it overrides the position, rotation, scale, and up variables.
9495
"""
95-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
96-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
96+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
97+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
9798
_view_name = Unicode('Object3dView').tag(sync=True)
9899
_model_name = Unicode('Object3dModel').tag(sync=True)
99100

@@ -205,8 +206,8 @@ class ScaledObject(Object3d):
205206

206207

207208
class Controls(Widget):
208-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
209-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
209+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
210+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
210211
_view_name = Unicode('ControlsView').tag(sync=True)
211212
_model_name = Unicode('ControlsModel').tag(sync=True)
212213

@@ -257,8 +258,8 @@ class Picker(Controls):
257258

258259

259260
class Geometry(Widget):
260-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
261-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
261+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
262+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
262263
_view_name = Unicode('GeometryView').tag(sync=True)
263264
_model_name = Unicode('GeometryModel').tag(sync=True)
264265

@@ -452,8 +453,8 @@ class ParametricGeometry(Geometry):
452453

453454

454455
class Material(Widget):
455-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
456-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
456+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
457+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
457458
_view_name = Unicode('MaterialView').tag(sync=True)
458459
_model_name = Unicode('MaterialModel').tag(sync=True)
459460

@@ -742,8 +743,8 @@ class Scene(Object3d):
742743

743744

744745
class Effect(Widget):
745-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
746-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
746+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
747+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
747748

748749

749750
class AnaglyphEffect(Effect):
@@ -752,8 +753,8 @@ class AnaglyphEffect(Effect):
752753

753754

754755
class Renderer(DOMWidget):
755-
_view_module = Unicode('jupyter-threejs').tag(sync=True)
756-
_model_module = Unicode('jupyter-threejs').tag(sync=True)
756+
_view_module = Unicode(npm_pkg_name).tag(sync=True)
757+
_model_module = Unicode(npm_pkg_name).tag(sync=True)
757758
_view_name = Unicode('RendererView').tag(sync=True)
758759
_model_name = Unicode('RendererModel').tag(sync=True)
759760

0 commit comments

Comments
 (0)