MAINT: fix new linter issues

Author: bsipocz

astroquery/jplhorizons/tests/test_jplhorizons.py

@@ -257,20 +257,20 @@ def test_vectors_query_payload():
                                epochs=2451544.5).vectors(
                                    get_query_payload=True)
     assert res == OrderedDict([
-                ('format', 'text'),
-                ('EPHEM_TYPE', 'VECTORS'),
-                ('OUT_UNITS', 'AU-D'),
-                ('COMMAND', '"Ceres"'),
-                ('CSV_FORMAT', '"YES"'),
-                ('REF_PLANE', 'ECLIPTIC'),
-                ('REF_SYSTEM', 'ICRF'),
-                ('TP_TYPE', 'ABSOLUTE'),
-                ('VEC_LABELS', 'YES'),
-                ('VEC_CORR', '"NONE"'),
-                ('VEC_DELTA_T', 'NO'),
-                ('OBJ_DATA', 'YES'),
-                ('CENTER', "'500@10'"),
-                ('TLIST', '2451544.5')])
+        ('format', 'text'),
+        ('EPHEM_TYPE', 'VECTORS'),
+        ('OUT_UNITS', 'AU-D'),
+        ('COMMAND', '"Ceres"'),
+        ('CSV_FORMAT', '"YES"'),
+        ('REF_PLANE', 'ECLIPTIC'),
+        ('REF_SYSTEM', 'ICRF'),
+        ('TP_TYPE', 'ABSOLUTE'),
+        ('VEC_LABELS', 'YES'),
+        ('VEC_CORR', '"NONE"'),
+        ('VEC_DELTA_T', 'NO'),
+        ('OBJ_DATA', 'YES'),
+        ('CENTER', "'500@10'"),
+        ('TLIST', '2451544.5')])
 
 
 def test_no_H(patch_request):

astroquery/mast/cutouts.py

