Revert "[pre-commit.ci] pre-commit autoupdate (SciTools#4560)"

trexfeathers · trexfeathers · commit 2daa4d46fc59 · 2022-03-04T11:49:22.000Z
This reverts commit d503ce6.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,7 +29,7 @@ repos:
     -   id: no-commit-to-branch
 
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 21.12b0
     hooks:
     -   id: black
         pass_filenames: false
@@ -50,7 +50,7 @@ repos:
         args: [--filter-files]
 
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.1
+    rev: v1.12.0
     hooks:
     -   id: blacken-docs
         types: [file, rst]
diff --git a/benchmarks/benchmarks/plot.py b/benchmarks/benchmarks/plot.py
@@ -23,7 +23,7 @@ def setup(self):
         # Should generate 10 distinct contours, regardless of dim size.
         dim_size = int(ARTIFICIAL_DIM_SIZE / 5)
         repeat_number = int(dim_size / 10)
-        repeat_range = range(int((dim_size**2) / repeat_number))
+        repeat_range = range(int((dim_size ** 2) / repeat_number))
         data = np.repeat(repeat_range, repeat_number)
         data = data.reshape((dim_size,) * 2)
 
diff --git a/docs/gallery_code/meteorology/plot_wind_barbs.py b/docs/gallery_code/meteorology/plot_wind_barbs.py
@@ -30,7 +30,7 @@ def main():
 
     # To illustrate the full range of barbs, scale the wind speed up to pretend
     # that a storm is passing over
