Remove *CoordGenerator classes from utils

`astroquery.utils.commons` defined a few classes which allowed
constructing `astropy.coordinates.SkyCoord` instances without having to
specify the `frame` keyword at the cost of having to specify the correct
class instead. They provided little value, and all the code that used
them now uses `SkyCoord` directly.

Author: eerovaher

astroquery/heasarc/tests/conftest.py

@@ -4,6 +4,7 @@
 import hashlib
 import requests
 import pytest
+from astropy.coordinates import SkyCoord
 from ... import log
 
 """
@@ -17,6 +18,10 @@
 """
 
 
+# The quasar 3C 273
+skycoord_3C_273 = SkyCoord("12h29m06.70s +02d03m08.7s", frame="icrs")
+
+
 class MockResponse:
     def __init__(self, text):
         self.text = text

astroquery/heasarc/tests/test_heasarc_remote.py

@@ -4,9 +4,8 @@
 import requests
 
 from ...heasarc import Heasarc
-from ...utils import commons
 
-from .conftest import parametrization_local_save_remote, MockResponse
+from .conftest import MockResponse, parametrization_local_save_remote, skycoord_3C_273
 
 
 @parametrization_local_save_remote
@@ -84,18 +83,16 @@ def test_query_object_async(self):
     def test_query_region_async(self):
         heasarc = Heasarc()
         mission = 'rosmaster'
-        c = commons.coord.SkyCoord('12h29m06.70s +02d03m08.7s', frame='icrs')
-        response = heasarc.query_region_async(c, mission=mission,
-                                              radius='1 degree')
+        response = heasarc.query_region_async(
+            skycoord_3C_273, mission=mission, radius="1 degree")
         assert response is not None
         assert isinstance(response, (requests.models.Response, MockResponse))
 
     def test_query_region(self):
         heasarc = Heasarc()
         mission = 'rosmaster'
 
-        # Define coordinates for '3c273' object
-        c = commons.coord.SkyCoord('12h29m06.70s +02d03m08.7s', frame='icrs')
-        table = heasarc.query_region(c, mission=mission, radius='1 degree')
+        table = heasarc.query_region(
+            skycoord_3C_273, mission=mission, radius="1 degree")
 
         assert len(table) == 63

astroquery/heasarc/tests/test_heasarc_remote_isdc.py

@@ -6,8 +6,7 @@
 import astropy.units as u
 
 from ...heasarc import Heasarc, Conf
-from ...utils import commons
-from .conftest import parametrization_local_save_remote, MockResponse
+from .conftest import MockResponse, parametrization_local_save_remote, skycoord_3C_273
 
 
 @parametrization_local_save_remote
@@ -191,24 +190,19 @@ def test_query_object_async(self):
     def test_query_region_async(self):
         heasarc = Heasarc()
         mission = 'integral_rev3_scw'
-        c = commons.coord.SkyCoord('12h29m06.70s +02d03m08.7s', frame='icrs')
 
         with self.isdc_context:
-            response = heasarc.query_region_async(c, mission=mission,
-                                                  radius='1 degree')
+            response = heasarc.query_region_async(
+                skycoord_3C_273, mission=mission, radius="1 degree")
         assert response is not None
         assert isinstance(response, (requests.models.Response, MockResponse))
 
     def test_query_region(self):
         heasarc = Heasarc()
         mission = 'integral_rev3_scw'
 
-        # Define coordinates for '3c273' object
         with self.isdc_context:
-            c = commons.coord.SkyCoord(
-                    '12h29m06.70s +02d03m08.7s',
-                    frame='icrs'
-                )
-            table = heasarc.query_region(c, mission=mission, radius='1 degree')
+            table = heasarc.query_region(
+                skycoord_3C_273, mission=mission, radius="1 degree")
 
         assert len(table) >= 274

astroquery/image_cutouts/first/tests/test_first.py

@@ -4,13 +4,16 @@
 import numpy.testing as npt
 import pytest
 import astropy.units as u
+from astropy.coordinates import SkyCoord
 
 from ....utils import commons
 from astroquery.utils.mocks import MockResponse
 from ... import first
 
 DATA_FILES = {'image': 'image.fits'}
 
+skycoord = SkyCoord(162.530 * u.deg, 30.677 * u.deg, frame="icrs")
+
 
 def data_path(filename):
     data_dir = os.path.join(os.path.dirname(__file__), 'data')
