Fix flake8 F codes

Author: jdavies-st

astroquery/__init__.py

@@ -9,14 +9,16 @@
 # Affiliated packages may add whatever they like to this file, but
 # should keep this content at the top.
 # ----------------------------------------------------------------------------
-from ._astropy_init import *
+from ._astropy_init import __version__, __githash__, test
 # ----------------------------------------------------------------------------
 
 import os
 import logging
 
 from .logger import _init_log
 
+__all__ = ["__version__", "__githash__", "__citation__", "__bibtex__", "test", "log"]
+
 
 # Set the bibtex entry to the article referenced in CITATION.
 def _get_bibtex():
@@ -32,18 +34,6 @@ def _get_bibtex():
 __citation__ = __bibtex__ = _get_bibtex()
 
 
-try:
-    from .version import version as __version__
-except ImportError:
-    # TODO: Issue a warning using the logging framework
-    __version__ = ''
-try:
-    from .version import githash as __githash__
-except ImportError:
-    # TODO: Issue a warning using the logging framework
-    __githash__ = ''
-
-
 # Setup logging for astroquery
 logging.addLevelName(5, "TRACE")
 log = logging.getLogger()

astroquery/alfalfa/__init__.py

@@ -8,9 +8,13 @@
 This package is for querying the ALFALFA data repository hosted at
 http://arecibo.tc.cornell.edu/hiarchive/alfalfa/
 """
+import warnings
 
 from .core import Alfalfa, AlfalfaClass
 
-import warnings
+
+__all__ = ["Alfalfa", "AlfalfaClass"]
+
+
 warnings.warn("Experimental: ALFALFA has not yet been refactored to have "
               "its API match the rest of astroquery.")

astroquery/alma/core.py

@@ -833,7 +833,7 @@ def retrieve_data_from_uid(self, uids, *, cache=True):
         if len(files) == 1:
             file_urls = files['access_url']
             if isinstance(file_urls, str) and file_urls == '':
-                raise ValueError(f"Cannot download uid {uid} because it has no file")
+                raise ValueError(f"Cannot download uid {uids} because it has no file")
         else:
             file_urls = [url for url in files['access_url'] if url]
 

astroquery/alma/tests/test_alma.py

@@ -1,11 +1,8 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-from cmath import exp
 from io import StringIO
 import os
 
 import pytest
-import requests
-import unittest
 from unittest.mock import patch, Mock
 
 from astropy import units as u
@@ -14,7 +11,6 @@
 from astropy.coordinates import SkyCoord
 from astropy.time import Time
 
-import astroquery.alma
 from astroquery.alma import Alma
 from astroquery.alma.core import _gen_sql, _OBSCORE_TO_ALMARESULT
 from astroquery.alma.tapsql import _val_parse

astroquery/alma/tests/test_alma_utils.py

@@ -1,15 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import numpy as np
-import pytest
-import warnings
-
-from astropy import wcs
-from astropy import units as u
-try:
-    from pyregion.parser_helper import Shape
-    pyregion_OK = True
-except ImportError:
-    pyregion_OK = False
 
 from .. import utils
 

astroquery/astrometry_net/core.py

@@ -4,7 +4,6 @@
 import json
 
 from astropy.io import fits
-from astroquery import log
 from astropy.stats import sigma_clipped_stats
 from astropy.coordinates import SkyCoord
 

astroquery/cadc/core.py

@@ -18,8 +18,6 @@
 from ..utils import async_to_sync, commons
 from ..query import BaseQuery
 from bs4 import BeautifulSoup
-from astropy.utils.exceptions import AstropyDeprecationWarning
-from astropy.utils.decorators import deprecated
 from astropy import units as u
 import pyvo
 from pyvo.auth import authsession
@@ -454,8 +452,8 @@ def get_image_list(self, query_result, coordinates, radius):
                             range(0, len(publisher_ids), batch_size)):
             datalink = pyvo.dal.adhoc.DatalinkResults.from_result_url(
                 '{}?{}'.format(self.data_link_url,
-                               urlencode({'ID': pid_sublist}, True),
-                               session=self.cadcdatalink._session))
+                               urlencode({'ID': pid_sublist}, True)),
+                               session=self.cadcdatalink._session)
             for service_def in datalink.bysemantics('#cutout'):
                 access_url = service_def.access_url
                 if isinstance(access_url, bytes):  # ASTROPY_LT_4_1

astroquery/casda/core.py

@@ -1,6 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-# 1. standard library imports
 from io import BytesIO
 import os
 from urllib.parse import unquote, urlparse
@@ -9,26 +8,20 @@
 from datetime import datetime, timezone
 import keyring
 
-# 2. third party imports
 import astropy.units as u
 import astropy.coordinates as coord
 from astropy.table import Table
 from astropy.io.votable import parse
 from astroquery import log
 import numpy as np
 
-# 3. local imports - use relative imports
 from ..query import QueryWithLogin
 from ..utils import commons
-# prepend_docstr is a way to copy docstrings between methods
-from ..utils import prepend_docstr_nosections
-# async_to_sync generates the relevant query tools from _async methods
 from ..utils import async_to_sync
-# import configurable items declared in __init__.py
 from . import conf
 from ..exceptions import LoginError
 
-# export all the public classes and methods
+
 __all__ = ['Casda', 'CasdaClass']
 
 

astroquery/casda/tests/test_casda.py

@@ -18,7 +18,7 @@
 from astroquery.exceptions import LoginError
 
 try:
-    from unittest.mock import Mock, patch, MagicMock
+    from unittest.mock import Mock, MagicMock
 except ImportError:
     pytest.skip("Install mock for the casda tests.", allow_module_level=True)
 
@@ -137,7 +137,7 @@ def test_login_no_default_user():
     assert casda._authenticated is False
     assert casda.USERNAME == ''
 
-    with pytest.raises(LoginError, match=r"If you do not pass a username to login\(\),") as excinfo:
+    with pytest.raises(LoginError, match=r"If you do not pass a username to login\(\),"):
         Casda.login()
 
     assert casda._authenticated is False
@@ -285,7 +285,7 @@ def test_filter_out_unreleased():
 def test_stage_data_unauthorised(patch_get):
     table = Table()
 
-    with pytest.raises(ValueError, match=r"Credentials must be supplied") as excinfo:
+    with pytest.raises(ValueError, match=r"Credentials must be supplied"):
         Casda.stage_data(table)
 
 
@@ -308,7 +308,7 @@ def test_stage_data_invalid_credentials(patch_get):
     casda._auth = (USERNAME, 'notthepassword')
     casda._authenticated = True
 
-    with pytest.raises(requests.exceptions.HTTPError) as excinfo:
+    with pytest.raises(requests.exceptions.HTTPError):
         casda.stage_data(table)
 
 
@@ -320,7 +320,7 @@ def test_stage_data_no_link(patch_get):
     fake_login(casda, USERNAME, PASSWORD)
     casda.POLL_INTERVAL = 1
 
-    with pytest.raises(ValueError, match=r"You do not have access to any of the requested data files\.") as excinfo:
+    with pytest.raises(ValueError, match=r"You do not have access to any of the requested data files\."):
         casda.stage_data(table)
 
 
@@ -357,16 +357,12 @@ def test_cutout_no_args(patch_get):
     prefix = 'https://somewhere/casda/datalink/links?'
     access_urls = [prefix + 'cube-244']
     table = Table([Column(data=access_urls, name='access_url')])
-    ra = 333.9092*u.deg
-    dec = -45.8418*u.deg
-    radius = 30*u.arcmin
-    centre = SkyCoord(ra, dec)
 
     casda = Casda()
     fake_login(casda, USERNAME, PASSWORD)
     casda.POLL_INTERVAL = 1
     with pytest.raises(ValueError,
-            match=r"Please provide cutout parameters such as coordinates, band or channel\.") as excinfo:
+            match=r"Please provide cutout parameters such as coordinates, band or channel\."):
         casda.cutout(table)
 
 
@@ -379,7 +375,7 @@ def test_cutout_unauthorised(patch_get):
     radius = 30*u.arcmin
     centre = SkyCoord(ra, dec)
 
-    with pytest.raises(ValueError, match=r"Credentials must be supplied to download CASDA image data") as excinfo:
+    with pytest.raises(ValueError, match=r"Credentials must be supplied to download CASDA image data"):
         Casda.cutout(table, coordinates=centre, radius=radius, verbose=True)
 
 

astroquery/cds/tests/test_mocserver.py

@@ -8,22 +8,16 @@
 from astropy import coordinates
 from astropy.table import Table
 
-try:
-    from mocpy import MOC
-    HAS_MOCPY = True
-except ImportError:
-    HAS_MOCPY = False
-
-try:
-    from regions import CircleSkyRegion, PolygonSkyRegion
-    HAS_REGIONS = True
-except ImportError:
-    HAS_REGIONS = False
-
 from ..core import cds
 from astroquery.utils.mocks import MockResponse
 
 
+pytest.importorskip("mocpy")
+pytest.importorskip("regions")
+
+from regions import CircleSkyRegion, PolygonSkyRegion
+
+
 DATA_FILES = {
     'PROPERTIES_SEARCH': 'properties.json',
     'HIPS_FROM_SAADA_AND_ALASKY': 'hips_from_saada_alasky.json',
@@ -72,8 +66,6 @@ def data_path(filename):
 """
 
 
