Fix isort

.pre-commit-config.yaml

@@ -50,8 +50,7 @@ repos:
     rev: 7.0.0
     hooks:
     -   id: isort
-        types: [file, python]
-        args: [--filter-files, --skip=./lib/ncdata/__init__.py]
+        name: isort (python)
 
 -   repo: https://github.com/asottile/blacken-docs
     rev: 1.20.0

lib/ncdata/utils/_compare_nc_datasets.py

@@ -14,6 +14,7 @@
 import netCDF4
 import netCDF4 as nc
 import numpy as np
+
 from ncdata import NcData, NcVariable
 
 

lib/ncdata/utils/_dim_indexing.py

@@ -3,6 +3,7 @@
 
 import dask.array as da
 import numpy as np
+
 from ncdata import NcData
 
 

lib/ncdata/utils/_save_errors.py

@@ -4,6 +4,7 @@
 
 import netCDF4 as nc
 import numpy as np
+
 from ncdata import NcData, NcVariable
 
 

pyproject.toml

@@ -79,6 +79,9 @@ include = '\.pyi?$'
 [tool.isort]
 line_length = "79"
 profile = "black"
+known_local_folder = ["tests"]
+known_first_party = "ncdata"
+skip = ["lib/ncdata/__init__.py"]
 
 [tool.towncrier]
 package = "ncdata"

tests/integration/example_scripts/ex_dataset_print.py

@@ -1,6 +1,7 @@
 """Temporary integrational proof-of-concept example for dataset printout."""
 
 import iris
+
 import ncdata.iris as nci
 from ncdata import NcData, NcDimension, NcVariable
 

tests/integration/example_scripts/ex_iris_saveto_ncdata.py

@@ -5,6 +5,7 @@
 """
 
 import iris
+
 from ncdata.iris import from_iris
 
 from tests import testdata_dir

tests/integration/example_scripts/ex_iris_xarray_conversion.py

@@ -8,6 +8,7 @@
 import iris
 import numpy as np
 import xarray as xr
+
 from ncdata.iris_xarray import cubes_from_xarray, cubes_to_xarray
 
 from tests import testdata_dir

tests/integration/example_scripts/ex_ncdata_netcdf_conversion.py

@@ -10,6 +10,7 @@
 
 import netCDF4 as nc
 import numpy as np
+
 from ncdata import NcData, NcDimension, NcVariable
 from ncdata.netcdf4 import from_nc4, to_nc4
 from ncdata.utils import dataset_differences

tests/integration/test_iris_load_and_save_equivalence.py

@@ -10,6 +10,7 @@
 
 import iris
 import pytest
+
 from ncdata.netcdf4 import from_nc4, to_nc4
 from ncdata.utils import dataset_differences
 

tests/integration/test_iris_xarray_roundtrips.py

@@ -14,6 +14,7 @@
 import numpy as np
 import pytest
 import xarray
+
 from ncdata.iris import from_iris
 from ncdata.iris_xarray import cubes_to_xarray
 from ncdata.netcdf4 import from_nc4

tests/integration/test_xarray_load_and_save_equivalence.py

@@ -8,6 +8,7 @@
 
 import pytest
 import xarray
+
 from ncdata.netcdf4 import from_nc4, to_nc4
 from ncdata.threadlock_sharing import lockshare_context
 from ncdata.utils import dataset_differences

tests/integration/test_zarr_to_iris.py

@@ -8,6 +8,7 @@
 import pytest
 import xarray as xr
 import zarr
+
 from ncdata.iris_xarray import cubes_from_xarray as conversion_func
 
 zarr_major_version = int(zarr.__version__.split(".")[0])

tests/unit/core/test_AttributeAccessMixin.py

@@ -7,6 +7,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcData, NcVariable
 
 

tests/unit/core/test_AttrvalsDict.py

@@ -4,6 +4,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcAttribute, NcVariable
 
 

tests/unit/core/test_NameMap.py

@@ -5,6 +5,7 @@
 from copy import deepcopy
 
 import pytest
+
 from ncdata import NameMap, NcAttribute
 
 

tests/unit/core/test_NcAttribute.py

@@ -6,6 +6,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcAttribute
 
 # Support for building testcases

tests/unit/core/test_NcData.py

@@ -4,6 +4,7 @@
 """
 
 import pytest