@@ -42,15 +45,12 @@ def post_mockreturn(method, url, data, timeout, **kwargs):
 
 def test_get_images_async(patch_post, patch_parse_coordinates):
     response = first.core.First.get_images_async(
-        commons.ICRSCoordGenerator(162.530, 30.677, unit=(u.deg, u.deg)),
-        image_size=0.2 * u.deg, get_query_payload=True)
+        skycoord, image_size=0.2 * u.deg, get_query_payload=True)
     npt.assert_approx_equal(response['ImageSize'], 12, significant=3)
-    response = first.core.First.get_images_async(
-        commons.ICRSCoordGenerator(162.530, 30.677, unit=(u.deg, u.deg)))
+    response = first.core.First.get_images_async(skycoord)
     assert response is not None
 
 
 def test_get_images(patch_post, patch_parse_coordinates):
-    image = first.core.First.get_images(
-        commons.ICRSCoordGenerator(162.530, 30.677, unit=(u.deg, u.deg)))
+    image = first.core.First.get_images(skycoord)
     assert image is not None

astroquery/ipac/irsa/irsa_dust/core.py

@@ -1,7 +1,9 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+
+from astropy.coordinates import Angle, SkyCoord
+from astropy.coordinates.name_resolve import NameResolveError
 from astropy.table import Table, Column
 import astropy.units as u
-from astropy import coordinates
 
 from astroquery.ipac.irsa.irsa_dust import utils
 from astroquery.ipac.irsa.irsa_dust import conf
@@ -336,18 +338,18 @@ def _args_to_payload(self, coordinate, radius=None):
                 # If the coordinate is a resolvable name, pass that name
                 # directly to irsa_dust because it can handle it (and that
                 # changes the return value associated metadata)
-                C = commons.ICRSCoord.from_name(coordinate)
+                C = SkyCoord.from_name(coordinate, frame="icrs")
                 payload = {"locstr": coordinate}
-            except coordinates.name_resolve.NameResolveError:
+            except NameResolveError:
                 C = commons.parse_coordinates(coordinate).transform_to('fk5')
                 # check if this is resolvable?
                 payload = {"locstr": "{0} {1}".format(C.ra.deg, C.dec.deg)}
-        elif isinstance(coordinate, coordinates.SkyCoord):
+        elif isinstance(coordinate, SkyCoord):
             C = coordinate.transform_to('fk5')
             payload = {"locstr": "{0} {1}".format(C.ra.deg, C.dec.deg)}
         # check if radius is given with proper units
         if radius is not None:
-            reg_size = coordinates.Angle(radius).deg
+            reg_size = Angle(radius).deg
             # check if radius falls in the acceptable range
             if reg_size < 2 or reg_size > 37.5:
                 raise ValueError("Radius (in any unit) must be in the"

astroquery/ipac/irsa/irsa_dust/tests/test_irsa_dust.py

@@ -4,7 +4,8 @@
 import pytest
 
 import astropy.units as u
-from astropy import coordinates
+from astropy.coordinates import SkyCoord
+from astropy.coordinates.name_resolve import NameResolveError
 
 from astroquery.utils import commons
 
@@ -36,13 +37,9 @@
     'http://irsa.ipac.caltech.edu//workspace/TMP_kRQo9a_8160/DUST/m31.v0002/p338temp.fits']
 
 
-galcoords = {'m31': coordinates.SkyCoord(ra=10.6847083 * u.deg,
-                                         dec=41.26875 * u.deg,
-                                         frame='icrs'),
-             'm81': coordinates.SkyCoord(ra=148.888221083 * u.deg,
-                                         dec=69.065294722 * u.deg,
-                                         frame='icrs'),
-             }
+galcoords = {"m31": SkyCoord(ra=10.6847083 * u.deg, dec=41.26875 * u.deg, frame="icrs"),
+             "m81": SkyCoord(ra=148.888221083 * u.deg, dec=69.065294722 * u.deg,
+                             frame="icrs")}
 
 
 def format(coord):
@@ -63,14 +60,12 @@ def patch_request(request):
 def patch_fromname(request):
     mp = request.getfixturevalue("monkeypatch")
 
-    def fromname(self, name):
+    def fromname(self, name, frame=None):
         if isinstance(name, str):
             return galcoords[name]
         else:
