One-off isort run (#3196)

* One-off, manually vetted and tweaked isort run

* More isort tweaks

* Resilience to isort

* isort run

* Another isort run; fix sparse test

* Clean up unused imports

Author: crusaderky

asv_bench/benchmarks/combine.py

@@ -1,4 +1,5 @@
 import numpy as np
+
 import xarray as xr
 
 

setup.cfg

@@ -25,8 +25,6 @@ ignore=
     E731
     # line break before binary operator
     W503
-    # Unused imports; TODO: Allow typing to work without triggering errors
-    F401
 exclude=
     doc
 

xarray/backends/api.py

@@ -6,28 +6,27 @@
 from pathlib import Path
 from textwrap import dedent
 from typing import (
+    TYPE_CHECKING,
     Callable,
     Dict,
     Hashable,
     Iterable,
     Mapping,
     Tuple,
     Union,
-    TYPE_CHECKING,
 )
 
 import numpy as np
 
-from .. import Dataset, DataArray, backends, conventions, coding
+from .. import DataArray, Dataset, auto_combine, backends, coding, conventions
 from ..core import indexing
-from .. import auto_combine
 from ..core.combine import (
-    combine_by_coords,
-    _nested_combine,
     _infer_concat_order_from_positions,
+    _nested_combine,
+    combine_by_coords,
 )
 from ..core.utils import close_on_error, is_grib_path, is_remote_uri
-from .common import ArrayWriter, AbstractDataStore
+from .common import AbstractDataStore, ArrayWriter
 from .locks import _get_scheduler
 
 if TYPE_CHECKING:

xarray/backends/h5netcdf_.py

@@ -5,7 +5,7 @@
 
 from .. import Variable
 from ..core import indexing
-from ..core.utils import FrozenOrderedDict, close_on_error
+from ..core.utils import FrozenOrderedDict
 from .common import WritableCFDataStore
 from .file_manager import CachingFileManager
 from .locks import HDF5_LOCK, combine_locks, ensure_lock, get_write_lock

xarray/backends/netCDF4_.py

@@ -10,7 +10,7 @@
 from .. import Variable, coding
 from ..coding.variables import pop_to
 from ..core import indexing
-from ..core.utils import FrozenOrderedDict, close_on_error, is_remote_uri
+from ..core.utils import FrozenOrderedDict, is_remote_uri
 from .common import (
     BackendArray,
     WritableCFDataStore,

xarray/core/alignment.py

@@ -3,7 +3,7 @@
 import warnings
 from collections import OrderedDict, defaultdict
 from contextlib import suppress
-from typing import Any, Dict, Hashable, Mapping, Optional, Tuple, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Dict, Hashable, Mapping, Optional, Tuple, Union
 
 import numpy as np
 import pandas as pd
@@ -14,8 +14,8 @@
 from .variable import IndexVariable, Variable
 
 if TYPE_CHECKING:
-    from .dataarray import DataArray
-    from .dataset import Dataset
+    from .dataarray import DataArray  # noqa: F401
+    from .dataset import Dataset  # noqa: F401
 
 
 def _get_joiner(join):

xarray/core/combine.py

@@ -5,10 +5,10 @@
 
 import pandas as pd
 
+from . import dtypes
+from .concat import concat
 from .dataarray import DataArray
 from .dataset import Dataset
-from .concat import concat
-from . import dtypes
 from .merge import merge
 
 

xarray/core/computation.py

@@ -7,6 +7,7 @@
 from collections import Counter, OrderedDict
 from distutils.version import LooseVersion
 from typing import (
+    TYPE_CHECKING,
     AbstractSet,
     Any,
     Callable,
@@ -17,7 +18,6 @@
     Sequence,
     Tuple,
     Union,
-    TYPE_CHECKING,
 )
 
 import numpy as np
@@ -649,7 +649,6 @@ def func(*arrays):
 def _apply_blockwise(
     func, args, input_dims, output_dims, signature, output_dtypes, output_sizes=None
 ):
-    import dask.array as da
     from .dask_array_compat import blockwise
 
     if signature.num_outputs > 1:

xarray/core/concat.py

@@ -3,7 +3,7 @@
 
 import pandas as pd
 
-from . import utils, dtypes
+from . import dtypes, utils
 from .alignment import align
 from .variable import IndexVariable, Variable, as_variable
 from .variable import concat as concat_vars

xarray/core/coordinates.py

@@ -4,12 +4,12 @@
     TYPE_CHECKING,
     Any,
     Hashable,
-    Mapping,
     Iterator,
-    Union,
+    Mapping,
+    Sequence,
     Set,
     Tuple,
-    Sequence,
+    Union,
     cast,
 )