Minimal change implementation of concrete ginga viewer

astropy · Jul 12, 2021 · ab66d3f · ab66d3f
1 parent 242a29e
commit ab66d3f
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/astrowidgets/__init__.py b/astrowidgets/__init__.py
@@ -6,4 +6,4 @@
 from ._astropy_init import *  # noqa
 # ----------------------------------------------------------------------------
 
-from .core import *  # noqa
+# from .core import *  # noqa
diff --git a/astrowidgets/core.py → astrowidgets/ginga.py b/astrowidgets/core.py → astrowidgets/ginga.py
diff --git a/astrowidgets/tests/test_api.py → astrowidgets/tests/test_api_ginga.py b/astrowidgets/tests/test_api.py → astrowidgets/tests/test_api_ginga.py
@@ -8,7 +8,7 @@
 
 from ginga.ColorDist import ColorDistBase
 
-from astrowidgets.core import ImageWidget, ALLOWED_CURSOR_LOCATIONS
+from astrowidgets.ginga import ImageWidget, ALLOWED_CURSOR_LOCATIONS
 from astrowidgets.interface_definition import ImageViewerInterface
 
 

diff --git a/astrowidgets/tests/test_image_widget.py → astrowidgets/tests/test_ginga_widget.py b/astrowidgets/tests/test_image_widget.py → astrowidgets/tests/test_ginga_widget.py
@@ -7,7 +7,7 @@
 from astropy.nddata import CCDData
 from astropy.coordinates import SkyCoord
 
-from ..core import ImageWidget, RESERVED_MARKER_SET_NAMES
+from ..ginga import ImageWidget, RESERVED_MARKER_SET_NAMES
 
 
 def _make_fake_ccd(with_wcs=True):

diff --git a/example_notebooks/ginga_wcsaxes.ipynb b/example_notebooks/ginga_wcsaxes.ipynb
@@ -23,7 +23,7 @@
    "outputs": [],
    "source": [
     "from astropy.nddata import CCDData\n",
-    "from astrowidgets import ImageWidget as _ImageWidget\n",
+    "from astrowidgets import ImageWidget.ginga as _ImageWidget\n",
     "from ginga.canvas.types.astro import WCSAxes\n",
     "from ginga.misc.log import get_logger"
    ]

diff --git a/example_notebooks/ginga_widget.ipynb b/example_notebooks/ginga_widget.ipynb
@@ -20,7 +20,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from astrowidgets import ImageWidget"
+    "from astrowidgets.ginga import ImageWidget"
    ]
   },
   {

diff --git a/example_notebooks/gui_interactions.ipynb b/example_notebooks/gui_interactions.ipynb
@@ -32,7 +32,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from astrowidgets import ImageWidget"
+    "from astrowidgets.ginga import ImageWidget"
    ]
   },
   {

diff --git a/example_notebooks/named_markers.ipynb b/example_notebooks/named_markers.ipynb
@@ -20,7 +20,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from astrowidgets import ImageWidget\n",
+    "from astrowidgets import.ginga ImageWidget\n",
     "from astropy.table import Table \n",
     "\n",
     "import numpy as np"