Fix issues reported by pyflakes and add pyflakes step to ci, fixes #3756

.github/workflows/ci.yml

@@ -2,6 +2,22 @@ name: CI
 on: [push, pull_request]
 
 jobs:
+  pyflakes:
+    name: pyflakes
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
+      - name: Install pyflakes
+        run: python -m pip install pyflakes
+
+      - name: Run pyflakes
+        run: pyflakes gammapy
+
   basic:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}

docs/tutorials/api/models.ipynb

@@ -1098,7 +1098,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from gammapy.modeling.models import SpectralModel, Parameter\n",
+    "from gammapy.modeling import Parameter\n",
+    "from gammapy.modeling.models import SpectralModel\n",
     "\n",
     "\n",
     "class MyCustomSpectralModel(SpectralModel):\n",
@@ -1364,7 +1365,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -1378,7 +1379,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.12"
   },
   "latex_envs": {
    "LaTeX_envs_menu_present": true,

gammapy/analysis/__init__.py

@@ -1,4 +1,10 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Gammapy high level interface (analysis)."""
-from .config import *
-from .core import *
+from .config import AnalysisConfig
+from .core import Analysis
+
+
+__all__ = [
+    "Analysis",
+    "AnalysisConfig",
+]

gammapy/astro/darkmatter/__init__.py

@@ -1,4 +1,14 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Dark matter spatial and spectral models."""
-from .spectra import *
-from .utils import *
+from .spectra import (
+    PrimaryFlux,
+    DarkMatterAnnihilationSpectralModel,
+)
+from .utils import JFactory
+
+
+__all__ = [
+    "DarkMatterAnnihilationSpectralModel",
+    "JFactory",
+    "PrimaryFlux",
+]

gammapy/astro/darkmatter/profiles.py

@@ -7,12 +7,12 @@
 from gammapy.modeling.models.spectral import integrate_spectrum
 
 __all__ = [
+    "BurkertProfile",
     "DMProfile",
-    "NFWProfile",
     "EinastoProfile",
     "IsothermalProfile",
-    "BurkertProfile",
     "MooreProfile",
+    "NFWProfile",
 ]
 
 

gammapy/astro/population/__init__.py

@@ -1,5 +1,58 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Astrophysical population models."""
-from .simulate import *
-from .spatial import *
-from .velocity import *
+
+from .simulate import (
+    make_catalog_random_positions_cube,
+    make_catalog_random_positions_sphere,
+    make_base_catalog_galactic,
+    add_snr_parameters,
+    add_pulsar_parameters,
+    add_pwn_parameters,
+    add_observed_parameters,
+)
+
+from .spatial import (
+    CaseBattacharya1998,
+    FaucherKaspi2006,
+    Lorimer2006,
+    Paczynski1990,
+    YusifovKucuk2004,
+    YusifovKucuk2004B,
+    Exponential,
+    LogSpiral,
+    FaucherSpiral,
+    ValleeSpiral,
+    radial_distributions,
+)
+from .velocity import (
+    FaucherKaspi2006VelocityMaxwellian,
+    FaucherKaspi2006VelocityBimodal,
+    Paczynski1990Velocity,
+    velocity_distributions,
+)
+
+
+__all__ = [
+    "add_observed_parameters",
+    "add_pulsar_parameters",
+    "add_pwn_parameters",
+    "add_snr_parameters",
+    "CaseBattacharya1998",
+    "Exponential",
+    "FaucherKaspi2006",
+    "FaucherKaspi2006VelocityBimodal",
+    "FaucherKaspi2006VelocityMaxwellian",
+    "FaucherSpiral",
+    "LogSpiral",
+    "Lorimer2006",
+    "make_base_catalog_galactic",
+    "make_catalog_random_positions_cube",
+    "make_catalog_random_positions_sphere",
+    "Paczynski1990",
+    "Paczynski1990Velocity",
+    "radial_distributions",
+    "ValleeSpiral",
+    "velocity_distributions",
+    "YusifovKucuk2004",
+    "YusifovKucuk2004B",
+]

gammapy/astro/population/simulate.py

@@ -25,13 +25,13 @@
 from .velocity import VMAX, VMIN, velocity_distributions
 
 __all__ = [
-    "make_catalog_random_positions_cube",
-    "make_catalog_random_positions_sphere",
-    "make_base_catalog_galactic",
-    "add_snr_parameters",
+    "add_observed_parameters",
     "add_pulsar_parameters",
     "add_pwn_parameters",
-    "add_observed_parameters",
+    "add_snr_parameters",
+    "make_base_catalog_galactic",
+    "make_catalog_random_positions_cube",
+    "make_catalog_random_positions_sphere",
 ]
 
 

gammapy/astro/population/spatial.py

@@ -8,16 +8,16 @@
 
 __all__ = [
     "CaseBattacharya1998",
+    "Exponential",
     "FaucherKaspi2006",
+    "FaucherSpiral",
+    "LogSpiral",
     "Lorimer2006",
     "Paczynski1990",
+    "radial_distributions",
+    "ValleeSpiral",
     "YusifovKucuk2004",
     "YusifovKucuk2004B",
-    "Exponential",
-    "LogSpiral",
-    "FaucherSpiral",
-    "ValleeSpiral",
-    "radial_distributions",
 ]
 
 # Simulation range used for random number drawing

gammapy/astro/population/velocity.py

@@ -5,8 +5,8 @@
 from astropy.units import Quantity
 
 __all__ = [
-    "FaucherKaspi2006VelocityMaxwellian",
     "FaucherKaspi2006VelocityBimodal",
+    "FaucherKaspi2006VelocityMaxwellian",
     "Paczynski1990Velocity",
     "velocity_distributions",
 ]

gammapy/astro/source/__init__.py

@@ -1,5 +1,13 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Astrophysical source models."""
-from .pulsar import *
-from .pwn import *
-from .snr import *
+from .pulsar import Pulsar, SimplePulsar
+from .pwn import PWN
+from .snr import SNR, SNRTrueloveMcKee
+
+__all__ = [
+    "Pulsar",
+    "PWN",
+    "SimplePulsar",
+    "SNR",
+    "SNRTrueloveMcKee",
+]

gammapy/catalog/__init__.py

@@ -1,11 +1,31 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Source catalogs."""
 from gammapy.utils.registry import Registry
-from .core import *
-from .fermi import *
-from .gammacat import *
-from .hawc import *
-from .hess import *
+from .core import SourceCatalog, SourceCatalogObject
+from .fermi import (
+    SourceCatalogObject4FGL,
+    SourceCatalogObject3FGL,
+    SourceCatalogObject2FHL,
+    SourceCatalogObject3FHL,
+    SourceCatalog4FGL,
+    SourceCatalog3FGL,
+    SourceCatalog2FHL,
+    SourceCatalog3FHL,
+)
+from .gammacat import SourceCatalogGammaCat, SourceCatalogObjectGammaCat
+
+from .hawc import (
+    SourceCatalog2HWC,
+    SourceCatalog3HWC,
+    SourceCatalogObject2HWC,
+    SourceCatalogObject3HWC,
+)
+from .hess import (
+    SourceCatalogHGPS,
+    SourceCatalogObjectHGPS,
+    SourceCatalogObjectHGPSComponent,
+    SourceCatalogLargeScaleHGPS,
+)
 
 CATALOG_REGISTRY = Registry(
     [
@@ -25,17 +45,23 @@
 __all__ = [
     "CATALOG_REGISTRY",
     "SourceCatalog",
-    "SourceCatalogObjectHGPS",
+    "SourceCatalog2FHL",
+    "SourceCatalog2HWC",
+    "SourceCatalog3FGL",
+    "SourceCatalog3FHL",
+    "SourceCatalog3HWC",
+    "SourceCatalog4FGL",
+    "SourceCatalogGammaCat",
+    "SourceCatalogHGPS",
+    "SourceCatalogLargeScaleHGPS",
+    "SourceCatalogObject",
     "SourceCatalogObject2FHL",
-    "SourceCatalogObject3FHL",
-    "SourceCatalogObject3FGL",
-    "SourceCatalogObject4FGL",
     "SourceCatalogObject2HWC",
+    "SourceCatalogObject3FGL",
+    "SourceCatalogObject3FHL",
     "SourceCatalogObject3HWC",
+    "SourceCatalogObject4FGL",
     "SourceCatalogObjectGammaCat",
+    "SourceCatalogObjectHGPS",
     "SourceCatalogObjectHGPSComponent",
-    "SourceCatalogLargeScaleHGPS",
-    "SourceCatalogObject",
 ]
-
-__all__.extend(cls.__name__ for cls in CATALOG_REGISTRY)

gammapy/catalog/fermi.py

@@ -22,14 +22,14 @@
 from .core import SourceCatalog, SourceCatalogObject, format_flux_points_table
 
 __all__ = [
-    "SourceCatalogObject4FGL",
-    "SourceCatalogObject3FGL",
-    "SourceCatalogObject2FHL",
-    "SourceCatalogObject3FHL",
-    "SourceCatalog4FGL",
-    "SourceCatalog3FGL",
     "SourceCatalog2FHL",
+    "SourceCatalog3FGL",
     "SourceCatalog3FHL",
+    "SourceCatalog4FGL",
+    "SourceCatalogObject2FHL",
+    "SourceCatalogObject3FGL",
+    "SourceCatalogObject3FHL",
+    "SourceCatalogObject4FGL",
 ]
 
 

gammapy/catalog/hess.py

@@ -15,9 +15,9 @@
 
 __all__ = [
     "SourceCatalogHGPS",
+    "SourceCatalogLargeScaleHGPS",
     "SourceCatalogObjectHGPS",
     "SourceCatalogObjectHGPSComponent",
-    "SourceCatalogLargeScaleHGPS",
 ]
 
 # Flux factor, used for printing

gammapy/conftest.py

@@ -3,7 +3,6 @@
 # by importing them here in conftest.py they are discoverable by py.test
 # no matter how it is invoked within the source tree.
 import os
-from astropy.tests.helper import enable_deprecations_as_exceptions
 from pytest_astropy_header.display import PYTEST_HEADER_MODULES
 
 # TODO: activate this again and handle deprecations in the code

gammapy/data/__init__.py

@@ -1,11 +1,26 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Data and observation handling."""
-from .data_store import *
-from .event_list import *
-from .filters import *
-from .gti import *
-from .hdu_index_table import *
-from .obs_table import *
-from .observations import *
-from .observers import *
-from .pointing import *
+from .data_store import DataStore
+from .event_list import EventList
+from .filters import ObservationFilter
+from .gti import GTI
+from .hdu_index_table import HDUIndexTable
+from .obs_table import ObservationTable
+from .observations import Observation, Observations
+from .observers import observatory_locations
+from .pointing import FixedPointingInfo, PointingInfo
+
+
+__all__ = [
+    "DataStore",
+    "EventList",
+    "FixedPointingInfo",
+    "GTI",
+    "HDUIndexTable",
+    "Observation",
+    "ObservationFilter",
+    "Observations",
+    "ObservationTable",
+    "observatory_locations",
+    "PointingInfo",
+]