@@ -309,7 +309,9 @@ def download_cutouts(self, *, coordinates=None, size=5, sector=None, path=".", i
             localpath_table['Local Path'] = [zipfile_path]
             return localpath_table
 
-        if verbose: print("Inflating...")
+        if verbose:
+            print("Inflating...")
+
         # unzipping the zipfile
         zip_ref = zipfile.ZipFile(zipfile_path, 'r')
         cutout_files = zip_ref.namelist()
@@ -573,7 +575,9 @@ def download_cutouts(self, coordinates, *, size=5, survey=None, cutout_format="f
             localpath_table['Local Path'] = [zipfile_path]
             return localpath_table
 
-        if verbose: print("Inflating...")
+        if verbose:
+            print("Inflating...")
+
         # unzipping the zipfile
         zip_ref = zipfile.ZipFile(zipfile_path, 'r')
         cutout_files = zip_ref.namelist()
@@ -731,7 +735,9 @@ def download_cutouts(self, coordinates, *, size=5, path=".", inflate=True, verbo
             localpath_table['Local Path'] = [zipfile_path]
             return localpath_table
 
-        if verbose: print("Inflating...")
+        if verbose:
+            print("Inflating...")
+
         # unzipping the zipfile
         zip_ref = zipfile.ZipFile(zipfile_path, 'r')
         cutout_files = zip_ref.namelist()
@@ -742,7 +748,6 @@ def download_cutouts(self, coordinates, *, size=5, path=".", inflate=True, verbo
         localpath_table['Local Path'] = [path+x for x in cutout_files]
         return localpath_table
 
-
     def get_cutouts(self, coordinates, *, size=5):
         """
         Get cutout image(s) around the given coordinates with indicated size,

astroquery/mast/tests/test_mast_remote.py

@@ -1105,7 +1105,7 @@ def test_zcut_get_cutouts(self):
     ###################
 
     def test_hapcut_download_cutouts(self, tmpdir):
-        
+
         # Test 1: Simple API call with expected results
         coord = SkyCoord(351.347812, 28.497808, unit="deg")
 
@@ -1171,4 +1171,4 @@ def test_hapcut_get_cutouts(self):
         with pytest.warns(NoResultsWarning, match='Missing HAP files for input target. Cutout not performed.'):
             cutout_list = mast.Hapcut.get_cutouts(coordinates=bad_coord)
             assert isinstance(cutout_list, list)
-            assert len(cutout_list) == 0
+            assert len(cutout_list) == 0

astroquery/solarsystem/pds/core.py

@@ -87,7 +87,7 @@ def __str__(self):
         return "PDSRingNode instance"
 
     def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel=3,
-                            get_query_payload=False, cache=True):
+                        get_query_payload=False, cache=True):
         """
         send query to Planetary Ring Node server
 
@@ -182,9 +182,8 @@ def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel
                 altitude = u.Quantity(location[2]).to_value(u.m)
 
         if neptune_arcmodel not in [1, 2, 3]:
-            raise ValueError(
-                f"Illegal Neptune arc model {neptune_arcmodel}. must be one of 1, 2, or 3 (see https://pds-rings.seti.org/tools/viewer3_nep.shtml for details)"
-            )
+            raise ValueError(f"illegal Neptune arc model {neptune_arcmodel}. must be one of 1, 2, or 3 "
+                             "(see https://pds-rings.seti.org/tools/viewer3_nep.shtml for details).")
 
         # configure request_payload for ephemeris query
         request_payload = dict(
@@ -284,7 +283,9 @@ def _parse_result(self, response, verbose=None):
             elif group.startswith("Sub-"):
 
                 group = os.linesep.join(group.splitlines()[2:])  # removing two-row header entirely
-                bodytable2_names = ("NAIF ID", "Body", "sub_obs_lon", "sub_obs_lat", "sub_sun_lon", "sub_sun_lat", "phase", "distance")
+                bodytable2_names = ("NAIF ID", "Body",
+                                    "sub_obs_lon", "sub_obs_lat", "sub_sun_lon", "sub_sun_lat",
+                                    "phase", "distance")
                 bodytable2_units = [None, None, u.deg, u.deg, u.deg, u.deg, u.deg, u.km * 1e6]
                 bodytable2 = QTable.read(group, format="ascii.fixed_width",
                                          col_starts=(0, 4, 18, 28, 37, 49, 57, 71),

astroquery/solarsystem/pds/tests/test_pds.py

@@ -67,8 +67,13 @@ def test_ephemeris_query_Uranus(patch_request):
     assert isinstance(systemtable, dict)
 
     assert np.allclose(
-        [-56.12233, -56.13586, -56.13586, -56.01577, 0.10924, 354.11072, 354.12204, 2947896667.0, 3098568884.0, 10335.713263, ],
-        [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value, systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value, systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value, systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value, systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
+        [-56.12233, -56.13586, -56.13586, -56.01577, 0.10924,
+         354.11072, 354.12204, 2947896667.0, 3098568884.0, 10335.713263, ],
+        [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value,
+         systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value,
+         systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value,
+         systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value,
+         systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
         rtol=1e-2,
     )
 
@@ -104,7 +109,11 @@ def test_ephemeris_query_Pluto(patch_request):
     # check system table
     assert np.allclose(
         [57.57737, 57.56961, 57.56961, 56.50534, 1.64048, 116.55873, 118.8369, 5142696000, 5114486810, 17060.091666, ],
-        [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value, systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value, systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value, systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value, systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
+        [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value,
+         systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value,
+         systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value,
+         systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value,
+         systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
         rtol=1e-2,
     )
 
@@ -114,7 +123,10 @@ def test_ephemeris_query_Pluto(patch_request):
     assert styx["Body"] == "Styx"
     assert np.allclose(
         [296.212477, -22.93533, -0.557, -1.259, 350.443, 56.472, 352.72, 57.544, 1.64047, 5114.509238, ],
-        [styx["RA (deg)"].to(u.deg).value, styx["Dec (deg)"].to(u.deg).value, styx["dRA"].to(u.arcsec).value, styx["dDec"].to(u.arcsec).value, styx["sub_obs_lon"].to(u.deg).value, styx["sub_obs_lat"].to(u.deg).value, styx["sub_sun_lon"].to(u.deg).value, styx["sub_sun_lat"].to(u.deg).value, styx["phase"].to(u.deg).value, styx["distance"].to(u.km * 1e6).value, ],
+        [styx["RA (deg)"].to(u.deg).value, styx["Dec (deg)"].to(u.deg).value, styx["dRA"].to(u.arcsec).value,
+         styx["dDec"].to(u.arcsec).value, styx["sub_obs_lon"].to(u.deg).value, styx["sub_obs_lat"].to(u.deg).value,
+         styx["sub_sun_lon"].to(u.deg).value, styx["sub_sun_lat"].to(u.deg).value, styx["phase"].to(u.deg).value,
+         styx["distance"].to(u.km * 1e6).value, ],
         rtol=1e-2,
     )
 

astroquery/solarsystem/pds/tests/test_pds_remote.py

@@ -17,8 +17,13 @@ def test_ephemeris_query(self):
         # check system table
         systemtable = bodytable.meta
         assert np.allclose(
-            [-56.12233, -56.13586, -56.13586, -56.01577, 0.10924, 354.11072, 354.12204, 2947896667.0, 3098568884.0, 10335.713263, ],
-            [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value, systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value, systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value, systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value, systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
+            [-56.12233, -56.13586, -56.13586, -56.01577, 0.10924, 354.11072, 354.12204,
+             2947896667.0, 3098568884.0, 10335.713263, ],
+            [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value,
+             systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value,
+             systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value,
+             systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value,
+             systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
             rtol=1e-2,
         )
 
@@ -28,7 +33,10 @@ def test_ephemeris_query(self):
         assert mab["Body"] == "Mab"
         assert np.allclose(
             [42.011201, 15.801323, 5.368, 0.623, 223.976, 55.906, 223.969, 56.013, 0.10932, 3098.514, ],
-            [mab["RA (deg)"].to(u.deg).value, mab["Dec (deg)"].to(u.deg).value, mab["dRA"].to(u.arcsec).value, mab["dDec"].to(u.arcsec).value, mab["sub_obs_lon"].to(u.deg).value, mab["sub_obs_lat"].to(u.deg).value, mab["sub_sun_lon"].to(u.deg).value, mab["sub_sun_lat"].to(u.deg).value, mab["phase"].to(u.deg).value, mab["distance"].to(u.km * 1e6).value, ],
+            [mab["RA (deg)"].to(u.deg).value, mab["Dec (deg)"].to(u.deg).value, mab["dRA"].to(u.arcsec).value,
+             mab["dDec"].to(u.arcsec).value, mab["sub_obs_lon"].to(u.deg).value,
+             mab["sub_obs_lat"].to(u.deg).value, mab["sub_sun_lon"].to(u.deg).value, mab["sub_sun_lat"].to(u.deg).value,
+             mab["phase"].to(u.deg).value, mab["distance"].to(u.km * 1e6).value, ],
             rtol=1e-2,
         )