From 4b7bcd63e5d3a6669ee3fd754ba0a01d587d0034 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 1 Dec 2023 13:36:21 -0500 Subject: [PATCH 01/14] remove support for jdaviz 3.8 --- lcviz/helper.py | 6 +----- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lcviz/helper.py b/lcviz/helper.py index 295d4477..ab3bb328 100644 --- a/lcviz/helper.py +++ b/lcviz/helper.py @@ -92,11 +92,7 @@ def __init__(self, *args, **kwargs): ) # inject custom css from lcviz_style.vue (on top of jdaviz styles) - if hasattr(self.app, '_add_style'): - # will be guaranteed after jdaviz 3.9 - self.app._add_style((__file__, 'lcviz_style.vue')) - else: - self.app.set_style_template_file((__file__, 'lcviz_style.vue')) + self.app._add_style((__file__, 'lcviz_style.vue')) # set the link to read the docs self.app.docs_link = "https://lcviz.readthedocs.io" diff --git a/pyproject.toml b/pyproject.toml index 0f9907e6..a974fdce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "astropy>=5.2", # NOTE: if/when we stop pinning a minor version of jdaviz, add jdaviz # to devdeps in tox.ini - "jdaviz==3.8.*", + "jdaviz==3.9.*", "lightkurve>=2.4.1", ] dynamic = [ From 63437043fc130ac31ba6a4eb45e207ead9eb10c1 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 19 Jan 2024 12:54:46 -0500 Subject: [PATCH 02/14] Revert "jdaviz version condition in test coverage" This reverts commit 6a0086e8d6ce058097f946d44332d47ee9c36d46. --- lcviz/tests/test_plugin_ephemeris.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lcviz/tests/test_plugin_ephemeris.py b/lcviz/tests/test_plugin_ephemeris.py index dea97b68..aa0cecb6 100644 --- a/lcviz/tests/test_plugin_ephemeris.py +++ b/lcviz/tests/test_plugin_ephemeris.py @@ -1,8 +1,4 @@ import pytest -from packaging.version import Version - -import jdaviz -JDAVIZ_LT_3_9_0 = Version(jdaviz.__version__) < Version('3.9.0') def test_docs_snippets(helper, light_curve_like_kepler_quarter): @@ -49,13 +45,12 @@ def test_plugin_ephemeris(helper, light_curve_like_kepler_quarter): assert len(ephem.ephemerides) == 2 assert 'custom component' in ephem.ephemerides - if not JDAVIZ_LT_3_9_0: - with pytest.raises(ValueError): - # brackets interfere with cloned viewer label logic - ephem.rename_component('custom component', 'custom component[blah]') - with pytest.raises(ValueError): - # colons interfere with viewer ephemeris logic - ephem.rename_component('custom component', 'custom component:blah') + with pytest.raises(ValueError): + # brackets interfere with cloned viewer label logic + ephem.rename_component('custom component', 'custom component[blah]') + with pytest.raises(ValueError): + # colons interfere with viewer ephemeris logic + ephem.rename_component('custom component', 'custom component:blah') ephem.rename_component('custom component', 'renamed custom component') assert len(ephem.ephemerides) == 2 From 7d300a2081ab825a5d7d62f5f7333fdf6bb3b041 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 7 Mar 2024 12:36:57 -0500 Subject: [PATCH 03/14] migrate temporary disabling previews upstream (#3) --- lcviz/plugins/binning/binning.py | 19 +++---------------- lcviz/plugins/binning/binning.vue | 22 +++++----------------- lcviz/plugins/flatten/flatten.py | 18 ++++-------------- lcviz/plugins/flatten/flatten.vue | 23 ++++++----------------- 4 files changed, 18 insertions(+), 64 deletions(-) diff --git a/lcviz/plugins/binning/binning.py b/lcviz/plugins/binning/binning.py index f2440404..24d2348b 100644 --- a/lcviz/plugins/binning/binning.py +++ b/lcviz/plugins/binning/binning.py @@ -1,5 +1,3 @@ -import numpy as np -from time import time from astropy.time import Time from traitlets import Bool, Float, observe from glue.config import data_translator @@ -10,7 +8,7 @@ from jdaviz.core.template_mixin import (PluginTemplateMixin, DatasetSelectMixin, AddResultsMixin, skip_if_no_updates_since_last_active, - with_spinner) + with_spinner, with_temp_disable) from jdaviz.core.user_api import PluginUserApi from lcviz.components import FluxColumnSelectMixin @@ -54,9 +52,6 @@ class Binning(PluginTemplateMixin, FluxColumnSelectMixin, DatasetSelectMixin, n_bins = IntHandleEmpty(100).tag(sync=True) bin_enabled = Bool(True).tag(sync=True) - last_live_time = Float(0).tag(sync=True) - previews_temp_disable = Bool(False).tag(sync=True) - def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -164,8 +159,9 @@ def _toggle_marks(self, event={}): @observe('flux_column_selected', 'dataset_selected', 'ephemeris_selected', - 'n_bins', 'previews_temp_disable') + 'n_bins', 'previews_temp_disabled') @skip_if_no_updates_since_last_active() + @with_temp_disable(timeout=0.3) def _live_update(self, event={}): self.bin_enabled = self.n_bins != '' and self.n_bins > 0 @@ -173,11 +169,6 @@ def _live_update(self, event={}): self._clear_marks() return - if self.previews_temp_disable: - return - - start = time() - if event.get('name', '') not in ('is_active', 'show_live_preview'): # mark visibility hasn't been handled yet self._toggle_marks() @@ -214,10 +205,6 @@ def _live_update(self, event={}): mark.times = [] mark.update_xy(times, lc.flux.value) - self.last_live_time = np.round(time() - start, 2) - if self.last_live_time > 0.3: - self.previews_temp_disable = True - def _on_ephemeris_update(self, msg): if not self.show_live_preview or not self.is_active: return diff --git a/lcviz/plugins/binning/binning.vue b/lcviz/plugins/binning/binning.vue index c280da46..6bad2b59 100644 --- a/lcviz/plugins/binning/binning.vue +++ b/lcviz/plugins/binning/binning.vue @@ -57,23 +57,11 @@ - - Live-updating is temporarily disabled (last update took {{last_live_time}}s) - - - - disable previews - - - - - - - update preview - - - - + 0.3: - self.previews_temp_disable = True - def vue_apply(self, *args, **kwargs): try: self.flatten(add_data=True) diff --git a/lcviz/plugins/flatten/flatten.vue b/lcviz/plugins/flatten/flatten.vue index 191df121..be51f402 100644 --- a/lcviz/plugins/flatten/flatten.vue +++ b/lcviz/plugins/flatten/flatten.vue @@ -138,23 +138,12 @@ hint="Label for flux column." > - - Live-updating is temporarily disabled (last update took {{last_live_time}}s) - - - - disable previews - - - - - - - update preview - - - - + From 58709b8859859094cc32bce4f1a98916d5c3790c Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Mon, 11 Mar 2024 11:21:00 -0400 Subject: [PATCH 04/14] updates for upstream migration from export plot to export plugin (#5) --- docs/plugins.rst | 14 +++++++------- lcviz/helper.py | 2 +- lcviz/plugins/__init__.py | 2 +- lcviz/plugins/export/__init__.py | 1 + .../export_plot.py => export/export.py} | 19 ++++++++++--------- lcviz/plugins/export_plot/__init__.py | 1 - 6 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 lcviz/plugins/export/__init__.py rename lcviz/plugins/{export_plot/export_plot.py => export/export.py} (61%) delete mode 100644 lcviz/plugins/export_plot/__init__.py diff --git a/docs/plugins.rst b/docs/plugins.rst index 60f5f24c..aae63e16 100644 --- a/docs/plugins.rst +++ b/docs/plugins.rst @@ -318,10 +318,10 @@ This plugin supports binning a light curve in time or phase-space. * :meth:`lightkurve.LightCurve.bin` -.. _export-plot: +.. _export: -Export Plot -=========== +Export +====== This plugin allows exporting the plot in a given viewer to various image formats. @@ -329,7 +329,7 @@ This plugin allows exporting the plot in a given viewer to various image formats .. admonition:: User API Example :class: dropdown - See the :class:`~lcviz.plugins.export_plot.export_plot.ExportViewer` user API documentation for more details. + See the :class:`~lcviz.plugins.export.export.Export` user API documentation for more details. .. code-block:: python @@ -340,11 +340,11 @@ This plugin allows exporting the plot in a given viewer to various image formats lcviz.load_data(lc) lcviz.show() - export = lcviz.plugins['Export Plot'] - export.save_figure('test.png') + export = lcviz.plugins['Export'] + export.export('test.png') .. seealso:: :ref:`Jdaviz Export Plot ` - Jdaviz documentation on the Export Plot plugin. + Jdaviz documentation on the Export plugin. diff --git a/lcviz/helper.py b/lcviz/helper.py index ab3bb328..c93baa2d 100644 --- a/lcviz/helper.py +++ b/lcviz/helper.py @@ -70,7 +70,7 @@ class LCviz(ConfigHelper): 'tray': ['lcviz-metadata-viewer', 'flux-column', 'lcviz-plot-options', 'lcviz-subset-plugin', 'lcviz-markers', 'flatten', 'frequency-analysis', 'ephemeris', - 'binning', 'lcviz-export-plot'], + 'binning', 'lcviz-export'], 'viewer_area': [{'container': 'col', 'children': [{'container': 'row', 'viewers': [{'name': 'flux-vs-time', diff --git a/lcviz/plugins/__init__.py b/lcviz/plugins/__init__.py index 42ba1f17..9fbeef06 100644 --- a/lcviz/plugins/__init__.py +++ b/lcviz/plugins/__init__.py @@ -3,7 +3,7 @@ from .binning.binning import * # noqa from .ephemeris.ephemeris import * # noqa -from .export_plot.export_plot import * # noqa +from .export.export import * # noqa from .flatten.flatten import * # noqa from .flux_column.flux_column import * # noqa from .frequency_analysis.frequency_analysis import * # noqa diff --git a/lcviz/plugins/export/__init__.py b/lcviz/plugins/export/__init__.py new file mode 100644 index 00000000..aa5f6174 --- /dev/null +++ b/lcviz/plugins/export/__init__.py @@ -0,0 +1 @@ +from .export import * # noqa diff --git a/lcviz/plugins/export_plot/export_plot.py b/lcviz/plugins/export/export.py similarity index 61% rename from lcviz/plugins/export_plot/export_plot.py rename to lcviz/plugins/export/export.py index a10fba2e..e25340e5 100644 --- a/lcviz/plugins/export_plot/export_plot.py +++ b/lcviz/plugins/export/export.py @@ -1,13 +1,13 @@ -from jdaviz.configs.default.plugins import ExportViewer +from jdaviz.configs.default.plugins import Export from jdaviz.core.registries import tray_registry -__all__ = ['ExportViewer'] +__all__ = ['Export'] -@tray_registry('lcviz-export-plot', label="Export Plot") -class ExportViewer(ExportViewer): +@tray_registry('lcviz-export', label="Export") +class Export(Export): """ - See the :ref:`Export Plot Plugin Documentation ` for more details. + See the :ref:`Export Plot Plugin Documentation ` for more details. Only the following attributes and methods are available through the :ref:`public plugin API `: @@ -15,10 +15,11 @@ class ExportViewer(ExportViewer): * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.show` * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.open_in_tray` * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.close_in_tray` - * ``viewer`` (:class:`~jdaviz.core.template_mixin.ViewerSelect`): - Viewer to select for exporting the figure image. - * :meth:`save_figure` + * ``viewer`` (:class:`~jdaviz.core.template_mixin.ViewerSelect`) + * ``viewer_format`` (:class:`~jdaviz.core.template_mixin.SelectPluginComponent`) + * ``filename`` + * :meth:`export` """ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.docs_link = f"https://lcviz.readthedocs.io/en/{self.vdocs}/plugins.html#export-plot" + self.docs_link = f"https://lcviz.readthedocs.io/en/{self.vdocs}/plugins.html#export" diff --git a/lcviz/plugins/export_plot/__init__.py b/lcviz/plugins/export_plot/__init__.py deleted file mode 100644 index dbcfe9b4..00000000 --- a/lcviz/plugins/export_plot/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .export_plot import * # noqa From 5512d67a07dd8cadd17df9054d970b302fc60936 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Mon, 11 Mar 2024 11:24:11 -0400 Subject: [PATCH 05/14] Revert "delay overwriting existing registry item" This reverts commit 4de13b3a09c8dab7923e0215932f3bbfc18a8b73. --- lcviz/helper.py | 2 +- lcviz/plugins/viewer_creator/viewer_creator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lcviz/helper.py b/lcviz/helper.py index c93baa2d..ca34d032 100644 --- a/lcviz/helper.py +++ b/lcviz/helper.py @@ -66,7 +66,7 @@ class LCviz(ConfigHelper): 'tab_headers': True}, 'dense_toolbar': False, 'context': {'notebook': {'max_height': '600px'}}}, - 'toolbar': ['g-data-tools', 'g-subset-tools', 'lcviz-viewer-creator', 'lcviz-coords-info'], + 'toolbar': ['g-data-tools', 'g-subset-tools', 'g-viewer-creator', 'lcviz-coords-info'], 'tray': ['lcviz-metadata-viewer', 'flux-column', 'lcviz-plot-options', 'lcviz-subset-plugin', 'lcviz-markers', 'flatten', 'frequency-analysis', 'ephemeris', diff --git a/lcviz/plugins/viewer_creator/viewer_creator.py b/lcviz/plugins/viewer_creator/viewer_creator.py index d33a533e..aee8dcc5 100644 --- a/lcviz/plugins/viewer_creator/viewer_creator.py +++ b/lcviz/plugins/viewer_creator/viewer_creator.py @@ -7,7 +7,7 @@ __all__ = ['ViewerCreator'] -@tool_registry('lcviz-viewer-creator') +@tool_registry('g-viewer-creator', overwrite=True) # overwrite requires upstream changes, we can do without if we just lose the tooltip class ViewerCreator(ViewerCreator): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) From 0d21fc8c124ae4c5e2e0f1838a872aacebeb7377 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 28 Mar 2024 13:23:29 -0400 Subject: [PATCH 06/14] run tests with jdaviz main (revert before merge) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a974fdce..ac9b5b34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "astropy>=5.2", # NOTE: if/when we stop pinning a minor version of jdaviz, add jdaviz # to devdeps in tox.ini - "jdaviz==3.9.*", + "jdaviz@git+https://github.com/spacetelescope/jdaviz", "lightkurve>=2.4.1", ] dynamic = [ From 35ae08681455372fc5e6afae4b41ebe7aaf8aa14 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 28 Mar 2024 13:25:33 -0400 Subject: [PATCH 07/14] codestyle fixes --- lcviz/plugins/binning/binning.py | 2 +- lcviz/plugins/viewer_creator/viewer_creator.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lcviz/plugins/binning/binning.py b/lcviz/plugins/binning/binning.py index 24d2348b..75941833 100644 --- a/lcviz/plugins/binning/binning.py +++ b/lcviz/plugins/binning/binning.py @@ -1,5 +1,5 @@ from astropy.time import Time -from traitlets import Bool, Float, observe +from traitlets import Bool, observe from glue.config import data_translator from jdaviz.core.custom_traitlets import IntHandleEmpty diff --git a/lcviz/plugins/viewer_creator/viewer_creator.py b/lcviz/plugins/viewer_creator/viewer_creator.py index aee8dcc5..69b29298 100644 --- a/lcviz/plugins/viewer_creator/viewer_creator.py +++ b/lcviz/plugins/viewer_creator/viewer_creator.py @@ -7,7 +7,8 @@ __all__ = ['ViewerCreator'] -@tool_registry('g-viewer-creator', overwrite=True) # overwrite requires upstream changes, we can do without if we just lose the tooltip +# overwrite requires upstream changes, we can do without if we just lose the tooltip +@tool_registry('g-viewer-creator', overwrite=True) class ViewerCreator(ViewerCreator): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) From 73f12dd65662aba67116dc8bb49af7df08b1a8f9 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 28 Mar 2024 13:30:38 -0400 Subject: [PATCH 08/14] update lcviz-viewer-creator -> g-viewer-creator in tests --- lcviz/tests/test_plugin_ephemeris.py | 2 +- lcviz/tests/test_tray_viewer_creator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lcviz/tests/test_plugin_ephemeris.py b/lcviz/tests/test_plugin_ephemeris.py index aa0cecb6..ac01e755 100644 --- a/lcviz/tests/test_plugin_ephemeris.py +++ b/lcviz/tests/test_plugin_ephemeris.py @@ -111,7 +111,7 @@ def test_cloned_phase_viewer(helper, light_curve_like_kepler_quarter): def test_create_phase_viewer(helper, light_curve_like_kepler_quarter): helper.load_data(light_curve_like_kepler_quarter) ephem = helper.plugins['Ephemeris'] - vc = helper._tray_tools['lcviz-viewer-creator'] + vc = helper._tray_tools['g-viewer-creator'] assert len(vc.viewer_types) == 2 # time viewer, phase viewer for default _ = ephem.create_phase_viewer() diff --git a/lcviz/tests/test_tray_viewer_creator.py b/lcviz/tests/test_tray_viewer_creator.py index e2a6b835..b48fc5b2 100644 --- a/lcviz/tests/test_tray_viewer_creator.py +++ b/lcviz/tests/test_tray_viewer_creator.py @@ -1,7 +1,7 @@ def test_tray_viewer_creator(helper, light_curve_like_kepler_quarter): # additional coverage in test_plugin_ephemeris helper.load_data(light_curve_like_kepler_quarter) - vc = helper._tray_tools['lcviz-viewer-creator'] + vc = helper._tray_tools['g-viewer-creator'] assert len(helper.viewers) == 1 assert len(vc.viewer_types) == 2 # time and default phase From 368debd70bff9f6decade1a54cc13033c80a3d28 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 28 Mar 2024 13:38:10 -0400 Subject: [PATCH 09/14] fix docs and shortcut button for export_plot > export change in 3.9 --- docs/reference/api_plugins.rst | 2 +- lcviz/tools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/api_plugins.rst b/docs/reference/api_plugins.rst index a366d19a..56149ce7 100644 --- a/docs/reference/api_plugins.rst +++ b/docs/reference/api_plugins.rst @@ -9,7 +9,7 @@ Plugins API .. automodapi:: lcviz.plugins.ephemeris.ephemeris :no-inheritance-diagram: -.. automodapi:: lcviz.plugins.export_plot.export_plot +.. automodapi:: lcviz.plugins.export.export :no-inheritance-diagram: .. automodapi:: lcviz.plugins.flatten.flatten diff --git a/lcviz/tools.py b/lcviz/tools.py index badb5aa2..e2b8e155 100644 --- a/lcviz/tools.py +++ b/lcviz/tools.py @@ -9,7 +9,7 @@ # point to the lcviz-version of plot options instead of jdaviz's SidebarShortcutPlotOptions.plugin_name = 'lcviz-plot-options' -SidebarShortcutExportPlot.plugin_name = 'lcviz-export-plot' +SidebarShortcutExportPlot.plugin_name = 'lcviz-export' __all__ = ['ViewerClone'] From 374c03d7a545907f190f7ac1bd7dc9ea83ed11ce Mon Sep 17 00:00:00 2001 From: Ricky O'Steen <39831871+rosteen@users.noreply.github.com> Date: Thu, 28 Mar 2024 15:32:44 -0400 Subject: [PATCH 10/14] Dev test fix take two (#8) * Fix failing dev test by using lim_helpers * Make equivalent change in reset_limits --- lcviz/state.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lcviz/state.py b/lcviz/state.py index ddf393e2..fbab96c8 100644 --- a/lcviz/state.py +++ b/lcviz/state.py @@ -1,4 +1,3 @@ -from echo import delay_callback import numpy as np from glue.viewers.scatter.state import ScatterViewerState @@ -24,9 +23,10 @@ def _reset_att_limits(self, ax): if not np.all(np.isfinite([ax_min, ax_max])): # pragma: no cover return - with delay_callback(self, f'{ax}_min', f'{ax}_max'): - setattr(self, f'{ax}_min', ax_min) - setattr(self, f'{ax}_max', ax_max) + lim_helper = getattr(self, f'{ax}_lim_helper') + lim_helper.lower = ax_min + lim_helper.upper = ax_max + lim_helper.update_values() def _reset_x_limits(self, *event): self._reset_att_limits('x') @@ -50,11 +50,15 @@ def reset_limits(self, *event): y_min = min(y_min, np.nanmin(y_data)) y_max = max(y_max, np.nanmax(y_data)) - with delay_callback(self, 'x_min', 'x_max', 'y_min', 'y_max'): - self.x_min = x_min - self.x_max = x_max - self.y_min = y_min - self.y_max = y_max - # We need to adjust the limits in here to avoid triggering all - # the update events then changing the limits again. - self._adjust_limits_aspect() + x_lim_helper = getattr(self, 'x_lim_helper') + x_lim_helper.lower = x_min + x_lim_helper.upper = x_max + + y_lim_helper = getattr(self, 'y_lim_helper') + y_lim_helper.lower = y_min + y_lim_helper.upper = y_max + + x_lim_helper.update_values() + y_lim_helper.update_values() + + self._adjust_limits_aspect() From 01996cb9a1a711fe5ddfcbf2e458fa31da0d1ac9 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 28 Mar 2024 15:41:40 -0400 Subject: [PATCH 11/14] remove custom lcviz rule to prevent closing tab (but leave infrastructure in place for now) --- lcviz/lcviz_style.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lcviz/lcviz_style.vue b/lcviz/lcviz_style.vue index ecf6ee17..22ee9bb4 100644 --- a/lcviz/lcviz_style.vue +++ b/lcviz/lcviz_style.vue @@ -1,7 +1,3 @@ From 89d7da1f5b469c02690d7fe6495108403b33e920 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 29 Mar 2024 14:22:30 -0400 Subject: [PATCH 12/14] don't open data menu when populating phase viewer (#4) if https://github.com/spacetelescope/jdaviz/pull/2742 is merged, we should include this to avoid opening the data menu when creating populated phase viewers --- lcviz/plugins/ephemeris/ephemeris.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lcviz/plugins/ephemeris/ephemeris.py b/lcviz/plugins/ephemeris/ephemeris.py index 564277c5..2f263ac0 100644 --- a/lcviz/plugins/ephemeris/ephemeris.py +++ b/lcviz/plugins/ephemeris/ephemeris.py @@ -294,7 +294,8 @@ def create_phase_viewer(self, ephem_component=None): phase_viewer_id = self._generate_phase_viewer_id(ephem_component) # TODO: stack horizontally by default? self.app._on_new_viewer(NewViewerMessage(PhaseScatterView, data=None, sender=self.app), - vid=phase_viewer_id, name=phase_viewer_id) + vid=phase_viewer_id, name=phase_viewer_id, + open_data_menu_if_empty=False) # access new viewer, set bookkeeping for ephemeris component pv = self.app.get_viewer(phase_viewer_id) From 87073060996a7c07527b2298a5749f649f9a2fbb Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Apr 2024 14:26:11 -0400 Subject: [PATCH 13/14] pin jdaviz 3.9.* --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ac9b5b34..a974fdce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "astropy>=5.2", # NOTE: if/when we stop pinning a minor version of jdaviz, add jdaviz # to devdeps in tox.ini - "jdaviz@git+https://github.com/spacetelescope/jdaviz", + "jdaviz==3.9.*", "lightkurve>=2.4.1", ] dynamic = [ From b6586be2894ae98cbdbaacbaaaed7ebf448147ba Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Apr 2024 14:27:16 -0400 Subject: [PATCH 14/14] changelog entry --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index dc07f98f..3983faa7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,7 @@ ------------------ * Ability to create additional viewers. [#94] +* Updates to use jdaviz 3.9. [#68] 0.2.0 (02-26-2024) ------------------