astropy · nstarman · Oct 22, 2021 · Nov 11, 2021
@@ -12,10 +12,12 @@ repos:
   - id: trailing-whitespace
     exclude: ".*(data.*|extern.*|licenses.*|_parsetab.py|test_cds.py)$"
 
-# - repo: https://github.com/timothycrosley/isort
-#   rev: 5.9.2
-#   hooks:
-#   - id: isort
+- repo: https://github.com/pycqa/isort
+  rev: 5.8.0
+  hooks:
+    - id: isort
+      name: isort (python)
+      additional_dependencies: ["toml"]
 # - repo: https://github.com/asottile/pyupgrade
 #   rev: v2.21.0
 #   hooks:

diff --git a/astropy/config/__init__.py b/astropy/config/__init__.py
@@ -6,6 +6,6 @@
 affiliated package index.
 """
 
-from .paths import *
-from .configuration import *
 from .affiliated import *
+from .configuration import *
+from .paths import *
diff --git a/astropy/config/configuration.py b/astropy/config/configuration.py
@@ -9,16 +9,16 @@
     found at https://configobj.readthedocs.io .
 """
 
+import contextlib
+import importlib
 import io
+import os
 import pkgutil
 import warnings
-import importlib
-import contextlib
-import os
+from contextlib import contextmanager, nullcontext
 from os import path
 from textwrap import TextWrapper
 from warnings import warn
-from contextlib import contextmanager, nullcontext
 
 from astropy.extern.configobj import configobj, validate
 from astropy.utils import find_current_module, silence

diff --git a/astropy/config/paths.py b/astropy/config/paths.py
@@ -3,12 +3,10 @@
 data/cache files used by Astropy should be placed.
 """
 
-from functools import wraps
-
 import os
 import shutil
 import sys
-
+from functools import wraps
 
 __all__ = ['get_config_dir', 'get_cache_dir', 'set_temp_config',
            'set_temp_cache']

diff --git a/astropy/config/tests/test_configs.py b/astropy/config/tests/test_configs.py
@@ -3,17 +3,15 @@
 
 import io
 import os
-import sys
 import subprocess
+import sys
 
 import pytest
 
-from astropy.config import (configuration, set_temp_config, paths,
-                            create_config_file)
+from astropy.config import configuration, create_config_file, paths, set_temp_config
 from astropy.utils.data import get_pkg_data_filename
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
-
 OLD_CONFIG = {}
 
 
@@ -227,7 +225,7 @@ def test_create_config_file(tmp_path, caplog):
 
 def test_configitem():

-    from astropy.config.configuration import ConfigNamespace, ConfigItem, get_config
+    from astropy.config.configuration import ConfigItem, ConfigNamespace, get_config
 
     ci = ConfigItem(34, 'this is a Description')
 
@@ -268,7 +266,7 @@ class Conf(ConfigNamespace):
 
 def test_configitem_types():
 
-    from astropy.config.configuration import ConfigNamespace, ConfigItem
+    from astropy.config.configuration import ConfigItem, ConfigNamespace
 
     ci1 = ConfigItem(34)
     ci2 = ConfigItem(34.3)
@@ -309,7 +307,7 @@ class Conf(ConfigNamespace):
 
 def test_configitem_options(tmpdir):
 
-    from astropy.config.configuration import ConfigNamespace, ConfigItem, get_config
+    from astropy.config.configuration import ConfigItem, ConfigNamespace, get_config
 
     cio = ConfigItem(['op1', 'op2', 'op3'])
 
@@ -373,7 +371,7 @@ def osraiser(dirnm, linkto, pkgname=None):
 
 def test_configitem_setters():
 
-    from astropy.config.configuration import ConfigNamespace, ConfigItem
+    from astropy.config.configuration import ConfigItem, ConfigNamespace
 
     class Conf(ConfigNamespace):
         tstnm12 = ConfigItem(42, 'this is another Description')
@@ -441,7 +439,7 @@ def teardown_class(self):
 
 def test_configitem_unicode(tmpdir):
 
-    from astropy.config.configuration import ConfigNamespace, ConfigItem, get_config
+    from astropy.config.configuration import ConfigItem, ConfigNamespace, get_config
 
     cio = ConfigItem('ასტრონომიის')
 

@@ -4,6 +4,6 @@
 from .convolve import (convolve, convolve_fft, convolve_models,
                        convolve_models_fft, interpolate_replace_nans)
 from .core import *
-from .kernels import *
-from .kernels import MexicanHat1DKernel, MexicanHat2DKernel  # Deprecated kernels
+from .kernels import *  # ↓ Import deprecated kernels. Will be removed.
+from .kernels import MexicanHat1DKernel, MexicanHat2DKernel
 from .utils import *
@@ -7,7 +7,8 @@
 
 import numpy as np
 import numpy.ma as ma
-from numpy.testing import assert_allclose, assert_array_almost_equal, assert_array_almost_equal_nulp
+from numpy.testing import (assert_allclose, assert_array_almost_equal,
+                           assert_array_almost_equal_nulp)
 
 from astropy import units as u
 from astropy.convolution.convolve import convolve, convolve_fft

diff --git a/astropy/coordinates/__init__.py b/astropy/coordinates/__init__.py
@@ -1,4 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+# isort: skip_file
 
 """
 This subpackage contains classes and functions for celestial coordinates

