From a610506a13f3a4a61312b8811b662407f5a13529 Mon Sep 17 00:00:00 2001
From: Derek Homeier <dhomeie@gwdg.de>
Date: Wed, 17 Aug 2022 20:10:17 +0200
Subject: [PATCH] Define separate entrypoints for plugins

---
 glue_astronomy/__init__.py             |  4 ----
 glue_astronomy/conftest.py             |  8 ++++++--
 glue_astronomy/translators/__init__.py | 19 ++++++++++++++-----
 setup.cfg                              | 17 +++++++++++++----
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/glue_astronomy/__init__.py b/glue_astronomy/__init__.py
index e64201e..e0fcb47 100644
--- a/glue_astronomy/__init__.py
+++ b/glue_astronomy/__init__.py
@@ -1,5 +1 @@
 from .version import version as __version__  # noqa
-
-
-def setup():
-    from glue_astronomy import translators  # noqa
diff --git a/glue_astronomy/conftest.py b/glue_astronomy/conftest.py
index 6e45695..7dd870b 100644
--- a/glue_astronomy/conftest.py
+++ b/glue_astronomy/conftest.py
@@ -1,3 +1,7 @@
 def pytest_configure(config):
-    from glue_astronomy import setup
-    setup()
+    from glue_astronomy.translators import setup_ccddata, setup_regions, setup_spectral_cube, setup_spectrum1d
+
+    setup_ccddata()
+    setup_regions()
+    setup_spectral_cube()
+    setup_spectrum1d()
diff --git a/glue_astronomy/translators/__init__.py b/glue_astronomy/translators/__init__.py
index 497254e..b6468ac 100644
--- a/glue_astronomy/translators/__init__.py
+++ b/glue_astronomy/translators/__init__.py
@@ -1,5 +1,14 @@
-from . import ccddata  # noqa
-from . import regions  # noqa
-from . import spectral_cube  # noqa
-from . import spectrum1d  # noqa
-from . import trace # noqa
+def setup_ccddata():
+    from . import ccddata  # noqa
+
+def setup_regions():
+    from . import regions  # noqa
+
+def setup_spectral_cube():
+    from . import spectral_cube  # noqa
+
+def setup_spectrum1d():
+    from . import spectrum1d  # noqa
+
+def setup_trace():
+    from . import trace  # noqa
diff --git a/setup.cfg b/setup.cfg
index c54ffee..0108aed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,12 +19,13 @@ setup_requires =
 install_requires =
     astropy>=4.0
     glue-core>=1.0
+
+[options.extras_require]
+all =
     regions>=0.4
     specutils>=0.7
     specreduce>=1.0.0
     spectral-cube>=0.6.0
-
-[options.extras_require]
 docs =
     sphinx
     sphinx-automodapi
@@ -36,13 +37,21 @@ test =
     pytest-astropy
     pytest-cov
     mock
+    regions>=0.4
+    specutils>=0.7
+    specreduce>=1.0.0
+    spectral-cube>=0.6.0
 qt =
     PyQt5
 
 [options.entry_points]
 glue.plugins =
-    glue_astronomy = glue_astronomy:setup
-    spectral_cube = glue_astronomy.io.spectral_cube:setup
+    ccddata = glue_astronomy.translators:setup_ccddata
+    regions = glue_astronomy.translators:setup_regions
+    spectrum1d = glue_astronomy.translators:setup_spectrum1d
+    spectral_cube = glue_astronomy.translators:setup_spectral_cube
+    spectral_cube_io = glue_astronomy.io.spectral_cube:setup
+    trace = glue_astronomy.translators:setup_trace
 
 [options.package_data]
 glue_astronomy.io.spectral_cube.tests = data/*, data/*/*,  data/*/*/*