Merge pull request #12 from aschonfeld/bump_dtale

Bumped D-Tale requirement to allow 2.15.2
man-group · May 4, 2023 · c5219b4 · c5219b4
2 parents 1676fc8 + 491cf58
commit c5219b4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/autoplot-display/CHANGELOG.md b/autoplot-display/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.3.0
+=====
+
+- Compatibility changes for D-Tale 2.15.2
+
 0.2.0
 =====
 

diff --git a/autoplot-display/package.json b/autoplot-display/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mangroup/jupyterlab-autoplot-display",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "The JupyterLab component for the Autoplot JupyterLab extension.",
 	"license": "BSD-3-Clause",
 	"keywords": [

diff --git a/autoplot-display/src/version.ts b/autoplot-display/src/version.ts
@@ -5,7 +5,7 @@
  */
 export namespace VERSION {
 	export const title = 'Autoplot Display';
-	export const version = '0.2.0';
+	export const version = '0.3.0';
 	export const module = '@jupyter-widgets/autoplot-display';
 
 	export const modelName = 'AutoplotDisplayModel';

diff --git a/ipython-extension/autoplot/dtaler/__init__.py b/ipython-extension/autoplot/dtaler/__init__.py
@@ -190,7 +190,7 @@ def _update_tracked_var(self, name, var):
 def _removed_in_dtale(tracked: Iterable) -> Set[str]:
     removed: Set[str] = set()
     for name, vardata in tracked:
-        if dtale.global_state.find_data_id(vardata.dd._data_id) is None:
+        if dtale.global_state.get_instance(vardata.dd._data_id) is None:
             removed.add(name)
     return removed
 
@@ -207,7 +207,7 @@ def _filter_updated(pandas_vars: Iterable, tracked: Dict[str, VarData]) -> Dict[
 
 
 def _next_dtale_data():
-    data_id = next(iter(dtale.global_state.get_data().keys()), None)
+    data_id = next(iter(dtale.global_state.keys()), None)
     if data_id is not None:
         return dtale.get_instance(data_id)
     else:

diff --git a/ipython-extension/autoplot/extensions/autoplot_display.py b/ipython-extension/autoplot/extensions/autoplot_display.py
@@ -13,7 +13,7 @@
 
 # these values must mach those in autoplot-display/version.ts
 EXTENSION_TITLE = "Autoplot Display"
-EXTENSION_VERSION = "0.2.0"
+EXTENSION_VERSION = "0.3.0"
 MODULE_NAME = "@jupyter-widgets/autoplot-display"
 
 MODEL_NAME = "AutoplotDisplayModel"
@@ -39,4 +39,4 @@ class AutoplotDisplay(Output):
     # custom attributes
     title = Unicode(EXTENSION_TITLE).tag(sync=True)
     uuid = Unicode(uuid.uuid4().hex).tag(sync=True)
-    data_id = Unicode("").tag(sync=True)
+    data_id = Unicode("1").tag(sync=True)
diff --git a/ipython-extension/setup.py b/ipython-extension/setup.py
@@ -9,7 +9,7 @@ def get_long_description():
 
 setup(
     name="jupyterlab-autoplot",
-    version="0.2.0",
+    version="0.3.0",
     author="Man Alpha Technology",
     author_email="[email protected]",
     license="BSD 3-Clause",
@@ -19,7 +19,7 @@ def get_long_description():
     keywords=["jupyter", "jupyterlab", "matplotlib", "mpld3", "time series"],
     packages=find_packages(include=["autoplot", "autoplot.*"], exclude=["tests", "tests.*"]),
     include_package_data=True,
-    install_requires=["ipywidgets", "ipython", "numpy", "pandas", "matplotlib", "mpld3", "dtale>=1.16.0,<1.36"],
+    install_requires=["ipywidgets", "ipython", "numpy", "pandas", "matplotlib", "mpld3", "dtale>=2.15.2"],
     tests_require=["pytest", "pytest-cov", "mock"],
     classifiers=[
         "Programming Language :: Python :: 3",
-Original file line number
+Diff line change
@@ -1,3 +1,8 @@
+.3.0
+    =====
+    - Compatibility changes for D-Tale 2.15.2
 .2.0
     =====
@@ Expand Down @@