Implement Brett's suggestions

Author: mcara

tweakwcs/__init__.py

@@ -17,13 +17,45 @@
     __version__ = ''
 
 
-from .correctors import (WCSCorrector, FITSWCSCorrector,  # noqa: F401
-                         ST_V2V3_WCSCorrector,  # noqa: F401
-                         JWSTWCSCorrector, RomanWCSCorrector,  # noqa: F401
-                         TPWCS, JWSTgWCS, FITSWCS)  # noqa: F401
-from .matchutils import MatchCatalogs, XYXYMatch, TPMatch  # noqa: F401
-from .imalign import fit_wcs, align_wcs  # noqa: F401
-from .wcsimage import (convex_hull, RefCatalog, WCSImageCatalog,  # noqa: F401
-                       WCSGroupCatalog)  # noqa: F401
-from .linalg import inv  # noqa: F401
-from .linearfit import iter_linear_fit, build_fit_matrix  # noqa: F401
+from .correctors import (
+    WCSCorrector,
+    FITSWCSCorrector,
+    ST_V2V3_WCSCorrector,
+    JWSTWCSCorrector,
+    RomanWCSCorrector,
+)
+from .matchutils import XYXYMatch, MatchCatalogs, MatchSourceConfusionError
+from .imalign import fit_wcs, align_wcs
+from .wcsimage import (
+    convex_hull,
+    RefCatalog,
+    WCSImageCatalog,
+    WCSGroupCatalog,
+)
+from .linalg import inv
+from .linearfit import iter_linear_fit, build_fit_matrix
+
+# import deprecated classes:
+from .correctors import TPWCS, JWSTgWCS, FITSWCS  # noqa: F401
+from .matchutils import TPMatch  # noqa: F401
+
+
+__all__ = [
+    'FITSWCSCorrector',
+    'JWSTWCSCorrector',
+    'MatchCatalogs',
+    'MatchSourceConfusionError',
+    'RefCatalog',
+    'RomanWCSCorrector',
+    'ST_V2V3_WCSCorrector',
+    'WCSCorrector',
+    'WCSGroupCatalog',
+    'WCSImageCatalog',
+    'XYXYMatch',
+    'align_wcs',
+    'build_fit_matrix',
+    'convex_hull',
+    'fit_wcs',
+    'inv',
+    'iter_linear_fit',
+]

tweakwcs/tests/conftest.py

@@ -3,11 +3,19 @@
 from astropy import wcs as fitswcs
 from astropy.table import Table
 
+from tweakwcs.correctors import (
+    JWSTWCSCorrector,
+    RomanWCSCorrector,
+    ST_V2V3_WCSCorrector,
+)
 from tweakwcs.linearfit import build_fit_matrix
 from . helper_correctors import make_mock_st_wcs
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(
+    scope='module',
+    params=[ST_V2V3_WCSCorrector, JWSTWCSCorrector, RomanWCSCorrector]
+)
 def mock_st_wcs(request):
     corr_cls = request.param
     cd = build_fit_matrix((36, 47), 1e-5)

tweakwcs/tests/test_correctors.py

@@ -205,11 +205,6 @@ def test_jwst_wcs_corr_applied(corr_cls):
     assert 'dummy_meta' in wc.meta
 
 
-@pytest.mark.parametrize(
-    'mock_st_wcs',
-    [ST_V2V3_WCSCorrector, JWSTWCSCorrector, RomanWCSCorrector],
-    indirect=True
-)
 def test_jwst_wcs_corr_are_being_combined(mock_st_wcs):
     wcs, corr_cls = mock_st_wcs
     wc = corr_cls(
@@ -245,11 +240,6 @@ def test_jwstgwcs_unsupported_wcs():
         JWSTWCSCorrector(dummy_wcs, {})
 
 
-@pytest.mark.parametrize(
-    'mock_st_wcs',
-    [ST_V2V3_WCSCorrector, JWSTWCSCorrector, RomanWCSCorrector],
-    indirect=True
-)
 def test_jwstgwcs_inconsistent_ref(mock_st_wcs):
     wcs, corr_cls = mock_st_wcs
     wc = corr_cls(
@@ -263,11 +253,6 @@ def test_jwstgwcs_inconsistent_ref(mock_st_wcs):
         )
 
 
-@pytest.mark.parametrize(
-    'mock_st_wcs',
-    [ST_V2V3_WCSCorrector, JWSTWCSCorrector, RomanWCSCorrector],
-    indirect=True
-)
 def test_jwstgwcs_wrong_tpcorr_type(mock_st_wcs):
     wcs, corr_cls = mock_st_wcs
     wc = corr_cls(
@@ -288,11 +273,6 @@ def test_jwstgwcs_wrong_tpcorr_type(mock_st_wcs):
         )
 
 
-@pytest.mark.parametrize(
-    'mock_st_wcs',
-    [ST_V2V3_WCSCorrector, JWSTWCSCorrector, RomanWCSCorrector],
-    indirect=True
-)
 def test_jwstgwcs_ref_angles_preserved(mock_st_wcs):
     wcs, corr_cls = mock_st_wcs
     wc = corr_cls(