-            raise coordinates.name_resolve.NameResolveError
-    mp.setattr(commons.ICRSCoord,
-               'from_name',
-               types.MethodType(fromname, commons.ICRSCoord))
+            raise NameResolveError
+    mp.setattr(SkyCoord, "from_name", types.MethodType(fromname, SkyCoord))
 
 
 class DustTestCase:
@@ -117,21 +112,17 @@ def test_xml_err(self):
 # TODO : Add more examples. Add for "1 degree"-like parameters
     @pytest.mark.parametrize(
         ('coordinate', 'radius', 'expected_payload'),
-        [(galcoords["m81"], None, dict(locstr=format(galcoords['m81']))),
-         (galcoords["m31"], "5d0m", dict(locstr=format(galcoords['m31']),
-                                         regSize=5.0)),
-         (galcoords["m31"], 5 * u.deg, dict(locstr=format(galcoords['m31']),
-                                            regSize=5)),
-         ("m31", 5 * u.deg, dict(locstr='m31', regSize=5)),
-         (coordinates.SkyCoord(ra=148.888221083 * u.deg,
-                               dec=69.065294722 * u.deg, frame='icrs'),
-          5 * u.deg,
-          {'locstr': format(coordinates.SkyCoord(ra=148.888221083 * u.deg,
-                                                 dec=69.065294722 * u.deg,
-                                                 frame='icrs')),
-           'regSize': 5}), ])
+        ((galcoords["m81"], None, {}),
+         (galcoords["m31"], "5d0m", {"regSize": 5.0}),
+         (galcoords["m31"], 5 * u.deg, {"regSize": 5}),
+         ("m31", 5 * u.deg, {"locstr": "m31", "regSize": 5}),
+         (galcoords["m81"], 5 * u.deg, {"regSize": 5})))
     def test_args_to_payload_instance_1(self, coordinate, radius,
                                         expected_payload, patch_fromname):
+        if isinstance(coordinate, str):
+            expected_payload["locstr"] = coordinate
+        else:
+            expected_payload["locstr"] = format(coordinate)
         payload = IrsaDust()._args_to_payload(coordinate, radius=radius)
         assert payload == expected_payload
 

astroquery/ipac/irsa/tests/test_irsa.py

@@ -5,12 +5,11 @@
 import numpy as np
 
 import pytest
+from astropy.coordinates import SkyCoord
 from astropy.table import Table
-import astropy.coordinates as coord
 import astropy.units as u
 
 from astroquery.utils.mocks import MockResponse
-from astroquery.utils import commons
 from astroquery.ipac.irsa import Irsa, conf
 from astroquery.ipac import irsa
 
@@ -19,8 +18,7 @@
               'Polygon': 'Polygon.xml'}
 
 OBJ_LIST = ["m31", "00h42m44.330s +41d16m07.50s",
-            commons.GalacticCoordGenerator(l=121.1743, b=-21.5733,
-                                           unit=(u.deg, u.deg))]
+            SkyCoord(l=121.1743 * u.deg, b=-21.5733 * u.deg, frame="galactic")]
 
 
 def data_path(filename):
@@ -120,9 +118,9 @@ def test_query_region_box(coordinates, patch_get):
     assert isinstance(result, Table)
 
 
-poly1 = [coord.SkyCoord(ra=10.1, dec=10.1, unit=(u.deg, u.deg)),
-         coord.SkyCoord(ra=10.0, dec=10.1, unit=(u.deg, u.deg)),
-         coord.SkyCoord(ra=10.0, dec=10.0, unit=(u.deg, u.deg))]
+poly1 = [SkyCoord(ra=10.1 * u.deg, dec=10.1 * u.deg),
+         SkyCoord(ra=10.0 * u.deg, dec=10.1 * u.deg),
+         SkyCoord(ra=10.0 * u.deg, dec=10.0 * u.deg)]
 poly2 = [(10.1 * u.deg, 10.1 * u.deg), (10.0 * u.deg, 10.1 * u.deg),
          (10.0 * u.deg, 10.0 * u.deg)]
 

astroquery/ipac/ned/tests/test_ned.py