-@pytest.mark.skipif('not HAS_REGIONS')
-@pytest.mark.skipif('not HAS_MOCPY')
 @pytest.mark.parametrize('datafile',
                          ['PROPERTIES_SEARCH', 'HIPS_FROM_SAADA_AND_ALASKY'])
 def test_request_results(patch_get, datafile):
@@ -97,8 +89,6 @@ def test_request_results(patch_get, datafile):
 """
 
 
-@pytest.mark.skipif('not HAS_REGIONS')
-@pytest.mark.skipif('not HAS_MOCPY')
 @pytest.mark.parametrize('RA, DEC, RADIUS',
                          [(10.8, 6.5, 0.5),
                           (25.6, -23.2, 1.1),
@@ -117,8 +107,6 @@ def test_cone_search_spatial_request(RA, DEC, RADIUS):
            (request_payload['SR'] == str(RADIUS))
 
 
-@pytest.mark.skipif('not HAS_REGIONS')
-@pytest.mark.skipif('not HAS_MOCPY')
 @pytest.mark.parametrize('poly, poly_payload',
                          [(polygon1, 'Polygon 57.376 24.053 56.391 24.622 56.025 24.049 56.616 24.291'),
                           (polygon2, 'Polygon 58.376 24.053 53.391 25.622 56.025 22.049 54.616 27.291')])
@@ -132,8 +120,6 @@ def test_polygon_spatial_request(poly, poly_payload):
     assert request_payload['stc'] == poly_payload
 
 
-@pytest.mark.skipif('not HAS_REGIONS')
-@pytest.mark.skipif('not HAS_MOCPY')
 @pytest.mark.parametrize('intersect',
                          ['encloses', 'overlaps', 'covers'])
 def test_intersect_param(intersect):