From e5a81dccdaaaac5e75c7390dee4ab2f92d5efc75 Mon Sep 17 00:00:00 2001 From: Andrew Schonfeld Date: Tue, 2 May 2023 12:04:07 -0400 Subject: [PATCH 1/4] Bumped D-Tale requirement to allow 2.15.2 --- ipython-extension/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipython-extension/setup.py b/ipython-extension/setup.py index 178c3c1..4f83e04 100644 --- a/ipython-extension/setup.py +++ b/ipython-extension/setup.py @@ -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>=1.16.0,<1.36,>=2.15.2"], tests_require=["pytest", "pytest-cov", "mock"], classifiers=[ "Programming Language :: Python :: 3", From 1745302fa1f320e5d0ea7d079d7f876e0853f145 Mon Sep 17 00:00:00 2001 From: Andrew Schonfeld Date: Tue, 2 May 2023 13:59:36 -0400 Subject: [PATCH 2/4] changes from Phil's code review --- ipython-extension/autoplot/extensions/autoplot_display.py | 2 +- ipython-extension/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipython-extension/autoplot/extensions/autoplot_display.py b/ipython-extension/autoplot/extensions/autoplot_display.py index 6a43f06..c0d6bf0 100644 --- a/ipython-extension/autoplot/extensions/autoplot_display.py +++ b/ipython-extension/autoplot/extensions/autoplot_display.py @@ -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 index 4f83e04..76a72f0 100644 --- a/ipython-extension/setup.py +++ b/ipython-extension/setup.py @@ -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,>=2.15.2"], + install_requires=["ipywidgets", "ipython", "numpy", "pandas", "matplotlib", "mpld3", "dtale>=2.15.2"], tests_require=["pytest", "pytest-cov", "mock"], classifiers=[ "Programming Language :: Python :: 3", From 0bf77f5bf8272766c1be5fe8c73731471f22f644 Mon Sep 17 00:00:00 2001 From: Andrew Schonfeld Date: Thu, 4 May 2023 10:10:59 -0400 Subject: [PATCH 3/4] Updates for dtale 2.15.2 functions --- ipython-extension/autoplot/dtaler/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipython-extension/autoplot/dtaler/__init__.py b/ipython-extension/autoplot/dtaler/__init__.py index 32f6941..ae06e74 100644 --- 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: From 491cf583316011f460f82b105ffb5991659ef9b5 Mon Sep 17 00:00:00 2001 From: Andrew Schonfeld Date: Thu, 4 May 2023 10:11:35 -0400 Subject: [PATCH 4/4] bumped version numbers to 0.3.0 --- autoplot-display/CHANGELOG.md | 5 +++++ autoplot-display/package.json | 2 +- autoplot-display/src/version.ts | 2 +- ipython-extension/autoplot/extensions/autoplot_display.py | 2 +- ipython-extension/setup.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/autoplot-display/CHANGELOG.md b/autoplot-display/CHANGELOG.md index e3f181b..82a2a76 100644 --- 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 index 446de7c..667bcad 100644 --- 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 index 1df3818..2639a55 100644 --- 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/extensions/autoplot_display.py b/ipython-extension/autoplot/extensions/autoplot_display.py index c0d6bf0..2baf540 100644 --- 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" diff --git a/ipython-extension/setup.py b/ipython-extension/setup.py index 76a72f0..3c3fbb5 100644 --- 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="ManAlphaTech@man.com", license="BSD 3-Clause",