MAINT: more style adjustments to fix all linter issues

Author: bsipocz

astroquery/alma/tests/test_alma.py

@@ -179,9 +179,9 @@ def test_gen_array_sql():
     # string arrays should be OR'd together
     common_select = "select * from ivoa.obscore WHERE "
     test_keywords = ["High-mass star formation", "Disks around high-mass stars"]
-    assert _gen_sql({"spatial_resolution": "<0.1",
-                     "science_keyword": test_keywords}) == common_select + \
-        "spatial_resolution<=0.1 AND (science_keyword='High-mass star formation' OR science_keyword='Disks around high-mass stars')"
+    assert (_gen_sql({"spatial_resolution": "<0.1", "science_keyword": test_keywords})
+            == common_select + ("spatial_resolution<=0.1 AND (science_keyword='High-mass star formation' "
+                                "OR science_keyword='Disks around high-mass stars')"))
 
 
 def test_gen_datetime_sql():
@@ -198,12 +198,9 @@ def test_gen_datetime_sql():
 
 def test_gen_spec_res_sql():
     common_select = 'select * from ivoa.obscore WHERE '
-    assert _gen_sql({'spectral_resolution': 70}) == common_select + \
-        "em_resolution=20985472.06"
-    assert _gen_sql({'spectral_resolution': '<70'}) == common_select + \
-        "em_resolution>=20985472.06"
-    assert _gen_sql({'spectral_resolution': '>70'}) == common_select + \
-        "em_resolution<=20985472.06"
+    assert _gen_sql({'spectral_resolution': 70}) == common_select + "em_resolution=20985472.06"
+    assert _gen_sql({'spectral_resolution': '<70'}) == common_select + "em_resolution>=20985472.06"
+    assert _gen_sql({'spectral_resolution': '>70'}) == common_select + "em_resolution<=20985472.06"
     assert _gen_sql({'spectral_resolution': '(70 .. 80)'}) == common_select + \
         "(23983396.64<=em_resolution AND em_resolution<=20985472.06)"
     assert _gen_sql({'spectral_resolution': '(70|80)'}) == common_select + \
