From 660fd34ac4685e6e7d12348996f3da04f9389296 Mon Sep 17 00:00:00 2001
From: tkknight <2108488+tkknight@users.noreply.github.com>
Date: Mon, 3 Aug 2020 11:30:52 +0100
Subject: [PATCH] Gallery code consistency (#3766)

Tidy up gallery code
---
 docs/iris/gallery_code/general/__init__.py             |  4 ----
 docs/iris/gallery_code/general/plot_SOI_filtering.py   |  4 +++-
 .../gallery_code/general/plot_anomaly_log_colouring.py |  6 ++++--
 docs/iris/gallery_code/general/plot_coriolis.py        |  6 ++++--
 .../gallery_code/general/plot_custom_aggregation.py    |  1 +
 .../gallery_code/general/plot_custom_file_loading.py   |  4 ++--
 docs/iris/gallery_code/general/plot_global_map.py      |  1 +
 docs/iris/gallery_code/general/plot_inset.py           |  3 ++-
 .../gallery_code/general/plot_lineplot_with_legend.py  |  1 +
 .../general/plot_projections_and_annotations.py        |  6 ++++--
 .../gallery_code/general/plot_rotated_pole_mapping.py  |  3 ++-
 docs/iris/gallery_code/meteorology/__init__.py         |  4 ----
 docs/iris/gallery_code/meteorology/plot_COP_1d.py      | 10 +++++-----
 docs/iris/gallery_code/meteorology/plot_COP_maps.py    |  2 ++
 docs/iris/gallery_code/meteorology/plot_TEC.py         |  1 +
 .../meteorology/plot_deriving_phenomena.py             |  1 +
 docs/iris/gallery_code/meteorology/plot_hovmoller.py   |  3 ++-
 .../gallery_code/meteorology/plot_lagged_ensemble.py   |  1 +
 docs/iris/gallery_code/meteorology/plot_wind_speed.py  |  5 ++---
 docs/iris/gallery_code/oceanography/__init__.py        |  4 ----
 .../oceanography/plot_atlantic_profiles.py             |  5 ++++-
 docs/iris/gallery_code/oceanography/plot_load_nemo.py  |  5 ++++-
 .../gallery_code/oceanography/plot_orca_projection.py  |  2 +-
 23 files changed, 47 insertions(+), 35 deletions(-)
 delete mode 100644 docs/iris/gallery_code/general/__init__.py
 delete mode 100644 docs/iris/gallery_code/meteorology/__init__.py
 delete mode 100644 docs/iris/gallery_code/oceanography/__init__.py

diff --git a/docs/iris/gallery_code/general/__init__.py b/docs/iris/gallery_code/general/__init__.py
deleted file mode 100644
index f67741cf37e..00000000000
--- a/docs/iris/gallery_code/general/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""
-General visualisation examples
-==============================
-"""
diff --git a/docs/iris/gallery_code/general/plot_SOI_filtering.py b/docs/iris/gallery_code/general/plot_SOI_filtering.py
index caf4810c65c..116e819af7a 100644
--- a/docs/iris/gallery_code/general/plot_SOI_filtering.py
+++ b/docs/iris/gallery_code/general/plot_SOI_filtering.py
@@ -20,8 +20,10 @@
     Monthly Weather Review, Vol 112, pp 326-332
 
 """
-import numpy as np
+
 import matplotlib.pyplot as plt
+import numpy as np
+
 import iris
 import iris.plot as iplt
 
diff --git a/docs/iris/gallery_code/general/plot_anomaly_log_colouring.py b/docs/iris/gallery_code/general/plot_anomaly_log_colouring.py
index 28f7ce323b8..b0cee818de5 100644
--- a/docs/iris/gallery_code/general/plot_anomaly_log_colouring.py
+++ b/docs/iris/gallery_code/general/plot_anomaly_log_colouring.py
@@ -27,12 +27,14 @@
 See also: http://en.wikipedia.org/wiki/False_color#Pseudocolor.
 
 """
+
 import cartopy.crs as ccrs
+import matplotlib.pyplot as plt
+import matplotlib.colors as mcols
+
 import iris
 import iris.coord_categorisation
 import iris.plot as iplt
-import matplotlib.pyplot as plt
-import matplotlib.colors as mcols
 
 
 def main():
diff --git a/docs/iris/gallery_code/general/plot_coriolis.py b/docs/iris/gallery_code/general/plot_coriolis.py
index 7999e5385f9..cc67d1267c3 100644
--- a/docs/iris/gallery_code/general/plot_coriolis.py
+++ b/docs/iris/gallery_code/general/plot_coriolis.py
@@ -9,11 +9,13 @@
 """
 
 import cartopy.crs as ccrs
+import matplotlib.pyplot as plt
+import numpy as np
+
+
 import iris
 from iris.coord_systems import GeogCS
 import iris.plot as iplt
-import matplotlib.pyplot as plt
-import numpy as np
 
 
 def main():
diff --git a/docs/iris/gallery_code/general/plot_custom_aggregation.py b/docs/iris/gallery_code/general/plot_custom_aggregation.py
index 2e73aa277ad..9c847be7798 100644
--- a/docs/iris/gallery_code/general/plot_custom_aggregation.py
+++ b/docs/iris/gallery_code/general/plot_custom_aggregation.py
@@ -13,6 +13,7 @@
 certain temperature over a spell of 5 years or more.
 
 """
+
 import matplotlib.pyplot as plt
 import numpy as np
 
diff --git a/docs/iris/gallery_code/general/plot_custom_file_loading.py b/docs/iris/gallery_code/general/plot_custom_file_loading.py
index 406995d94b0..0d130374a76 100644
--- a/docs/iris/gallery_code/general/plot_custom_file_loading.py
+++ b/docs/iris/gallery_code/general/plot_custom_file_loading.py
@@ -54,13 +54,13 @@
 The cube returned from the load function is then used to produce a plot.
 
 """
+
 import datetime
 
+from cf_units import Unit, CALENDAR_GREGORIAN
 import matplotlib.pyplot as plt
 import numpy as np
 
-from cf_units import Unit, CALENDAR_GREGORIAN
-
 import iris
 import iris.coords as icoords
 import iris.coord_systems as icoord_systems
diff --git a/docs/iris/gallery_code/general/plot_global_map.py b/docs/iris/gallery_code/general/plot_global_map.py
index 72e8f287433..41fd2269217 100644
--- a/docs/iris/gallery_code/general/plot_global_map.py
+++ b/docs/iris/gallery_code/general/plot_global_map.py
@@ -6,6 +6,7 @@
 title and the labels for the axes are automatically derived from the metadata.
 
 """
+
 import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
 
diff --git a/docs/iris/gallery_code/general/plot_inset.py b/docs/iris/gallery_code/general/plot_inset.py
index 4735706ef7c..46f5dc5d0f4 100644
--- a/docs/iris/gallery_code/general/plot_inset.py
+++ b/docs/iris/gallery_code/general/plot_inset.py
@@ -8,10 +8,11 @@
 
 """
 
+import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
 import numpy as np
+
 import iris
-import cartopy.crs as ccrs
 import iris.quickplot as qplt
 import iris.plot as iplt
 
diff --git a/docs/iris/gallery_code/general/plot_lineplot_with_legend.py b/docs/iris/gallery_code/general/plot_lineplot_with_legend.py
index aed636489eb..5641b9c4d00 100644
--- a/docs/iris/gallery_code/general/plot_lineplot_with_legend.py
+++ b/docs/iris/gallery_code/general/plot_lineplot_with_legend.py
@@ -3,6 +3,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 """
+
 import matplotlib.pyplot as plt
 
 import iris
diff --git a/docs/iris/gallery_code/general/plot_projections_and_annotations.py b/docs/iris/gallery_code/general/plot_projections_and_annotations.py
index 4f85c438351..e59bb236d7a 100644
--- a/docs/iris/gallery_code/general/plot_projections_and_annotations.py
+++ b/docs/iris/gallery_code/general/plot_projections_and_annotations.py
@@ -13,11 +13,13 @@
 We plot these over a specified region, in two different map projections.
 
 """
+
 import cartopy.crs as ccrs
+import matplotlib.pyplot as plt
+import numpy as np
+
 import iris
 import iris.plot as iplt
-import numpy as np
-import matplotlib.pyplot as plt
 
 
 # Define a Cartopy 'ordinary' lat-lon coordinate reference system.
diff --git a/docs/iris/gallery_code/general/plot_rotated_pole_mapping.py b/docs/iris/gallery_code/general/plot_rotated_pole_mapping.py
index b6a18cac929..063fe93674a 100644
--- a/docs/iris/gallery_code/general/plot_rotated_pole_mapping.py
+++ b/docs/iris/gallery_code/general/plot_rotated_pole_mapping.py
@@ -11,13 +11,14 @@
  * Non native projection and a Natural Earth shaded relief image underlay
 
 """
+
 import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
 
 import iris
+import iris.analysis.cartography
 import iris.plot as iplt
 import iris.quickplot as qplt
-import iris.analysis.cartography
 
 
 def main():
diff --git a/docs/iris/gallery_code/meteorology/__init__.py b/docs/iris/gallery_code/meteorology/__init__.py
deleted file mode 100644
index 39c05d08c68..00000000000
--- a/docs/iris/gallery_code/meteorology/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""
-Meteorology visualisation examples
-==================================
-"""
diff --git a/docs/iris/gallery_code/meteorology/plot_COP_1d.py b/docs/iris/gallery_code/meteorology/plot_COP_1d.py
index 9b951923818..2f93627b77a 100644
--- a/docs/iris/gallery_code/meteorology/plot_COP_1d.py
+++ b/docs/iris/gallery_code/meteorology/plot_COP_1d.py
@@ -28,14 +28,15 @@
     can be found in :ref:`cube-statistics`.
 
 """
-import numpy as np
+
 import matplotlib.pyplot as plt
+import numpy as np
+
 import iris
+import iris.analysis.cartography
 import iris.plot as iplt
 import iris.quickplot as qplt
 
-import iris.analysis.cartography
-
 
 def main():
     # Load data into three Cubes, one for each set of NetCDF files.
@@ -93,6 +94,7 @@ def main():
         time=lambda cell: 1860 <= cell.point.year <= 1999
     )
     observed = a1b_mean.extract(constraint)
+
     # Assert that this data set is the same as the e1 scenario:
     # they share data up to the 1999 cut off.
     assert np.all(np.isclose(observed.data, e1_mean.extract(constraint).data))
@@ -105,9 +107,7 @@ def main():
     plt.title("North American mean air temperature", fontsize=18)
 
     plt.xlabel("Time / year")
-
     plt.grid()
-
     iplt.show()
 
 
diff --git a/docs/iris/gallery_code/meteorology/plot_COP_maps.py b/docs/iris/gallery_code/meteorology/plot_COP_maps.py
index 840c371c145..a8e6055a775 100644
--- a/docs/iris/gallery_code/meteorology/plot_COP_maps.py
+++ b/docs/iris/gallery_code/meteorology/plot_COP_maps.py
@@ -21,7 +21,9 @@
     doi:10.1029/2009EO210001.
 
 """
+
 import os.path
+
 import matplotlib.pyplot as plt
 import numpy as np
 
diff --git a/docs/iris/gallery_code/meteorology/plot_TEC.py b/docs/iris/gallery_code/meteorology/plot_TEC.py
index 8320af90e97..df2e29ef19c 100644
--- a/docs/iris/gallery_code/meteorology/plot_TEC.py
+++ b/docs/iris/gallery_code/meteorology/plot_TEC.py
@@ -34,6 +34,7 @@ def main():
     plt.ylabel("latitude / degrees")
     plt.gca().stock_img()
     plt.gca().coastlines()
+
     iplt.show()
 
 
diff --git a/docs/iris/gallery_code/meteorology/plot_deriving_phenomena.py b/docs/iris/gallery_code/meteorology/plot_deriving_phenomena.py
index 7b3f50a8a54..0bb1fa53a49 100644
--- a/docs/iris/gallery_code/meteorology/plot_deriving_phenomena.py
+++ b/docs/iris/gallery_code/meteorology/plot_deriving_phenomena.py
@@ -9,6 +9,7 @@
 plot.
 
 """
+
 import matplotlib.pyplot as plt
 import matplotlib.ticker
 
diff --git a/docs/iris/gallery_code/meteorology/plot_hovmoller.py b/docs/iris/gallery_code/meteorology/plot_hovmoller.py
index d8954d775ff..9f18b8021e4 100644
--- a/docs/iris/gallery_code/meteorology/plot_hovmoller.py
+++ b/docs/iris/gallery_code/meteorology/plot_hovmoller.py
@@ -8,8 +8,9 @@
 temperature.
 
 """
-import matplotlib.pyplot as plt
+
 import matplotlib.dates as mdates
+import matplotlib.pyplot as plt
 
 import iris
 import iris.plot as iplt
diff --git a/docs/iris/gallery_code/meteorology/plot_lagged_ensemble.py b/docs/iris/gallery_code/meteorology/plot_lagged_ensemble.py
index 298d178a1e8..5f2ab724b3f 100644
--- a/docs/iris/gallery_code/meteorology/plot_lagged_ensemble.py
+++ b/docs/iris/gallery_code/meteorology/plot_lagged_ensemble.py
@@ -17,6 +17,7 @@
    model, from each ensemble member.
 
 """
+
 import matplotlib.pyplot as plt
 import numpy as np
 
diff --git a/docs/iris/gallery_code/meteorology/plot_wind_speed.py b/docs/iris/gallery_code/meteorology/plot_wind_speed.py
index 2d8081158ce..6844d3874cc 100644
--- a/docs/iris/gallery_code/meteorology/plot_wind_speed.py
+++ b/docs/iris/gallery_code/meteorology/plot_wind_speed.py
@@ -11,6 +11,8 @@
 
 """
 
+import cartopy.crs as ccrs
+import cartopy.feature as cfeat
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -18,9 +20,6 @@
 import iris.coord_categorisation
 import iris.quickplot as qplt
 
-import cartopy.feature as cfeat
-import cartopy.crs as ccrs
-
 
 def main():
     # Load the u and v components of wind from a pp file
diff --git a/docs/iris/gallery_code/oceanography/__init__.py b/docs/iris/gallery_code/oceanography/__init__.py
deleted file mode 100644
index afac828a052..00000000000
--- a/docs/iris/gallery_code/oceanography/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""
-Oceanography visualisation examples
-===================================
-"""
diff --git a/docs/iris/gallery_code/oceanography/plot_atlantic_profiles.py b/docs/iris/gallery_code/oceanography/plot_atlantic_profiles.py
index 8a541c11fae..a7e82c34f51 100644
--- a/docs/iris/gallery_code/oceanography/plot_atlantic_profiles.py
+++ b/docs/iris/gallery_code/oceanography/plot_atlantic_profiles.py
@@ -15,10 +15,12 @@
 depth values intuitively increase downward on the y-axis.
 
 """
+
+import matplotlib.pyplot as plt
+
 import iris
 import iris.iterate
 import iris.plot as iplt
-import matplotlib.pyplot as plt
 
 
 def main():
@@ -56,6 +58,7 @@ def main():
     ax1.set_ylabel("Depth / m")
     for ticklabel in ax1.get_xticklabels():
         ticklabel.set_color(temperature_color)
+
     # To plot salinity in the same axes we use twiny(). We'll use a different
     # color to identify salinity.
     salinity_color = (0.6, 0.1, 0.15)
diff --git a/docs/iris/gallery_code/oceanography/plot_load_nemo.py b/docs/iris/gallery_code/oceanography/plot_load_nemo.py
index 645617f6006..5f2b72c956f 100644
--- a/docs/iris/gallery_code/oceanography/plot_load_nemo.py
+++ b/docs/iris/gallery_code/oceanography/plot_load_nemo.py
@@ -7,12 +7,14 @@
 different time dimensions in these files can prevent Iris from concatenating
 them without the intervention shown here.
 """
+
 from __future__ import unicode_literals
 
+import matplotlib.pyplot as plt
+
 import iris
 import iris.plot as iplt
 import iris.quickplot as qplt
-import matplotlib.pyplot as plt
 from iris.util import promote_aux_coord_to_dim_coord
 
 
@@ -57,6 +59,7 @@ def main():
             cube.long_name.capitalize(), lat_string, lon_string
         )
     )
+
     iplt.show()
 
 
diff --git a/docs/iris/gallery_code/oceanography/plot_orca_projection.py b/docs/iris/gallery_code/oceanography/plot_orca_projection.py
index bf2498c2293..627be8591b1 100644
--- a/docs/iris/gallery_code/oceanography/plot_orca_projection.py
+++ b/docs/iris/gallery_code/oceanography/plot_orca_projection.py
@@ -12,9 +12,9 @@
 
 """
 
+import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
 
-import cartopy.crs as ccrs
 import iris
 import iris.analysis.cartography
 import iris.plot as iplt