+
 from ncdata import NcData, NcDimension, NcVariable
 
 

tests/unit/core/test_NcDimension.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcDimension
 
 

tests/unit/core/test_NcVariable.py

@@ -7,6 +7,7 @@
 import dask.array as da
 import numpy as np
 import pytest
+
 from ncdata import NcVariable
 from ncdata.utils import variable_differences
 

tests/unit/iris/test_from_iris.py

@@ -16,6 +16,7 @@
 import pytest
 from iris.coords import DimCoord
 from iris.cube import Cube
+
 from ncdata.iris import from_iris
 
 from tests import MonitoredArray

tests/unit/iris/test_to_iris.py

@@ -13,6 +13,7 @@
 import numpy as np
 from iris._constraints import NameConstraint
 from iris.cube import CubeList
+
 from ncdata import NcData, NcDimension, NcVariable
 from ncdata.iris import to_iris
 

tests/unit/netcdf/test_from_nc4.py

@@ -14,6 +14,7 @@
 import netCDF4 as nc
 import numpy as np
 import pytest
+
 from ncdata import NcData, NcDimension, NcVariable
 from ncdata.netcdf4 import from_nc4
 from ncdata.utils import dataset_differences

tests/unit/netcdf/test_to_nc4.py

@@ -15,6 +15,7 @@
 import netCDF4 as nc
 import numpy as np
 import pytest
+
 from ncdata import NcData
 from ncdata.netcdf4 import from_nc4, to_nc4
 from ncdata.utils import dataset_differences

tests/unit/utils/compare_nc_datasets/test_dataset_differences__additional.py

@@ -13,6 +13,7 @@
 import netCDF4 as nc
 import numpy as np
 import pytest
+
 from ncdata.utils._compare_nc_datasets import (
     _attribute_differences,
     _namelist_differences,

tests/unit/utils/compare_nc_datasets/test_dataset_differences__mainfunctions.py

@@ -9,6 +9,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcAttribute, NcData, NcDimension, NcVariable
 from ncdata.utils import dataset_differences
 

tests/unit/utils/compare_nc_datasets/test_variable_differences.py

@@ -1,6 +1,7 @@
 import dask.array as da
 import numpy as np
 import pytest
+
 from ncdata import NcVariable
 from ncdata.utils import variable_differences
 

tests/unit/utils/dim_indexing/__init__.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcData, NcDimension, NcVariable
 
 

tests/unit/utils/dim_indexing/test_Slicer.py

@@ -5,6 +5,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata.utils import Slicer, dataset_differences
 
 from . import (  # noqa: F401

tests/unit/utils/dim_indexing/test_index_by_dimensions.py

@@ -5,6 +5,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata.utils import dataset_differences, index_by_dimensions
 
 from . import (  # noqa: F401

tests/unit/utils/test_ncdata_copy.py

@@ -5,6 +5,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NameMap, NcAttribute, NcData, NcDimension, NcVariable
 from ncdata.utils import dataset_differences, ncdata_copy
 

tests/unit/utils/test_rename_dimension.py

@@ -2,6 +2,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcData, NcDimension, NcVariable
 from ncdata.utils import rename_dimension, save_errors
 

tests/unit/utils/test_save_errors.py

@@ -6,6 +6,7 @@
 
 import numpy as np
 import pytest
+
 from ncdata import NcData, NcDimension, NcVariable
 from ncdata.utils import save_errors
 

tests/unit/xarray/test_from_xarray.py

@@ -15,6 +15,7 @@
 import numpy as np
 import pytest
 import xarray as xr
+
 from ncdata.xarray import from_xarray
 
 from tests import MonitoredArray

tests/unit/xarray/test_to_xarray.py

@@ -12,6 +12,7 @@
 import dask.array as da
 import numpy as np
 import pytest
+
 from ncdata import NcData, NcDimension, NcVariable
 from ncdata.xarray import to_xarray