@@ -471,7 +468,9 @@ class MockResponse:
                                       'value': 'ivo://ivoa.net/std/DataLink#links-1.0'})()
         adhoc_service_1_param2 = type(
             '', (object, ), {
-                'ID': 'accessURL', 'value': 'https://almascience.org/datalink/sync?ID=2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar'})()
+                'ID': 'accessURL',
+                'value': 'https://almascience.org/datalink/sync?ID=2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar'}
+        )()
         adhoc_service_1 = type(
             '', (object, ), {
                 'ID': 'DataLink.2017.1.01185.S_uid___A001_X12a3_Xe9_001_of_001.tar', 'params': [
@@ -481,7 +480,9 @@ class MockResponse:
                                       'value': 'ivo://ivoa.net/std/DataLink#links-1.0'})()
         adhoc_service_2_param2 = type(
             '', (object, ), {
-                'ID': 'accessURL', 'value': 'https://almascience.org/datalink/sync?ID=2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar'})()
+                'ID': 'accessURL',
+                'value': 'https://almascience.org/datalink/sync?ID=2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar'}
+        )()
         adhoc_service_2 = type(
             '', (object, ), {
                 'ID': 'DataLink.2017.1.01185.S_uid___A001_X12a3_Xe9_auxiliary.tar', 'params': [

astroquery/alma/tests/test_alma_remote.py

@@ -563,7 +563,8 @@ def test_verify_html_file(alma, caplog, tmp_path):
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
 
     result = alma.download_files(
-        ['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
+        ['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)],
+        verify_only=True)
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
     local_filepath = Path(result[0])
     expected_file_length = local_filepath.stat().st_size
@@ -576,9 +577,11 @@ def test_verify_html_file(alma, caplog, tmp_path):
     caplog.clear()
     new_file_length = expected_file_length + 10
     with pytest.warns(expected_warning=CorruptDataWarning,
-                      match=f"Found cached file {local_filepath} with size {new_file_length} > expected size {expected_file_length}.  The download is likely corrupted."):
+                      match=(f"Found cached file {local_filepath} with size {new_file_length} > expected size "
+                             f"{expected_file_length}.  The download is likely corrupted.")):
         result = alma.download_files(
-            ['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
+            ['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)],
+            verify_only=True)
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
 
     # manipulate the file: make it small
@@ -587,7 +590,9 @@ def test_verify_html_file(alma, caplog, tmp_path):
 
     caplog.clear()
     result = alma.download_files(
-        ['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)], verify_only=True)
+        ['https://{}/dataPortal/member.uid___A001_X1284_X1353.qa2_report.html'.format(download_hostname)],
+        verify_only=True)
     assert 'member.uid___A001_X1284_X1353.qa2_report.html' in result[0]
     existing_file_length = 10
-    assert f"Found cached file {local_filepath} with size {existing_file_length} < expected size {expected_file_length}.  The download should be continued." in caplog.text
+    assert (f"Found cached file {local_filepath} with size {existing_file_length} < expected size "
+            f"{expected_file_length}.  The download should be continued.") in caplog.text

astroquery/alma/utils.py

@@ -29,9 +29,8 @@ def parse_frequency_support(frequency_support_str):
         supports = frequency_support_str.split('U')
 
     freq_ranges = [(float(sup[0]),
-                    float(sup[1].split(',')[0].strip(string.ascii_letters))) *
-                   u.Unit(sup[1].split(',')[0].strip(string.punctuation
-                                                     + string.digits))
+                    float(sup[1].split(',')[0].strip(string.ascii_letters)))
+                   * u.Unit(sup[1].split(',')[0].strip(string.punctuation + string.digits))
                    for i in supports for sup in [i.strip('[] ').split('..'), ]]
     return u.Quantity(freq_ranges)
 

astroquery/atomic/core.py

@@ -29,7 +29,8 @@ def __init__(self):
         super().__init__()
         self.__default_form_values = None
 
-    def query_object(self, *, wavelength_range=None, wavelength_type=None, wavelength_accuracy=None, element_spectrum=None,
+    def query_object(self, *, wavelength_range=None, wavelength_type=None, wavelength_accuracy=None,
+                     element_spectrum=None,
                      minimal_abundance=None, depl_factor=None, lower_level_energy_range=None,
                      upper_level_energy_range=None, nmax=None, multiplet=None, transitions=None,
                      show_fine_structure=None, show_auto_ionizing_transitions=None,

astroquery/besancon/core.py

@@ -286,8 +286,7 @@ def _parse_args(self, glon, glat, email, smallfield=True, extinction=0.7,
 
         return request_data
 
-    @prepend_docstr_nosections("\n" + _parse_args.__doc__ +
-                              _parse_result.__doc__)
+    @prepend_docstr_nosections("\n" + _parse_args.__doc__ + _parse_result.__doc__)
     def query_async(self, *args, **kwargs):
         """
         Returns

astroquery/casda/core.py

@@ -98,7 +98,8 @@ def _login(self, *, username=None, store_password=False,
     def query_region_async(self, coordinates, radius=1*u.arcmin, height=None, width=None,
                            get_query_payload=False, cache=True):
         """
-        Queries a region around the specified coordinates. Either a radius or both a height and a width must be provided.
+        Queries a region around the specified coordinates. Either a radius or both a height and a width
+        must be provided.
 
         Parameters
         ----------

astroquery/casda/tests/test_casda.py

@@ -557,9 +557,12 @@ def test_args_to_payload_combined(patch_get):
 
 
 def test_download_file(patch_get):
-    urls = ['https://ingest.pawsey.org/bucket_name/path/askap_img.fits?security=stuff',
-            'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum',
-            'https://ingest.pawsey.org.au/casda-prd-as110-01/dc52217/primary_images/RACS-DR1_0000%2B18A.fits?security=stuff']
+    urls = [
+        'https://ingest.pawsey.org/bucket_name/path/askap_img.fits?security=stuff',
+        'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum',
+        'https://ingest.pawsey.org.au/casda-prd-as110-01/dc52217/primary_images/RACS-DR1_0000%2B18A.fits?security=stuff'
+    ]
+
     casda = Casda()
     fake_login(casda, USERNAME, PASSWORD)
 

astroquery/cosmosim/core.py

@@ -924,8 +924,7 @@ def explore_db(self, db=None, table=None, col=None):
                 info_list += ([self.db_dict[proj][key]
                               if isinstance(self.db_dict[proj][key], str)
                               else ""
-                              for key in self.db_dict[proj].keys()] +
-                              ['-' * tmp2_largest])
+                              for key in self.db_dict[proj].keys()] + ['-' * tmp2_largest])
             t['Projects'] = proj_list
             t['Project Items'] = attr_list
             t['Information'] = info_list
@@ -963,20 +962,18 @@ def explore_db(self, db=None, table=None, col=None):
                               "the `{0}` db.".format(db))
                     return
 
-            t['Projects'] = (['--> @ {}:'.format(db)]
-                             + ['' for i in range(size2 - 1)])
+            t['Projects'] = (['--> @ {}:'.format(db)] + ['' for i in range(size2 - 1)])
             t['Project Items'] = (
                 ['--> @ {}:'.format(key)
                  if (isinstance(self.db_dict[db][key], dict)
                      and (len(list(self.db_dict[db][key].keys()))
                           == len(list(self.db_dict[db]['tables'].keys()))))
                  else '@ {}'.format(key)
                  if (isinstance(self.db_dict[db][key], dict)
-                     and (len(list(self.db_dict[db][key].keys())) !=
-                          len(self.db_dict[db]['tables'].keys())))
+                     and (len(list(self.db_dict[db][key].keys()))
+                          != len(self.db_dict[db]['tables'].keys())))
                  else str(key)
-                 for key in self.db_dict[db].keys()] +
-                ['' for i in range(size2 - size1)])
+                 for key in self.db_dict[db].keys()] + ['' for i in range(size2 - size1)])
             # if only db is specified
             if not table:
                 if not col:
@@ -994,14 +991,11 @@ def explore_db(self, db=None, table=None, col=None):
                               if key != table], key=len))
                 t['Tables'] = (
                     ['--> @ {}:'.format(i)
-                     if (i == table
-                         and isinstance(self.db_dict[db]['tables'][i], dict))
+                     if (i == table and isinstance(self.db_dict[db]['tables'][i], dict))
                      else '@ {}'.format(i)
-                     if (i != table
-                         and isinstance(self.db_dict[db]['tables'][i], dict))
+                     if (i != table and isinstance(self.db_dict[db]['tables'][i], dict))
                      else str(i)
-                     for i in reordered] +
-                    ['' for j in range(size2 - len(reordered))])
+                     for i in reordered] + ['' for j in range(size2 - len(reordered))])
 
                 # if column has been specified
                 if col:
@@ -1012,8 +1006,7 @@ def explore_db(self, db=None, table=None, col=None):
                         + ['' for j in range(size2 - len(tblcols_dict))])
                     col_dict = (self.db_dict[db]['tables'][table]
                                 ['columns'].keys())
-                    reordered = ([str(col)]
-                                 + [i for i in col_dict if i != col])
+                    reordered = ([str(col)] + [i for i in col_dict if i != col])
 
                     temp_columns = []
 
@@ -1031,14 +1024,12 @@ def explore_db(self, db=None, table=None, col=None):
 
                     if len(col_dict) < size2:
                         size_diff = size2 - len(col_dict)
-                        t['Columns'] = (temp_columns
-                                        + ['' for j in range(size_diff)])
+                        t['Columns'] = (temp_columns + ['' for j in range(size_diff)])
 
                         colinfo_dict = col_dict = columns[col]
                         t['Col. Info'] = (
                             ['{} : {}'.format(i, colinfo_dict[i])
-                             for i in colinfo_dict.keys()] +
-                            ['' for j in range(size2 - len(colinfo_dict))])
+                             for i in colinfo_dict.keys()] + ['' for j in range(size2 - len(colinfo_dict))])
                     else:
                         t['Columns'] = temp_columns
 
@@ -1053,20 +1044,17 @@ def explore_db(self, db=None, table=None, col=None):
                         tmp_table = self.db_dict[db]['tables'][table]
                         t['Table Items'] = (
                             ['@ {}'.format(i) if isinstance(tmp_table[i], dict)
-                             else '{}:'.format(i) for i in tblcols_dict]
-                            + ['' for i in range(size_diff)])
+                             else '{}:'.format(i) for i in tblcols_dict] + ['' for i in range(size_diff)])
                         t['Table Info'] = (
                             [str(tmp_table[i])
                              if not isinstance(tmp_table[i], dict)
-                             else '' for i in tblcols_dict]
-                            + ['' for i in range(size_diff)])
+                             else '' for i in tblcols_dict] + ['' for i in range(size_diff)])
                         if len(col_dict) < size2:
                             t['Columns'] = (
                                 ['@ {}'.format(i)
                                  if isinstance(tmp_table['columns'][i], dict)
                                  else str(i)
-                                 for i in reordered] +
-                                ['' for i in range(size2 - len(col_dict))])
+                                 for i in reordered] + ['' for i in range(size2 - len(col_dict))])
                         else:
                             t['Columns'] = reordered
                     else:

astroquery/esa/hubble/core.py

@@ -164,7 +164,8 @@ def get_hap_hst_link(self, observation_id):
         elif 'HAP' in observation_type:
             oids = self._select_related_members(observation_id)
         elif 'HST' in observation_type:
-            query = f"select observation_id from ehst.observation where obs_type='HAP Simple' and members like '%{observation_id}%'"
+            query = ("select observation_id from ehst.observation where obs_type='HAP Simple' "
+                     f"and members like '%{observation_id}%'")
             job = self.query_tap(query=query)
             oids = job["observation_id"].pformat(show_name=False)
         else:

astroquery/esasky/core.py

@@ -1004,7 +1004,7 @@ def query_ids_spectra(self, observation_ids, *, missions=__ALL_STRING, row_limit
         --------
         query_ids_spectra(observation_ids=['0001730501', '0011420101'], missions='XMM-NEWTON')
         query_ids_spectra(observation_ids='0001730501')
-        query_ids_spectra(observation_ids=['0001730501', '0011420101', '1342246640'], missions=['XMM-NEWTON', 'Herschel'])
+        query_ids_spectra(observation_ids=['0001730501', '1342246640'], missions=['XMM-NEWTON', 'Herschel'])
         """
         sanitized_observation_ids = self._sanitize_input_ids(observation_ids)
         sanitized_missions = self._sanitize_input_spectra(missions)
@@ -1146,8 +1146,10 @@ def get_images(self, *, position=None, observation_ids=None, radius=__ZERO_ARCMI
         --------
         get_images(position="m101", radius="14'", missions="all")
 
-        missions = ["SUZAKU", "ISO-IR", "Chandra", "XMM-OM-OPTICAL", "XMM", "XMM-OM-UV", "HST-IR", "Herschel", "Spitzer", "HST-UV", "HST-OPTICAL"]
-        observation_ids = ["100001010", "01500403", "21171", "0852000101", "0851180201", "0851180201", "n3tr01c3q", "1342247257", "30002561-25100", "hst_07553_3h_wfpc2_f160bw_pc", "ocli05leq"]
+        missions = ["SUZAKU", "ISO-IR", "Chandra", "XMM-OM-OPTICAL", "XMM", "XMM-OM-UV", "HST-IR", "Herschel",
+                    "Spitzer", "HST-UV", "HST-OPTICAL"]
+        observation_ids = ["100001010", "01500403", "21171", "0852000101", "0851180201", "0851180201", "n3tr01c3q",
+                           "1342247257", "30002561-25100", "hst_07553_3h_wfpc2_f160bw_pc", "ocli05leq"]
         get_images(observation_ids=observation_ids, missions=missions)
         """
         if position is None and observation_ids is None:
@@ -1242,7 +1244,7 @@ def get_spectra(self, *, position=None, observation_ids=None, radius=__ZERO_ARCM
         get_spectra(position="m101", radius="14'", missions=["HST-IR", "XMM-NEWTON", "HERSCHEL"])
 
         missions = ["ISO-IR", "Chandra", "IUE", "XMM-NEWTON", "HST-IR", "Herschel", "HST-UV", "HST-OPTICAL"]
-        observation_ids = ["02101201", "1005", "LWR13178", "0001730201", "ibh706cqq", "1342253595", "z1ax0102t", "oeik2s020"]
+        observation_ids = ["02101201", "1005", "LWR13178", "0001730201", "ibh706cqq", "1342253595", "oeik2s020"]
         get_spectra(observation_ids=observation_ids, missions=missions)
 
         """
@@ -1772,8 +1774,8 @@ def _build_id_query(self, ids, row_limit, json):
         if data_type in self._NUMBER_DATA_TYPES:
             valid_ids = [int(obs_id) for obs_id in ids if obs_id.isdigit()]
             if not valid_ids:
-                raise ValueError("Could not construct query for mission {}. Database column type is a number, "
-                         "while none of the input id's could be interpreted as numbers.".format(json['mission']))
+                raise ValueError(f"Could not construct query for mission {json['mission']}. Database column type is "
+                                 "a number, while none of the input id's could be interpreted as numbers.")
                 return ""
 
         observation_ids_query_list = ", ".join(repr(id) for id in valid_ids)