diff --git a/astropy/coordinates/angle_formats.py b/astropy/coordinates/angle_formats.py
@@ -23,11 +23,11 @@
 
 import numpy as np
 
-from .errors import (IllegalHourWarning, IllegalHourError,
-                     IllegalMinuteWarning, IllegalMinuteError,
-                     IllegalSecondWarning, IllegalSecondError)
-from astropy.utils import format_exception, parsing
 from astropy import units as u
+from astropy.utils import format_exception, parsing
+
+from .errors import (IllegalHourError, IllegalHourWarning, IllegalMinuteError,
+                     IllegalMinuteWarning, IllegalSecondError, IllegalSecondWarning)
 
 
 class _AngleParser:

diff --git a/astropy/coordinates/angle_utilities.py b/astropy/coordinates/angle_utilities.py
@@ -14,9 +14,7 @@
 
 # Astropy
 import astropy.units as u
-from astropy.coordinates.representation import (
-    UnitSphericalRepresentation,
-    SphericalRepresentation)
+from astropy.coordinates.representation import SphericalRepresentation, UnitSphericalRepresentation
 
 
 def angular_separation(lon1, lat1, lon2, lat2):
@@ -232,9 +230,10 @@ def uniform_spherical_random_volume(size=1, max_radius=1):
     return SphericalRepresentation(usph.lon, usph.lat, r)
 
 
+from astropy.coordinates import angle_formats
 # # below here can be deleted in v5.0
 from astropy.utils.decorators import deprecated
