SciTools · trexfeathers · Jun 18, 2021 · Jun 2, 2021 · Jun 2, 2021 · Jun 2, 2021
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -116,7 +116,7 @@ lint_task:
     image: python:3.8
     cpu: 2
     memory: 4G
-  name: "${CIRRUS_OS}: flake8 and black"
+  name: "${CIRRUS_OS}: black, flake8 and isort"
   pip_cache:
     folder: ~/.cache/pip
     fingerprint_script:
@@ -126,8 +126,9 @@ lint_task:
     - pip list
     - python -m pip install --retries 3 --upgrade ${PIP_CACHE_PACKAGES}
     - pip list
-    - nox --session flake8
     - nox --session black
+    - nox --session flake8
+    - nox --session isort
 
 
 #

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,3 +29,9 @@ repos:
         # Run flake8.
     -   id: flake8
         args: [--config=./setup.cfg]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.8.0
+    hooks:
+    -   id: isort
+        name: isort
+        args: ["--profile", "black", "--filter-files"]
diff --git a/docs/gallery_code/general/plot_anomaly_log_colouring.py b/docs/gallery_code/general/plot_anomaly_log_colouring.py
@@ -26,8 +26,8 @@
 """
 
 import cartopy.crs as ccrs
-import matplotlib.pyplot as plt
 import matplotlib.colors as mcols
+import matplotlib.pyplot as plt
 
 import iris
 import iris.coord_categorisation

diff --git a/docs/gallery_code/general/plot_coriolis.py b/docs/gallery_code/general/plot_coriolis.py
@@ -12,7 +12,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-
 import iris
 from iris.coord_systems import GeogCS
 import iris.plot as iplt

diff --git a/docs/gallery_code/general/plot_custom_file_loading.py b/docs/gallery_code/general/plot_custom_file_loading.py
@@ -57,18 +57,17 @@
 
 import datetime
 
-from cf_units import Unit, CALENDAR_GREGORIAN
+from cf_units import CALENDAR_GREGORIAN, Unit
 import matplotlib.pyplot as plt
 import numpy as np
 
 import iris
-import iris.coords as icoords
 import iris.coord_systems as icoord_systems
+import iris.coords as icoords
 import iris.fileformats
 import iris.io.format_picker as format_picker
 import iris.plot as iplt
 
-
 UTC_format = "%H%M%Z %d/%m/%Y"
 
 FLOAT_HEADERS = [

diff --git a/docs/gallery_code/general/plot_inset.py b/docs/gallery_code/general/plot_inset.py
@@ -13,8 +13,8 @@
 import numpy as np
 
 import iris
-import iris.quickplot as qplt
 import iris.plot as iplt
+import iris.quickplot as qplt
 
 
 def main():

diff --git a/docs/gallery_code/general/plot_projections_and_annotations.py b/docs/gallery_code/general/plot_projections_and_annotations.py
@@ -21,7 +21,6 @@
 import iris
 import iris.plot as iplt
 
-
 # Define a Cartopy 'ordinary' lat-lon coordinate reference system.
 crs_latlon = ccrs.PlateCarree()
 

diff --git a/docs/gallery_tests/gallerytest_util.py b/docs/gallery_tests/gallerytest_util.py
@@ -12,8 +12,8 @@
 
 import contextlib
 import os.path
-import warnings
 import sys
+import warnings
 
 import matplotlib.pyplot as plt
 
@@ -22,7 +22,6 @@
 import iris.plot as iplt
 import iris.quickplot as qplt
 
-
 GALLERY_DIRECTORY = os.path.join(
     os.path.dirname(os.path.dirname(__file__)), "gallery_code"
 )

diff --git a/docs/gallery_tests/test_plot_COP_1d.py b/docs/gallery_tests/test_plot_COP_1d.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_COP_maps.py b/docs/gallery_tests/test_plot_COP_maps.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_SOI_filtering.py b/docs/gallery_tests/test_plot_SOI_filtering.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_TEC.py b/docs/gallery_tests/test_plot_TEC.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_anomaly_log_colouring.py b/docs/gallery_tests/test_plot_anomaly_log_colouring.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_atlantic_profiles.py b/docs/gallery_tests/test_plot_atlantic_profiles.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_cross_section.py b/docs/gallery_tests/test_plot_cross_section.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_custom_aggregation.py b/docs/gallery_tests/test_plot_custom_aggregation.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_custom_file_loading.py b/docs/gallery_tests/test_plot_custom_file_loading.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_deriving_phenomena.py b/docs/gallery_tests/test_plot_deriving_phenomena.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_global_map.py b/docs/gallery_tests/test_plot_global_map.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_hovmoller.py b/docs/gallery_tests/test_plot_hovmoller.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_inset.py b/docs/gallery_tests/test_plot_inset.py
@@ -11,8 +11,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_lagged_ensemble.py b/docs/gallery_tests/test_plot_lagged_ensemble.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_lineplot_with_legend.py b/docs/gallery_tests/test_plot_lineplot_with_legend.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_load_nemo.py b/docs/gallery_tests/test_plot_load_nemo.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_orca_projection.py b/docs/gallery_tests/test_plot_orca_projection.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_polar_stereo.py b/docs/gallery_tests/test_plot_polar_stereo.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_polynomial_fit.py b/docs/gallery_tests/test_plot_polynomial_fit.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_projections_and_annotations.py b/docs/gallery_tests/test_plot_projections_and_annotations.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_rotated_pole_mapping.py b/docs/gallery_tests/test_plot_rotated_pole_mapping.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/gallery_tests/test_plot_wind_speed.py b/docs/gallery_tests/test_plot_wind_speed.py
@@ -10,8 +10,8 @@
 
 from .gallerytest_util import (
     add_gallery_to_path,
-    show_replaced_by_check_graphic,
     fail_any_deprecation_warnings,
+    show_replaced_by_check_graphic,
 )
 
 

diff --git a/docs/src/common_links.inc b/docs/src/common_links.inc
@@ -16,6 +16,7 @@
 .. _Iris GitHub: https://github.com/SciTools/iris
 .. _iris-sample-data: https://github.com/SciTools/iris-sample-data
 .. _iris-test-data: https://github.com/SciTools/iris-test-data
+.. _isort: https://pycqa.github.io/isort/
 .. _issue: https://github.com/SciTools/iris/issues
 .. _issues: https://github.com/SciTools/iris/issues
 .. _legacy documentation: https://scitools.org.uk/iris/docs/v2.4.0/

diff --git a/docs/src/userguide/plotting_examples/1d_quickplot_simple.py b/docs/src/userguide/plotting_examples/1d_quickplot_simple.py
@@ -3,7 +3,6 @@
 import iris
 import iris.quickplot as qplt
 
-
 fname = iris.sample_data_path("air_temp.pp")
 temperature = iris.load_cube(fname)
 

diff --git a/docs/src/userguide/plotting_examples/1d_simple.py b/docs/src/userguide/plotting_examples/1d_simple.py
@@ -3,7 +3,6 @@
 import iris
 import iris.plot as iplt
 
-
 fname = iris.sample_data_path("air_temp.pp")
 temperature = iris.load_cube(fname)
 

diff --git a/docs/src/userguide/plotting_examples/1d_with_legend.py b/docs/src/userguide/plotting_examples/1d_with_legend.py
@@ -1,8 +1,8 @@
 import matplotlib.pyplot as plt
+
 import iris
 import iris.plot as iplt
 
-
 fname = iris.sample_data_path("air_temp.pp")
 
 # Load exactly one cube from the given file

diff --git a/docs/src/userguide/plotting_examples/cube_blockplot.py b/docs/src/userguide/plotting_examples/cube_blockplot.py
@@ -1,8 +1,8 @@
 import matplotlib.pyplot as plt
+
 import iris
 import iris.quickplot as qplt
 
-
 # Load the data for a single value of model level number.
 fname = iris.sample_data_path("hybrid_height.nc")
 temperature_cube = iris.load_cube(fname, iris.Constraint(model_level_number=1))

diff --git a/docs/src/userguide/plotting_examples/cube_brewer_cite_contourf.py b/docs/src/userguide/plotting_examples/cube_brewer_cite_contourf.py
@@ -1,8 +1,8 @@
 import matplotlib.pyplot as plt
+
 import iris
-import iris.quickplot as qplt
 import iris.plot as iplt
-
+import iris.quickplot as qplt
 
 fname = iris.sample_data_path("air_temp.pp")
 temperature_cube = iris.load_cube(fname)

diff --git a/docs/src/userguide/plotting_examples/cube_contour.py b/docs/src/userguide/plotting_examples/cube_contour.py
@@ -3,7 +3,6 @@
 import iris
 import iris.quickplot as qplt
 
-
 fname = iris.sample_data_path("air_temp.pp")
 temperature_cube = iris.load_cube(fname)
 

diff --git a/docs/src/userguide/plotting_examples/cube_contourf.py b/docs/src/userguide/plotting_examples/cube_contourf.py
@@ -3,7 +3,6 @@
 import iris
 import iris.quickplot as qplt
 
-
 fname = iris.sample_data_path("air_temp.pp")
 temperature_cube = iris.load_cube(fname)