@@ -221,8 +221,7 @@ def test_query_region_async(monkeypatch, patch_get):
     assert response['search_type'] == "Near Name Search"
     # check with Galactic coordinates
     response = ned.core.Ned.query_region_async(
-        commons.GalacticCoordGenerator(l=-67.02084, b=-29.75447,
-                                       unit=(u.deg, u.deg)),
+        coord.SkyCoord(l=-67.02084 * u.deg, b=-29.75447 * u.deg, frame="galactic"),
         get_query_payload=True)
     assert response['search_type'] == 'Near Position Search'
     npt.assert_approx_equal(

astroquery/magpis/tests/test_magpis.py

@@ -5,11 +5,15 @@
 import numpy.testing as npt
 import pytest
 import astropy.units as u
+from astropy.coordinates import SkyCoord
 
 from ...utils import commons
 from astroquery.utils.mocks import MockResponse
 from ... import magpis
 
+
+skycoord = SkyCoord(10.5 * u.deg, 0.0 * u.deg, frame="galactic")
+
 DATA_FILES = {'image': 'image.fits'}
 
 
@@ -50,23 +54,18 @@ def test_list_surveys():
 
 def test_get_images_async(patch_post, patch_parse_coordinates):
     response = magpis.core.Magpis.get_images_async(
-        commons.GalacticCoordGenerator(10.5, 0.0, unit=(u.deg, u.deg)),
-        image_size=2 * u.deg, survey="gps6epoch3", get_query_payload=True)
+        skycoord, image_size=2 * u.deg, survey="gps6epoch3", get_query_payload=True)
     npt.assert_approx_equal(response['ImageSize'], 120, significant=3)
     assert response['Survey'] == 'gps6epoch3'
-    response = magpis.core.Magpis.get_images_async(
-        commons.GalacticCoordGenerator(10.5, 0.0, unit=(u.deg, u.deg)))
+    response = magpis.core.Magpis.get_images_async(skycoord)
     assert response is not None
 
 
 def test_get_images(patch_post, patch_parse_coordinates):
-    image = magpis.core.Magpis.get_images(
-        commons.GalacticCoordGenerator(10.5, 0.0, unit=(u.deg, u.deg)))
+    image = magpis.core.Magpis.get_images(skycoord)
     assert image is not None
 
 
 @pytest.mark.xfail
 def test_get_images_fail(patch_post, patch_parse_coordinates):
-    magpis.core.Magpis.get_images(
-        commons.GalacticCoordGenerator(10.5, 0.0, unit=(u.deg, u.deg)),
-        survey='Not a survey')
+    magpis.core.Magpis.get_images(skycoord, survey="Not a survey")

astroquery/nvas/tests/test_nvas.py

@@ -8,16 +8,15 @@
 import numpy.testing as npt
 import astropy.units as u
 import pytest
+from astropy.coordinates import SkyCoord
 from astropy.io.fits.verify import VerifyWarning
 
 from ...import nvas
 from astroquery.utils.mocks import MockResponse
 from ...utils import commons
 
-COORDS_GAL = commons.GalacticCoordGenerator(
-    l=49.489, b=-0.37, unit=(u.deg, u.deg))  # ARM 2000
-COORDS_ICRS = commons.ICRSCoordGenerator(
-    "12h29m06.69512s +2d03m08.66276s")  # 3C 273
+COORDS_GAL = SkyCoord(l=49.489 * u.deg, b=-0.37 * u.deg, frame="galactic")  # ARM 2000
+COORDS_ICRS = SkyCoord("12h29m06.69512s +2d03m08.66276s", frame="icrs")  # 3C 273
 
 DATA_FILES = {'image': 'image.imfits',
               'image_search': 'image_results.html'}
@@ -84,8 +83,8 @@ def deparse_coordinates(cstr):
 @pytest.mark.parametrize(('coordinates'), [COORDS_GAL, COORDS_ICRS])
 def test_parse_coordinates(coordinates):
     out_str = nvas.core._parse_coordinates(coordinates)
-    new_coords = commons.ICRSCoordGenerator(
-        deparse_coordinates(out_str), unit=(u.hour, u.deg))
+    new_coords = SkyCoord(
+        deparse_coordinates(out_str), unit=(u.hour, u.deg), frame="icrs")
     # if all goes well new_coords and coordinates have same ra and dec
     npt.assert_approx_equal(new_coords.ra.degree,
                             coordinates.transform_to('fk5').ra.degree,