-from astropy.coordinates import angle_formats
+
 __old_angle_utilities_funcs = ['check_hms_ranges', 'degrees_to_dms',
                                'degrees_to_string', 'dms_to_degrees',
                                'format_exception', 'hms_to_degrees',

diff --git a/astropy/coordinates/angles.py b/astropy/coordinates/angles.py
@@ -11,10 +11,11 @@
 
 import numpy as np
 
-from . import angle_formats as form
 from astropy import units as u
 from astropy.utils import isiterable
 
+from . import angle_formats as form
+
 __all__ = ['Angle', 'Latitude', 'Longitude']
 
 

diff --git a/astropy/coordinates/attributes.py b/astropy/coordinates/attributes.py
@@ -521,4 +521,4 @@ def convert_input(self, value):
 
 # do this here to prevent a series of complicated circular imports
 from .earth import EarthLocation
-from .representation import CartesianRepresentation, BaseDifferential
+from .representation import BaseDifferential, CartesianRepresentation
diff --git a/astropy/coordinates/baseframe.py b/astropy/coordinates/baseframe.py
@@ -9,23 +9,23 @@
 # Standard library
 import copy
 import inspect
-from collections import namedtuple, defaultdict
 import warnings
+from collections import defaultdict, namedtuple
 
 # Dependencies
 import numpy as np
 
-# Project
-from astropy.utils.compat.misc import override__dir__
-from astropy.utils.decorators import lazyproperty, format_doc
-from astropy.utils.exceptions import AstropyWarning, AstropyDeprecationWarning
 from astropy import units as u
 from astropy.utils import ShapedLikeNDArray, check_broadcast
-from .transformations import TransformGraph
+# Project
+from astropy.utils.compat.misc import override__dir__
+from astropy.utils.decorators import format_doc, lazyproperty
+from astropy.utils.exceptions import AstropyDeprecationWarning, AstropyWarning
+
 from . import representation as r
 from .angles import Angle
 from .attributes import Attribute
-
+from .transformations import TransformGraph
 
 __all__ = ['BaseCoordinateFrame', 'frame_transform_graph',
            'GenericFrame', 'RepresentationMapping']

diff --git a/astropy/coordinates/builtin_frames/__init__.py b/astropy/coordinates/builtin_frames/__init__.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
+# isort: skip_file
+
 """
 This package contains the coordinate frames implemented by astropy.
 

diff --git a/astropy/coordinates/builtin_frames/altaz.py b/astropy/coordinates/builtin_frames/altaz.py
@@ -4,12 +4,10 @@
 import numpy as np
 
 from astropy import units as u
-from astropy.utils.decorators import format_doc
 from astropy.coordinates import representation as r
+from astropy.coordinates.attributes import EarthLocationAttribute, QuantityAttribute, TimeAttribute
 from astropy.coordinates.baseframe import BaseCoordinateFrame, RepresentationMapping, base_doc
-from astropy.coordinates.attributes import (TimeAttribute,
-                                            QuantityAttribute,
-                                            EarthLocationAttribute)
+from astropy.utils.decorators import format_doc
 
 __all__ = ['AltAz']
 

diff --git a/astropy/coordinates/builtin_frames/baseradec.py b/astropy/coordinates/builtin_frames/baseradec.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-from astropy.utils.decorators import format_doc
 from astropy.coordinates import representation as r
 from astropy.coordinates.baseframe import BaseCoordinateFrame, RepresentationMapping, base_doc
+from astropy.utils.decorators import format_doc
 
 __all__ = ['BaseRADecFrame']
 

diff --git a/astropy/coordinates/builtin_frames/cirs.py b/astropy/coordinates/builtin_frames/cirs.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-from astropy.utils.decorators import format_doc
-from astropy.coordinates.attributes import (TimeAttribute,
-                                            EarthLocationAttribute)
+from astropy.coordinates.attributes import EarthLocationAttribute, TimeAttribute
 from astropy.coordinates.baseframe import base_doc
-from .baseradec import doc_components, BaseRADecFrame
+from astropy.utils.decorators import format_doc
+
+from .baseradec import BaseRADecFrame, doc_components
 from .utils import DEFAULT_OBSTIME, EARTH_CENTER
 
 __all__ = ['CIRS']

diff --git a/astropy/coordinates/builtin_frames/cirs_observed_transforms.py b/astropy/coordinates/builtin_frames/cirs_observed_transforms.py
@@ -4,20 +4,20 @@
 Contains the transformation functions for getting to "observed" systems from CIRS.
 """
 
-import numpy as np
 import erfa
 
+import numpy as np
+
 from astropy import units as u
 from astropy.coordinates.baseframe import frame_transform_graph
+from astropy.coordinates.representation import SphericalRepresentation, UnitSphericalRepresentation
 from astropy.coordinates.transformations import FunctionTransformWithFiniteDifference
-from astropy.coordinates.representation import (SphericalRepresentation,
-                                                UnitSphericalRepresentation)
 
-from .cirs import CIRS
+from ..erfa_astrom import erfa_astrom
 from .altaz import AltAz
+from .cirs import CIRS
 from .hadec import HADec
 from .utils import PIOVER2
-from ..erfa_astrom import erfa_astrom
 
 
 @frame_transform_graph.transform(FunctionTransformWithFiniteDifference, CIRS, AltAz)

diff --git a/astropy/coordinates/builtin_frames/ecliptic.py b/astropy/coordinates/builtin_frames/ecliptic.py
@@ -2,11 +2,12 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
 from astropy import units as u
-from astropy.utils.decorators import format_doc
 from astropy.coordinates import representation as r
+from astropy.coordinates.attributes import QuantityAttribute, TimeAttribute
 from astropy.coordinates.baseframe import BaseCoordinateFrame, base_doc
-from astropy.coordinates.attributes import TimeAttribute, QuantityAttribute
-from .utils import EQUINOX_J2000, DEFAULT_OBSTIME
+from astropy.utils.decorators import format_doc
+
+from .utils import DEFAULT_OBSTIME, EQUINOX_J2000
 
 __all__ = ['GeocentricMeanEcliptic', 'BarycentricMeanEcliptic',
            'HeliocentricMeanEcliptic', 'BaseEclipticFrame',

diff --git a/astropy/coordinates/builtin_frames/ecliptic_transforms.py b/astropy/coordinates/builtin_frames/ecliptic_transforms.py
@@ -7,21 +7,17 @@
 
 from astropy import units as u
 from astropy.coordinates.baseframe import frame_transform_graph
-from astropy.coordinates.transformations import (
-    FunctionTransformWithFiniteDifference, DynamicMatrixTransform,
-    AffineTransform,
-)
-from astropy.coordinates.matrix_utilities import (rotation_matrix,
-                                                  matrix_product,
-                                                  matrix_transpose)
+from astropy.coordinates.errors import UnitsError
+from astropy.coordinates.matrix_utilities import matrix_product, matrix_transpose, rotation_matrix
+from astropy.coordinates.transformations import (AffineTransform, DynamicMatrixTransform,
+                                                 FunctionTransformWithFiniteDifference)
 
-from .icrs import ICRS
+from .ecliptic import (BarycentricMeanEcliptic, BarycentricTrueEcliptic, CustomBarycentricEcliptic,
+                       GeocentricMeanEcliptic, GeocentricTrueEcliptic, HeliocentricEclipticIAU76,
+                       HeliocentricMeanEcliptic, HeliocentricTrueEcliptic)
 from .gcrs import GCRS
-from .ecliptic import (GeocentricMeanEcliptic, BarycentricMeanEcliptic, HeliocentricMeanEcliptic,
-                       GeocentricTrueEcliptic, BarycentricTrueEcliptic, HeliocentricTrueEcliptic,
-                       HeliocentricEclipticIAU76, CustomBarycentricEcliptic)
-from .utils import get_jd12, get_offset_sun_from_barycenter, EQUINOX_J2000
-from astropy.coordinates.errors import UnitsError
+from .icrs import ICRS
+from .utils import EQUINOX_J2000, get_jd12, get_offset_sun_from_barycenter
 
 
 def _mean_ecliptic_rotation_matrix(equinox):

diff --git a/astropy/coordinates/builtin_frames/equatorial.py b/astropy/coordinates/builtin_frames/equatorial.py
@@ -12,11 +12,12 @@
 hour angle.
 """
 
-from astropy.utils.decorators import format_doc
-from astropy.coordinates.representation import (CartesianRepresentation, CartesianDifferential)
+from astropy.coordinates.attributes import EarthLocationAttribute, TimeAttribute
 from astropy.coordinates.baseframe import BaseCoordinateFrame, base_doc
 from astropy.coordinates.builtin_frames.baseradec import BaseRADecFrame, doc_components
-from astropy.coordinates.attributes import TimeAttribute, EarthLocationAttribute
+from astropy.coordinates.representation import CartesianDifferential, CartesianRepresentation
+from astropy.utils.decorators import format_doc
+
 from .utils import DEFAULT_OBSTIME, EARTH_CENTER
 
 __all__ = ['TEME', 'TETE']