move fitswcs and sliced_wcs converters to wcs submodule

astropy · Sep 19, 2024 · a016e2b · a016e2b
1 parent 53df278
commit a016e2b
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 9 deletions.
diff --git a/asdf_astropy/converters/__init__.py b/asdf_astropy/converters/__init__.py
@@ -16,6 +16,7 @@
     "AsdfFitsConverter",
     "AstropyFitsConverter",
     "FitsWCSConverter",
+    "SlicedWCSConverter",
     "ColumnConverter",
     "AstropyTableConverter",
     "AsdfTableConverter",
@@ -52,7 +53,7 @@
     SkyCoordConverter,
     SpectralCoordConverter,
 )
-from .fits import AsdfFitsConverter, AstropyFitsConverter, FitsConverter, FitsWCSConverter
+from .fits import AsdfFitsConverter, AstropyFitsConverter, FitsConverter
 from .table import AsdfTableConverter, AstropyTableConverter, ColumnConverter, NdarrayMixinConverter
 from .time import TimeConverter, TimeDeltaConverter
 from .transform import (
@@ -75,3 +76,4 @@
     UnitsMappingConverter,
 )
 from .unit import EquivalencyConverter, MagUnitConverter, QuantityConverter, UnitConverter
+from .wcs import FitsWCSConverter, SlicedWCSConverter
diff --git a/asdf_astropy/converters/fits/__init__.py b/asdf_astropy/converters/fits/__init__.py
@@ -2,8 +2,6 @@
     "FitsConverter",
     "AsdfFitsConverter",
     "AstropyFitsConverter",
-    "FitsWCSConverter",
 ]
 
 from .fits import AsdfFitsConverter, AstropyFitsConverter, FitsConverter
-from .fitswcs import FitsWCSConverter
diff --git a/..._astropy/converters/slicedwcs/__init__.py → asdf_astropy/converters/wcs/__init__.py b/..._astropy/converters/slicedwcs/__init__.py → asdf_astropy/converters/wcs/__init__.py
@@ -1,5 +1,6 @@
 __all__ = [
+    "FitsWCSConverter",
     "SlicedWCSConverter",
 ]
-
+from .fitswcs import FitsWCSConverter
 from .slicedwcs import SlicedWCSConverter
diff --git a/asdf_astropy/converters/fits/fitswcs.py → asdf_astropy/converters/wcs/fitswcs.py b/asdf_astropy/converters/fits/fitswcs.py → asdf_astropy/converters/wcs/fitswcs.py
diff --git a/...astropy/converters/slicedwcs/slicedwcs.py → asdf_astropy/converters/wcs/slicedwcs.py b/...astropy/converters/slicedwcs/slicedwcs.py → asdf_astropy/converters/wcs/slicedwcs.py
diff --git a/...opy/converters/slicedwcs/test/__init__.py → ..._astropy/converters/wcs/tests/__init__.py b/...opy/converters/slicedwcs/test/__init__.py → ..._astropy/converters/wcs/tests/__init__.py
diff --git a/...opy/converters/fits/tests/test_fitswcs.py → ...ropy/converters/wcs/tests/test_fitswcs.py b/...opy/converters/fits/tests/test_fitswcs.py → ...ropy/converters/wcs/tests/test_fitswcs.py
@@ -77,9 +77,6 @@ def create_tabular_wcs():
 
 @pytest.mark.parametrize("wcs", create_tabular_wcs())
 @pytest.mark.filterwarnings("ignore::astropy.wcs.wcs.FITSFixedWarning")
-@pytest.mark.filterwarnings(
-    "ignore:Some non-standard WCS keywords were excluded:astropy.utils.exceptions.AstropyWarning",
-)
 def test_twcs_serialization(wcs, tmp_path):
     file_path = tmp_path / "test_wcs.asdf"
     with asdf.AsdfFile() as af:

diff --git a/...nverters/slicedwcs/test/test_slicedwcs.py → ...py/converters/wcs/tests/test_slicedwcs.py b/...nverters/slicedwcs/test/test_slicedwcs.py → ...py/converters/wcs/tests/test_slicedwcs.py
diff --git a/asdf_astropy/extensions.py b/asdf_astropy/extensions.py
@@ -13,8 +13,6 @@
 from .converters.coordinates.sky_coord import SkyCoordConverter
 from .converters.coordinates.spectral_coord import SpectralCoordConverter
 from .converters.fits.fits import AsdfFitsConverter, AstropyFitsConverter
-from .converters.fits.fitswcs import FitsWCSConverter
-from .converters.slicedwcs.slicedwcs import SlicedWCSConverter
 from .converters.table.table import AsdfTableConverter, AstropyTableConverter, ColumnConverter, NdarrayMixinConverter
 from .converters.time.time import TimeConverter
 from .converters.time.time_delta import TimeDeltaConverter
@@ -33,6 +31,8 @@
 from .converters.unit.magunit import MagUnitConverter
 from .converters.unit.quantity import QuantityConverter
 from .converters.unit.unit import UnitConverter
+from .converters.wcs.fitswcs import FitsWCSConverter
+from .converters.wcs.slicedwcs import SlicedWCSConverter
 
 __all__ = [
     "TRANSFORM_CONVERTERS",