Skip to content

Commit b5e83a9

Browse files
pre-commit-ci[bot]pp-mo
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 3c2728a commit b5e83a9

11 files changed

+24
-31
lines changed

lib/iris/fileformats/_nc_load_rules/actions.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
4545
"""
4646

47-
from . import helpers as hh
48-
4947
from functools import wraps
5048

51-
import iris.fileformats.pp as pp
5249
import iris.fileformats.cf
50+
import iris.fileformats.pp as pp
51+
52+
from . import helpers as hh
5353

5454

5555
def _default_rulenamesfunc(func_name):

lib/iris/fileformats/_nc_load_rules/helpers.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@
2020

2121
import iris.aux_factory
2222
from iris.common.mixin import _get_valid_standard_name
23-
import iris.coords
2423
import iris.coord_systems
24+
import iris.coords
25+
import iris.exceptions
2526
import iris.fileformats.cf as cf
2627
import iris.fileformats.netcdf
2728
from iris.fileformats.netcdf import (
29+
UnknownCellMethodWarning,
2830
_get_cf_var_data,
2931
parse_cell_methods,
30-
UnknownCellMethodWarning,
3132
)
32-
import iris.exceptions
3333
import iris.std_names
3434
import iris.util
3535

36-
3736
#
3837
# UD Units Constants (based on Unidata udunits.dat definition file)
3938
#

lib/iris/tests/unit/fileformats/nc_load_rules/actions/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import subprocess
2222
import tempfile
2323

24+
import iris.fileformats._nc_load_rules.engine
2425
from iris.fileformats.cf import CFReader
2526
import iris.fileformats.netcdf
2627
from iris.fileformats.netcdf import _load_cube
27-
import iris.fileformats._nc_load_rules.engine
2828

2929
"""
3030
Notes on testing method.

lib/iris/tests/unit/fileformats/nc_load_rules/actions/test__grid_mappings.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
Here, *specifically* testcases relating to grid-mappings and dim-coords.
1111
1212
"""
13-
import iris.tests as tests
14-
1513
import iris.coord_systems as ics
1614
import iris.fileformats._nc_load_rules.helpers as hh
17-
15+
import iris.tests as tests
1816
from iris.tests.unit.fileformats.nc_load_rules.actions import (
1917
Mixin__nc_load_actions,
2018
)

lib/iris/tests/unit/fileformats/nc_load_rules/actions/test__hybrid_formulae.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
Test rules activation relating to hybrid vertical coordinates.
1111
1212
"""
13-
import iris.tests as tests
14-
1513
import iris.fileformats._nc_load_rules.helpers as hh
14+
import iris.tests as tests
1615
from iris.tests.unit.fileformats.nc_load_rules.actions import (
1716
Mixin__nc_load_actions,
1817
)

lib/iris/tests/unit/fileformats/nc_load_rules/actions/test__miscellaneous.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414
* ancillary variables
1515
1616
"""
17-
import iris.tests as tests
18-
19-
from iris.coords import AuxCoord, CellMeasure, AncillaryVariable
17+
from iris.coords import AncillaryVariable, AuxCoord, CellMeasure
2018
from iris.fileformats.pp import STASH
21-
19+
import iris.tests as tests
2220
from iris.tests.unit.fileformats.nc_load_rules.actions import (
2321
Mixin__nc_load_actions,
2422
)

lib/iris/tests/unit/fileformats/nc_load_rules/actions/test__time_coords.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@
1010
Tests for rules activation relating to 'time' and 'time_period' coords.
1111
1212
"""
13-
import iris.tests as tests
14-
1513
from iris.coords import AuxCoord, DimCoord
16-
17-
14+
import iris.tests as tests
1815
from iris.tests.unit.fileformats.nc_load_rules.actions import (
1916
Mixin__nc_load_actions,
2017
)

lib/iris/tests/unit/fileformats/nc_load_rules/helpers/test_build_auxiliary_coordinate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import numpy as np
1919

2020
from iris.coords import AuxCoord
21-
from iris.fileformats.cf import CFVariable
2221
from iris.fileformats._nc_load_rules.helpers import build_auxiliary_coordinate
22+
from iris.fileformats.cf import CFVariable
2323

2424

2525
class TestBoundsVertexDim(tests.IrisTest):

lib/iris/tests/unit/fileformats/nc_load_rules/helpers/test_get_cf_bounds_var.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
from unittest import mock
1717

1818
from iris.fileformats._nc_load_rules.helpers import (
19-
get_cf_bounds_var,
2019
CF_ATTR_BOUNDS,
2120
CF_ATTR_CLIMATOLOGY,
21+
get_cf_bounds_var,
2222
)
2323

2424

lib/iris/tests/unit/fileformats/nc_load_rules/helpers/test_has_supported_mercator_parameters.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
1010
"""
1111

12+
from unittest import mock
1213
import warnings
1314

15+
from iris.fileformats._nc_load_rules.helpers import (
16+
has_supported_mercator_parameters,
17+
)
18+
1419
# import iris tests first so that some things can be initialised before
1520
# importing anything else
1621
import iris.tests as tests # isort:skip
1722

18-
from unittest import mock
1923

20-
from iris.fileformats._nc_load_rules.helpers import (
21-
has_supported_mercator_parameters,
22-
)
2324

2425

2526
def _engine(cf_grid_var, cf_name):

lib/iris/tests/unit/fileformats/nc_load_rules/helpers/test_has_supported_stereographic_parameters.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
1010
"""
1111

12+
from unittest import mock
1213
import warnings
1314

15+
from iris.fileformats._nc_load_rules.helpers import (
16+
has_supported_stereographic_parameters,
17+
)
18+
1419
# import iris tests first so that some things can be initialised before
1520
# importing anything else
1621
import iris.tests as tests # isort:skip
1722

18-
from unittest import mock
1923

20-
from iris.fileformats._nc_load_rules.helpers import (
21-
has_supported_stereographic_parameters,
22-
)
2324

2425

2526
def _engine(cf_grid_var, cf_name):

0 commit comments

Comments
 (0)