Update black et al

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v3.4.0'
+    rev: 'v4.0.1'
     hooks:
         # Prevent giant files from being committed.
     -   id: check-added-large-files
@@ -17,14 +17,14 @@ repos:
         # Don't commit to master branch.
     -   id: no-commit-to-branch
 -   repo: https://github.com/psf/black
-    rev: '20.8b1'
+    rev: '21.5b1'
     hooks:
     -   id: black
         # Force black to run on whole repo, using settings from pyproject.toml
         pass_filenames: false
         args: [--config=./pyproject.toml, .]
 -   repo: https://github.com/PyCQA/flake8
-    rev: '3.9.0'
+    rev: '3.9.2'
     hooks:
         # Run flake8.
     -   id: flake8

lib/iris/fileformats/netcdf.py

@@ -2655,7 +2655,7 @@ def save(
         local_keys.update(different_value_keys)
 
     def is_valid_packspec(p):
-        """ Only checks that the datatype is valid. """
+        """Only checks that the datatype is valid."""
         if isinstance(p, dict):
             if "dtype" in p:
                 return is_valid_packspec(p["dtype"])

lib/iris/tests/integration/test_netcdf.py

@@ -516,7 +516,7 @@ def test_single_packed_signed(self):
         self._single_test("i2", "single_packed_signed.cdl")
 
     def test_single_packed_unsigned(self):
-        """Test saving a single CF-netCDF file with packing into unsigned. """
+        """Test saving a single CF-netCDF file with packing into unsigned."""
         self._single_test("u1", "single_packed_unsigned.cdl")
 
     def test_single_packed_manual_scale(self):

lib/iris/tests/test_cube_to_pp.py

@@ -275,7 +275,7 @@ def test_365_calendar_export(self):
 
 
 class FakePPEnvironment:
-    """ fake a minimal PP environment for use in cross-section coords, as in PP save rules """
+    """fake a minimal PP environment for use in cross-section coords, as in PP save rules"""
 
     y = [1, 2, 3, 4]
     z = [111, 222, 333, 444]

lib/iris/tests/test_file_save.py

@@ -33,7 +33,7 @@
 
 
 def save_by_filename(filename1, filename2, cube, saver_fn, iosaver=None):
-    """ Saves a cube to two different filenames using iris.save and the save method of the object representing the file type directly"""
+    """Saves a cube to two different filenames using iris.save and the save method of the object representing the file type directly"""
     # Save from object direct
     saver_fn(cube, filename1)
 
@@ -46,7 +46,7 @@ def save_by_filename(filename1, filename2, cube, saver_fn, iosaver=None):
 def save_by_filehandle(
     filehandle1, filehandle2, cube, fn_saver, binary_mode=True
 ):
-    """ Saves a cube to two different filehandles using iris.save and the save method of the object representing the file type directly"""
+    """Saves a cube to two different filehandles using iris.save and the save method of the object representing the file type directly"""
     mode = "wb" if binary_mode else "w"
 
     # Save from object direct
@@ -60,7 +60,7 @@ def save_by_filehandle(
 
 @tests.skip_data
 class TestSaveMethods(tests.IrisTest):
-    """ Base class for file saving tests. Loads data and creates/deletes tempfiles"""
+    """Base class for file saving tests. Loads data and creates/deletes tempfiles"""
 
     def setUp(self):
         self.cube1 = iris.load_cube(

lib/iris/tests/unit/fileformats/test_rules.py

@@ -238,7 +238,7 @@ def converter(field):
 
 
 class Test_scalar_cell_method(tests.IrisTest):
-    """ Tests for iris.fileformats.rules.scalar_cell_method() function """
+    """Tests for iris.fileformats.rules.scalar_cell_method() function"""
 
     def setUp(self):
         self.cube = stock.simple_2d()

noxfile.py

@@ -190,7 +190,7 @@ def black(session: nox.sessions.Session):
 
     """
     # Pip install the session requirements.
-    session.install("black==20.8b1")
+    session.install("black==21.5b1")
     # Execute the black format checker on the package.
     session.run("black", "--check", PACKAGE)
     # Execute the black format checker on this file.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 79
-target-version = ['py36', 'py37']
+target-version = ['py36', 'py37', 'py38']
 include = '\.pyi?$'
 exclude = '''
 

requirements/ci/py36.yml

@@ -34,7 +34,7 @@ dependencies:
 
 # Test dependencies.
   - asv
-  - black=20.8b1
+  - black=21.5b1
   - filelock
   - flake8
   - imagehash>=4.0

requirements/ci/py37.yml

@@ -34,7 +34,7 @@ dependencies:
 
 # Test dependencies.
   - asv
-  - black=20.8b1
+  - black=21.5b1
   - filelock
   - flake8
   - imagehash>=4.0

requirements/ci/py38.yml

@@ -34,7 +34,7 @@ dependencies:
 
 # Test dependencies.
   - asv
-  - black=20.8b1
+  - black=21.5b1
   - filelock
   - flake8
   - imagehash>=4.0

requirements/test.txt

@@ -1,7 +1,7 @@
 # Test dependencies.
 
 asv
-black==20.8b1
+black==21.5b1
 filelock
 imagehash>=4.0
 nose