From ab66d3f3498996cc2eea3b9469010ed262666df7 Mon Sep 17 00:00:00 2001
From: Matt Craig <mattwcraig@gmail.com>
Date: Mon, 12 Jul 2021 16:53:50 -0500
Subject: [PATCH] Minimal change implementation of concrete ginga viewer

---
 astrowidgets/__init__.py                                        | 2 +-
 astrowidgets/{core.py => ginga.py}                              | 0
 astrowidgets/tests/{test_api.py => test_api_ginga.py}           | 2 +-
 .../tests/{test_image_widget.py => test_ginga_widget.py}        | 2 +-
 example_notebooks/ginga_wcsaxes.ipynb                           | 2 +-
 example_notebooks/ginga_widget.ipynb                            | 2 +-
 example_notebooks/gui_interactions.ipynb                        | 2 +-
 example_notebooks/named_markers.ipynb                           | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename astrowidgets/{core.py => ginga.py} (100%)
 rename astrowidgets/tests/{test_api.py => test_api_ginga.py} (99%)
 rename astrowidgets/tests/{test_image_widget.py => test_ginga_widget.py} (99%)

diff --git a/astrowidgets/__init__.py b/astrowidgets/__init__.py
index 30fa134..71c90ef 100644
--- 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 b/astrowidgets/ginga.py
similarity index 100%
rename from astrowidgets/core.py
rename to astrowidgets/ginga.py
diff --git a/astrowidgets/tests/test_api.py b/astrowidgets/tests/test_api_ginga.py
similarity index 99%
rename from astrowidgets/tests/test_api.py
rename to astrowidgets/tests/test_api_ginga.py
index c6b958d..7cf1fd5 100644
--- a/astrowidgets/tests/test_api.py
+++ b/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 b/astrowidgets/tests/test_ginga_widget.py
similarity index 99%
rename from astrowidgets/tests/test_image_widget.py
rename to astrowidgets/tests/test_ginga_widget.py
index 4f4f142..463d793 100644
--- a/astrowidgets/tests/test_image_widget.py
+++ b/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
index 0a37a65..d16c989 100644
--- 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
index de06d26..142aae7 100644
--- 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
index 3daacb7..9f14b11 100644
--- 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
index 0e724d2..51f02e4 100644
--- 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"