-    magnitude = (uwind**2 + vwind**2) ** 0.5
+    magnitude = (uwind ** 2 + vwind ** 2) ** 0.5
     magnitude.convert_units("knot")
     max_speed = magnitude.collapsed(
         ("latitude", "longitude"), iris.analysis.MAX
@@ -41,7 +41,7 @@ def main():
     vwind = vwind / max_speed * max_desired
 
     # Create a cube containing the wind speed
-    windspeed = (uwind**2 + vwind**2) ** 0.5
+    windspeed = (uwind ** 2 + vwind ** 2) ** 0.5
     windspeed.rename("windspeed")
     windspeed.convert_units("knot")
 
diff --git a/docs/gallery_code/meteorology/plot_wind_speed.py b/docs/gallery_code/meteorology/plot_wind_speed.py
@@ -27,7 +27,7 @@ def main():
     vwind = iris.load_cube(infile, "y_wind")
 
     # Create a cube containing the wind speed.
-    windspeed = (uwind**2 + vwind**2) ** 0.5
+    windspeed = (uwind ** 2 + vwind ** 2) ** 0.5
     windspeed.rename("windspeed")
 
     # Plot the wind speed as a contour plot.
diff --git a/docs/src/whatsnew/dev.rst b/docs/src/whatsnew/dev.rst
@@ -1,13 +1,13 @@
 .. include:: ../common_links.inc
 
-v3.2 (15 Feb 2022)
-******************
+|iris_version| |build_date| [unreleased]
+****************************************
 
 This document explains the changes made to Iris for this release
 (:doc:`View all changes <index>`.)
 
 
-.. dropdown:: :opticon:`report` v3.2.0 Release Highlights
+.. dropdown:: :opticon:`report` |iris_version| Release Highlights
    :container: + shadow
    :title: text-primary text-center font-weight-bold
    :body: bg-light
@@ -18,7 +18,8 @@ This document explains the changes made to Iris for this release
 
    * We've added experimental support for
      :ref:`Meshes <ugrid>`, which can now be loaded and
-     attached to a cube. Mesh support is based on the `CF-UGRID`_ model.
+     attached to a cube. Mesh support is based on the based on `CF-UGRID`_
+     model.
    * We've also dropped support for ``Python 3.7``.
 
    And finally, get in touch with us on :issue:`GitHub<new/choose>` if you have
@@ -177,9 +178,6 @@ This document explains the changes made to Iris for this release
    to indicate cloud fraction greater than 7.9 oktas, rather than 7.5 
    (:issue:`3305`, :pull:`4535`)
 
-#. `@lbdreyer`_ fixed a bug in :class:`iris.io.load_http` which was missing an import
-   (:pull:`4580`)
-
 
 💣 Incompatible Changes
 =======================
@@ -351,7 +349,7 @@ This document explains the changes made to Iris for this release
 
 #. `@lbdreyer`_ corrected the license PyPI classifier. (:pull:`4435`)
 
-#. `@aaronspring`_ exchanged ``dask`` with
+#. `@aaronspring <https://github.com/aaronspring>`_ exchanged ``dask`` with
    ``dask-core`` in testing environments reducing the number of dependencies
    installed for testing. (:pull:`4434`)
 
diff --git a/docs/src/whatsnew/dev.rst.template b/docs/src/whatsnew/dev.rst.template
@@ -24,7 +24,7 @@ This document explains the changes made to Iris for this release
 
 NOTE: section below is a template for bugfix patches
 ====================================================
-    (Please remove this section when creating an initial 'dev.rst')
+    (Please remove this section when creating an initial 'latest.rst')
 
 v3.X.X (DD MMM YYYY)
 ====================
@@ -41,7 +41,7 @@ v3.X.X (DD MMM YYYY)
 
 NOTE: section above is a template for bugfix patches
 ====================================================
-    (Please remove this section when creating an initial 'dev.rst')
+    (Please remove this section when creating an initial 'latest.rst')
     
 
 
diff --git a/docs/src/whatsnew/index.rst b/docs/src/whatsnew/index.rst
@@ -11,7 +11,6 @@ Iris versions.
    :maxdepth: 1
 
    dev.rst
-   3.2.rst
    3.1.rst
    3.0.rst
    2.4.rst
diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst
@@ -1 +1 @@
-3.2.rst
+dev.rst
diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py
@@ -44,10 +44,6 @@
         standard library function :func:`os.path.expanduser` and
         module :mod:`fnmatch` for more details.
 
-        .. warning::
-
-            If supplying a URL, only OPeNDAP Data Sources are supported.
-
     * constraints:
         Either a single constraint, or an iterable of constraints.
         Each constraint can be either a string, an instance of
@@ -108,7 +104,7 @@ def callback(cube, field, filename):
 
 
 # Iris revision.
-__version__ = "3.3.dev0"
+__version__ = "3.2.dev0"
 
 # Restrict the names imported when using "from iris import *"
 __all__ = [
@@ -291,7 +287,6 @@ def load(uris, constraints=None, callback=None):
 
     * uris:
         One or more filenames/URIs, as a string or :class:`pathlib.PurePath`.
-        If supplying a URL, only OPeNDAP Data Sources are supported.
 
     Kwargs:
 
@@ -320,7 +315,6 @@ def load_cube(uris, constraint=None, callback=None):
 
     * uris:
         One or more filenames/URIs, as a string or :class:`pathlib.PurePath`.
-        If supplying a URL, only OPeNDAP Data Sources are supported.
 
     Kwargs:
 
@@ -360,7 +354,6 @@ def load_cubes(uris, constraints=None, callback=None):
 
     * uris:
         One or more filenames/URIs, as a string or :class:`pathlib.PurePath`.
-        If supplying a URL, only OPeNDAP Data Sources are supported.
 
     Kwargs:
 
@@ -406,7 +399,6 @@ def load_raw(uris, constraints=None, callback=None):
 
     * uris:
         One or more filenames/URIs, as a string or :class:`pathlib.PurePath`.
-        If supplying a URL, only OPeNDAP Data Sources are supported.
 
     Kwargs:
 
diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py
@@ -1394,7 +1394,7 @@ def _lazy_rms(array, axis, **kwargs):
     # all. Thus trying to use this aggregator with weights will currently
     # raise an error in dask due to the unexpected keyword `weights`,
     # rather than silently returning the wrong answer.
-    return da.sqrt(da.mean(array**2, axis=axis, **kwargs))
+    return da.sqrt(da.mean(array ** 2, axis=axis, **kwargs))
 
 
 @_build_dask_mdtol_function
diff --git a/lib/iris/analysis/_grid_angles.py b/lib/iris/analysis/_grid_angles.py
@@ -120,7 +120,7 @@ def _angle(p, q, r):
     mid_lons = np.deg2rad(q[0])
 
     pr = _3d_xyz_from_latlon(r[0], r[1]) - _3d_xyz_from_latlon(p[0], p[1])
-    pr_norm = np.sqrt(np.sum(pr**2, axis=0))
+    pr_norm = np.sqrt(np.sum(pr ** 2, axis=0))
     pr_top = pr[1] * np.cos(mid_lons) - pr[0] * np.sin(mid_lons)
 
     index = pr_norm == 0
diff --git a/lib/iris/analysis/_scipy_interpolate.py b/lib/iris/analysis/_scipy_interpolate.py
@@ -229,7 +229,7 @@ def compute_interp_weights(self, xi, method=None):
             xi_shape, method, indices, norm_distances, out_of_bounds = prepared
 
             # Allocate arrays for describing the sparse matrix.
-            n_src_values_per_result_value = 2**ndim
+            n_src_values_per_result_value = 2 ** ndim
             n_result_values = len(indices[0])
             n_non_zero = n_result_values * n_src_values_per_result_value
             weights = np.ones(n_non_zero, dtype=norm_distances[0].dtype)
diff --git a/lib/iris/analysis/calculus.py b/lib/iris/analysis/calculus.py
@@ -629,10 +629,14 @@ def curl(i_cube, j_cube, k_cube=None):
         #    (d/dtheta (i_cube * sin(lat)) - d_j_cube_dphi)
         # phi_cmpt = 1/r * ( d/dr (r * j_cube) - d_k_cube_dtheta)
         # theta_cmpt = 1/r * ( 1/cos(lat) * d_k_cube_dphi - d/dr (r * i_cube)
-        if y_coord.name() not in [
-            "latitude",
-            "grid_latitude",
-        ] or x_coord.name() not in ["longitude", "grid_longitude"]:
+        if (
+            y_coord.name()
+            not in [
+                "latitude",
+                "grid_latitude",
+            ]
+            or x_coord.name() not in ["longitude", "grid_longitude"]
+        ):
             raise ValueError(
                 "Expecting latitude as the y coord and "
                 "longitude as the x coord for spherical curl."
diff --git a/lib/iris/analysis/cartography.py b/lib/iris/analysis/cartography.py
@@ -335,7 +335,7 @@ def _quadrant_area(radian_lat_bounds, radian_lon_bounds, radius_of_earth):
         raise ValueError("Bounds must be [n,2] array")
 
     # fill in a new array of areas
-    radius_sqr = radius_of_earth**2
+    radius_sqr = radius_of_earth ** 2
     radian_lat_64 = radian_lat_bounds.astype(np.float64)
     radian_lon_64 = radian_lon_bounds.astype(np.float64)
 
@@ -1010,8 +1010,8 @@ def _transform_distance_vectors_tolerance_mask(
     # Squared magnitudes should be equal to one within acceptable tolerance.
     # A value of atol=2e-3 is used, which corresponds to a change in magnitude
     # of approximately 0.1%.
-    sqmag_1_0 = u_one_t**2 + v_zero_t**2
-    sqmag_0_1 = u_zero_t**2 + v_one_t**2
+    sqmag_1_0 = u_one_t ** 2 + v_zero_t ** 2
+    sqmag_0_1 = u_zero_t ** 2 + v_one_t ** 2
     mask = np.logical_not(
         np.logical_and(
             np.isclose(sqmag_1_0, ones, atol=2e-3),
diff --git a/lib/iris/analysis/maths.py b/lib/iris/analysis/maths.py
@@ -540,7 +540,7 @@ def power(data, out=None):
     return _math_op_common(
         cube,
         power,
-        cube.units**exponent,
+        cube.units ** exponent,
         new_dtype=new_dtype,
         in_place=in_place,
     )
diff --git a/lib/iris/analysis/stats.py b/lib/iris/analysis/stats.py
@@ -168,10 +168,10 @@ def _ones_like(cube):
     covar = (s1 * s2).collapsed(
         corr_coords, iris.analysis.SUM, weights=weights_1, mdtol=mdtol
     )
-    var_1 = (s1**2).collapsed(
+    var_1 = (s1 ** 2).collapsed(
         corr_coords, iris.analysis.SUM, weights=weights_1
     )
-    var_2 = (s2**2).collapsed(
+    var_2 = (s2 ** 2).collapsed(
         corr_coords, iris.analysis.SUM, weights=weights_2
     )
 
diff --git a/lib/iris/fileformats/netcdf.py b/lib/iris/fileformats/netcdf.py
@@ -2744,9 +2744,9 @@ def _create_cf_data_variable(
                     cmin, cmax = _co_realise_lazy_arrays([cmin, cmax])
                 n = dtype.itemsize * 8
                 if masked:
-                    scale_factor = (cmax - cmin) / (2**n - 2)
+                    scale_factor = (cmax - cmin) / (2 ** n - 2)
                 else:
-                    scale_factor = (cmax - cmin) / (2**n - 1)
+                    scale_factor = (cmax - cmin) / (2 ** n - 1)
                 if dtype.kind == "u":
                     add_offset = cmin
                 elif dtype.kind == "i":
diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py
@@ -403,7 +403,7 @@ def _calculate_str_value_from_value(self):
 
     def _calculate_value_from_str_value(self):
         self._value = np.sum(
-            [10**i * val for i, val in enumerate(self._strvalue)]
+            [10 ** i * val for i, val in enumerate(self._strvalue)]
         )
 
     def __len__(self):
@@ -418,7 +418,7 @@ def __getitem__(self, key):
         # if the key returns a list of values, then combine them together
         # to an integer
         if isinstance(val, list):
-            val = sum([10**i * val for i, val in enumerate(val)])
+            val = sum([10 ** i * val for i, val in enumerate(val)])
 
         return val
 
diff --git a/lib/iris/tests/integration/test_netcdf.py b/lib/iris/tests/integration/test_netcdf.py
@@ -416,7 +416,7 @@ def setUp(self):
         levels.units = "centimeters"
         levels.positive = "down"
         levels.axis = "Z"
-        levels[:] = np.linspace(0, 10**5, 3)
+        levels[:] = np.linspace(0, 10 ** 5, 3)
 
         volcello.id = "volcello"
         volcello.out_name = "volcello"
@@ -507,9 +507,9 @@ def _get_scale_factor_add_offset(cube, datatype):
     else:
         masked = False
     if masked:
-        scale_factor = (cmax - cmin) / (2**n - 2)
+        scale_factor = (cmax - cmin) / (2 ** n - 2)
     else:
-        scale_factor = (cmax - cmin) / (2**n - 1)
+        scale_factor = (cmax - cmin) / (2 ** n - 1)
     if dt.kind == "u":
         add_offset = cmin
     elif dt.kind == "i":
diff --git a/lib/iris/tests/test_basic_maths.py b/lib/iris/tests/test_basic_maths.py
diff --git a/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py b/lib/iris/tests/unit/analysis/cartography/test_rotate_winds.py
diff --git a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py
diff --git a/lib/iris/tests/unit/coord_categorisation/test_add_categorised_coord.py b/lib/iris/tests/unit/coord_categorisation/test_add_categorised_coord.py
diff --git a/lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py b/lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py

-Original file line number
+Diff line change
    :maxdepth: 1
    dev.rst
 -   3.2.rst
 .1.rst
 .0.rst
 .4.rst