diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ab433a0..e75d460 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/lib/ncdata/utils/_compare_nc_datasets.py b/lib/ncdata/utils/_compare_nc_datasets.py index 1d1d1ff..e123830 100644 --- a/lib/ncdata/utils/_compare_nc_datasets.py +++ b/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 diff --git a/lib/ncdata/utils/_dim_indexing.py b/lib/ncdata/utils/_dim_indexing.py index 42b94ae..de08717 100644 --- a/lib/ncdata/utils/_dim_indexing.py +++ b/lib/ncdata/utils/_dim_indexing.py @@ -3,6 +3,7 @@ import dask.array as da import numpy as np + from ncdata import NcData diff --git a/lib/ncdata/utils/_save_errors.py b/lib/ncdata/utils/_save_errors.py index 2002245..5670e8b 100644 --- a/lib/ncdata/utils/_save_errors.py +++ b/lib/ncdata/utils/_save_errors.py @@ -4,6 +4,7 @@ import netCDF4 as nc import numpy as np + from ncdata import NcData, NcVariable diff --git a/pyproject.toml b/pyproject.toml index 9b168a7..8043c4e 100644 --- a/pyproject.toml +++ b/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" diff --git a/tests/integration/example_scripts/ex_dataset_print.py b/tests/integration/example_scripts/ex_dataset_print.py index 63bda23..02fbac8 100644 --- a/tests/integration/example_scripts/ex_dataset_print.py +++ b/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 diff --git a/tests/integration/example_scripts/ex_iris_saveto_ncdata.py b/tests/integration/example_scripts/ex_iris_saveto_ncdata.py index f926191..361ff06 100644 --- a/tests/integration/example_scripts/ex_iris_saveto_ncdata.py +++ b/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 diff --git a/tests/integration/example_scripts/ex_iris_xarray_conversion.py b/tests/integration/example_scripts/ex_iris_xarray_conversion.py index 7ef473c..0a193ef 100644 --- a/tests/integration/example_scripts/ex_iris_xarray_conversion.py +++ b/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 diff --git a/tests/integration/example_scripts/ex_ncdata_netcdf_conversion.py b/tests/integration/example_scripts/ex_ncdata_netcdf_conversion.py index bb97f15..3fde5bf 100644 --- a/tests/integration/example_scripts/ex_ncdata_netcdf_conversion.py +++ b/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 diff --git a/tests/integration/test_iris_load_and_save_equivalence.py b/tests/integration/test_iris_load_and_save_equivalence.py index 1d875da..238e456 100644 --- a/tests/integration/test_iris_load_and_save_equivalence.py +++ b/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 diff --git a/tests/integration/test_iris_xarray_roundtrips.py b/tests/integration/test_iris_xarray_roundtrips.py index b957707..d0eb2bf 100644 --- a/tests/integration/test_iris_xarray_roundtrips.py +++ b/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 diff --git a/tests/integration/test_xarray_load_and_save_equivalence.py b/tests/integration/test_xarray_load_and_save_equivalence.py index fce4053..0030dca 100644 --- a/tests/integration/test_xarray_load_and_save_equivalence.py +++ b/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 diff --git a/tests/integration/test_zarr_to_iris.py b/tests/integration/test_zarr_to_iris.py index 776821a..9127ce4 100644 --- a/tests/integration/test_zarr_to_iris.py +++ b/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]) diff --git a/tests/unit/core/test_AttributeAccessMixin.py b/tests/unit/core/test_AttributeAccessMixin.py index ad48450..c3f243f 100644 --- a/tests/unit/core/test_AttributeAccessMixin.py +++ b/tests/unit/core/test_AttributeAccessMixin.py @@ -7,6 +7,7 @@ import numpy as np import pytest + from ncdata import NcData, NcVariable diff --git a/tests/unit/core/test_AttrvalsDict.py b/tests/unit/core/test_AttrvalsDict.py index ffebe81..7a92911 100644 --- a/tests/unit/core/test_AttrvalsDict.py +++ b/tests/unit/core/test_AttrvalsDict.py @@ -4,6 +4,7 @@ import numpy as np import pytest + from ncdata import NcAttribute, NcVariable diff --git a/tests/unit/core/test_NameMap.py b/tests/unit/core/test_NameMap.py index 956f6d8..67e22b9 100644 --- a/tests/unit/core/test_NameMap.py +++ b/tests/unit/core/test_NameMap.py @@ -5,6 +5,7 @@ from copy import deepcopy import pytest + from ncdata import NameMap, NcAttribute diff --git a/tests/unit/core/test_NcAttribute.py b/tests/unit/core/test_NcAttribute.py index 9e3cf1c..064b29e 100644 --- a/tests/unit/core/test_NcAttribute.py +++ b/tests/unit/core/test_NcAttribute.py @@ -6,6 +6,7 @@ import numpy as np import pytest + from ncdata import NcAttribute # Support for building testcases diff --git a/tests/unit/core/test_NcData.py b/tests/unit/core/test_NcData.py index fd00825..1e901e6 100644 --- a/tests/unit/core/test_NcData.py +++ b/tests/unit/core/test_NcData.py @@ -4,6 +4,7 @@ """ import pytest + from ncdata import NcData, NcDimension, NcVariable diff --git a/tests/unit/core/test_NcDimension.py b/tests/unit/core/test_NcDimension.py index 6e17ea4..9f334da 100644 --- a/tests/unit/core/test_NcDimension.py +++ b/tests/unit/core/test_NcDimension.py @@ -2,6 +2,7 @@ import numpy as np import pytest + from ncdata import NcDimension diff --git a/tests/unit/core/test_NcVariable.py b/tests/unit/core/test_NcVariable.py index 34c874e..27a873e 100644 --- a/tests/unit/core/test_NcVariable.py +++ b/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 diff --git a/tests/unit/iris/test_from_iris.py b/tests/unit/iris/test_from_iris.py index 937cccc..7dc8823 100644 --- a/tests/unit/iris/test_from_iris.py +++ b/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 diff --git a/tests/unit/iris/test_to_iris.py b/tests/unit/iris/test_to_iris.py index 5ed0e70..e530831 100644 --- a/tests/unit/iris/test_to_iris.py +++ b/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 diff --git a/tests/unit/netcdf/test_from_nc4.py b/tests/unit/netcdf/test_from_nc4.py index 8270c56..d19703d 100644 --- a/tests/unit/netcdf/test_from_nc4.py +++ b/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 diff --git a/tests/unit/netcdf/test_to_nc4.py b/tests/unit/netcdf/test_to_nc4.py index c5e3bd9..85c8589 100644 --- a/tests/unit/netcdf/test_to_nc4.py +++ b/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 diff --git a/tests/unit/utils/compare_nc_datasets/test_dataset_differences__additional.py b/tests/unit/utils/compare_nc_datasets/test_dataset_differences__additional.py index 6c67852..9969a13 100644 --- a/tests/unit/utils/compare_nc_datasets/test_dataset_differences__additional.py +++ b/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, diff --git a/tests/unit/utils/compare_nc_datasets/test_dataset_differences__mainfunctions.py b/tests/unit/utils/compare_nc_datasets/test_dataset_differences__mainfunctions.py index 6549af7..482f794 100644 --- a/tests/unit/utils/compare_nc_datasets/test_dataset_differences__mainfunctions.py +++ b/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 diff --git a/tests/unit/utils/compare_nc_datasets/test_variable_differences.py b/tests/unit/utils/compare_nc_datasets/test_variable_differences.py index 9218f1a..2c7e55b 100644 --- a/tests/unit/utils/compare_nc_datasets/test_variable_differences.py +++ b/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 diff --git a/tests/unit/utils/dim_indexing/__init__.py b/tests/unit/utils/dim_indexing/__init__.py index 8fda765..7ad084b 100644 --- a/tests/unit/utils/dim_indexing/__init__.py +++ b/tests/unit/utils/dim_indexing/__init__.py @@ -2,6 +2,7 @@ import numpy as np import pytest + from ncdata import NcData, NcDimension, NcVariable diff --git a/tests/unit/utils/dim_indexing/test_Slicer.py b/tests/unit/utils/dim_indexing/test_Slicer.py index 882db11..4652cc2 100644 --- a/tests/unit/utils/dim_indexing/test_Slicer.py +++ b/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 diff --git a/tests/unit/utils/dim_indexing/test_index_by_dimensions.py b/tests/unit/utils/dim_indexing/test_index_by_dimensions.py index a0c2200..099b1d7 100644 --- a/tests/unit/utils/dim_indexing/test_index_by_dimensions.py +++ b/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 diff --git a/tests/unit/utils/test_ncdata_copy.py b/tests/unit/utils/test_ncdata_copy.py index f0e534f..aff9734 100644 --- a/tests/unit/utils/test_ncdata_copy.py +++ b/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 diff --git a/tests/unit/utils/test_rename_dimension.py b/tests/unit/utils/test_rename_dimension.py index be51cd2..8c92d3f 100644 --- a/tests/unit/utils/test_rename_dimension.py +++ b/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 diff --git a/tests/unit/utils/test_save_errors.py b/tests/unit/utils/test_save_errors.py index e4901bf..fff1853 100644 --- a/tests/unit/utils/test_save_errors.py +++ b/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 diff --git a/tests/unit/xarray/test_from_xarray.py b/tests/unit/xarray/test_from_xarray.py index 2807067..dd502e1 100644 --- a/tests/unit/xarray/test_from_xarray.py +++ b/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 diff --git a/tests/unit/xarray/test_to_xarray.py b/tests/unit/xarray/test_to_xarray.py index 5a25454..592c975 100644 --- a/tests/unit/xarray/test_to_xarray.py +++ b/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