comments

cog.toml

@@ -76,4 +76,6 @@ plotly = { path = "plugins/plotly", public_api=false }
 plotly-express = { path = "plugins/plotly-express", public_api=false }
 table-example = { path = "plugins/table-example", public_api=false }
 ui = { path = "plugins/ui", public_api=false }
+packaging = { path = "plugins/packaging", public_api=false }
+utilities = { path = "plugins/utilities", public_api=false }
 

docker/config/deephaven.prop

@@ -3,8 +3,6 @@ includefiles=dh-defaults.prop
 deephaven.console.type=python
 
 # Add all plugins that you want installed here
-deephaven.jsPlugins.@deephaven/js-plugin-matplotlib=/opt/deephaven/config/plugins/plugins/matplotlib/src/js
-deephaven.jsPlugins.@deephaven/js-plugin-ui=/opt/deephaven/config/plugins/plugins/ui/src/js
 
 # Anonymous authentication so we don't need to put in a password
 AuthHandlers=io.deephaven.auth.AnonymousAuthenticationHandler

plugins/matplotlib/setup.cfg

@@ -39,9 +39,6 @@ seaborn =
 [options.packages.find]
 where=src
 
-[options.package_data]
-* = *.mplstyle
-
 [options.entry_points]
 deephaven.plugin =
     registration_cls = deephaven.plugin.matplotlib._register:MatplotlibRegistration

plugins/matplotlib/setup.py

@@ -8,4 +8,9 @@
 
 package_js(js_dir, dest_dir)
 
-setup(package_data={"deephaven.plugin.matplotlib._js": ["**"]})
+setup(
+    package_data={
+        "deephaven.plugin.matplotlib._js": ["**"],
+        "deephaven.plugin.matplotlib": ["deephaven.mplstyle"],
+    }
+)

plugins/ui/setup.cfg

@@ -3,7 +3,7 @@ name = deephaven-plugin-ui
 description = deephaven.ui plugin
 long_description = file: README.md
 long_description_content_type = text/markdown
-version = attr:deephaven.ui.__version__
+version = 0.8.0.dev0
 url = https://github.com/deephaven/deephaven-plugins
 project_urls =
     Source Code = https://github.com/deephaven/deephaven-plugins

plugins/ui/src/deephaven/ui/__init__.py

@@ -8,5 +8,3 @@
 from .elements import *
 from .hooks import *
 from .object_types import *
-
-__version__ = "0.8.0.dev0"

tools/update_version.sh

@@ -137,7 +137,7 @@ case "$package" in
             ;;
         ui)
             update_file ui/src/js/package.json '"version": "' '",'
-            update_file ui/src/deephaven/ui/__init__.py '__version__ = "' '"' "$extra"
+            update_file ui/src/setup.cfg 'version = ' '' "$extra"
             ;;
         utilities)
             update_file utilities/setup.cfg 'version = ' '' "$extra"