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

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,
 )
 

xarray/core/dask_array_compat.py

@@ -4,7 +4,6 @@
 import numpy as np
 from dask import __version__ as dask_version
 
-
 try:
     blockwise = da.blockwise
 except AttributeError:

xarray/core/dataarray.py

@@ -4,6 +4,7 @@
 from collections import OrderedDict
 from numbers import Number
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Dict,
@@ -17,7 +18,6 @@
     Union,
     cast,
     overload,
-    TYPE_CHECKING,
 )
 
 import numpy as np
@@ -38,9 +38,9 @@
 from .accessor_dt import DatetimeAccessor
 from .accessor_str import StringAccessor
 from .alignment import (
-    align,
     _broadcast_helper,
     _get_broadcast_dims_map_common_coords,
+    align,
     reindex_like_indexers,
 )
 from .common import AbstractArray, DataWithCoords
@@ -54,7 +54,7 @@
 from .formatting import format_item
 from .indexes import Indexes, default_indexes
 from .options import OPTIONS
-from .utils import _check_inplace, either_dict_or_kwargs, ReprObject
+from .utils import ReprObject, _check_inplace, either_dict_or_kwargs
 from .variable import (
     IndexVariable,
     Variable,

xarray/core/dataset.py

@@ -7,6 +7,7 @@
 from numbers import Number
 from pathlib import Path
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     DefaultDict,
@@ -24,14 +25,15 @@
     Union,
     cast,
     overload,
-    TYPE_CHECKING,
 )
 
 import numpy as np
 import pandas as pd
+
 import xarray as xr
 
 from ..coding.cftimeindex import _parse_array_of_cftime_strings
+from ..plot.dataset_plot import _Dataset_PlotMethods
 from . import (
     alignment,
     dtypes,
@@ -45,16 +47,16 @@
     rolling,
     utils,
 )
-from .alignment import align, _broadcast_helper, _get_broadcast_dims_map_common_coords
+from .alignment import _broadcast_helper, _get_broadcast_dims_map_common_coords, align
 from .common import (
     ALL_DIMS,
     DataWithCoords,
     ImplementsDatasetReduce,
     _contains_datetime_like_objects,
 )
 from .coordinates import (
-    DatasetCoordinates,
     DataArrayCoordinates,
+    DatasetCoordinates,
     LevelCoordinatesSource,
     assert_coordinate_consistent,
     remap_label_indexers,
@@ -79,7 +81,6 @@
     maybe_wrap_array,
 )
 from .variable import IndexVariable, Variable, as_variable, broadcast_variables
-from ..plot.dataset_plot import _Dataset_PlotMethods
 
 if TYPE_CHECKING:
     from ..backends import AbstractDataStore, ZarrStore

xarray/core/duck_array_ops.py

@@ -13,7 +13,7 @@
 
 from . import dask_array_ops, dtypes, npcompat, nputils
 from .nputils import nanfirst, nanlast
-from .pycompat import dask_array_type, sparse_array_type
+from .pycompat import dask_array_type
 
 try:
     import dask.array as dask_array

xarray/core/groupby.py

@@ -7,16 +7,16 @@
 
 from . import dtypes, duck_array_ops, nputils, ops, utils
 from .arithmetic import SupportsArithmetic
-from .concat import concat
 from .common import ALL_DIMS, ImplementsArrayReduce, ImplementsDatasetReduce
+from .concat import concat
 from .options import _get_keep_attrs
 from .pycompat import integer_types
 from .utils import (
+    either_dict_or_kwargs,
     hashable,
     maybe_wrap_array,
     peek_at,
     safe_cast_to_index,
-    either_dict_or_kwargs,
 )
 from .variable import IndexVariable, Variable, as_variable
 

xarray/core/indexing.py

@@ -3,7 +3,7 @@
 from collections import defaultdict
 from contextlib import suppress
 from datetime import timedelta
-from typing import Any, Tuple, Sequence, Union
+from typing import Any, Sequence, Tuple, Union
 
 import numpy as np
 import pandas as pd

xarray/core/merge.py

@@ -1,5 +1,6 @@
 from collections import OrderedDict
 from typing import (
+    TYPE_CHECKING,
     Any,
     Dict,
     Hashable,
@@ -11,7 +12,6 @@
     Set,
     Tuple,
     Union,
-    TYPE_CHECKING,
 )
 
 import pandas as pd

xarray/core/npcompat.py

@@ -29,10 +29,10 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 import builtins
+import operator
 from distutils.version import LooseVersion
 from typing import Union
 
-import operator
 import numpy as np
 
 try:

xarray/core/pdcompat.py

@@ -38,10 +38,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from distutils.version import LooseVersion
+
 import numpy as np
 import pandas as pd
 
-
 # allow ourselves to type checks for Panel even after it's removed
 if LooseVersion(pd.__version__) < "0.25.0":
     Panel = pd.Panel

xarray/core/utils.py

@@ -31,7 +31,6 @@
 
 from .pycompat import dask_array_type
 
-
 K = TypeVar("K")
 V = TypeVar("V")
 T = TypeVar("T")

xarray/core/variable.py

@@ -3,7 +3,7 @@
 from collections import OrderedDict, defaultdict
 from datetime import timedelta
 from distutils.version import LooseVersion
-from typing import Any, Hashable, Mapping, MutableMapping, Union
+from typing import Any, Hashable, Mapping, Union
 
 import numpy as np
 import pandas as pd
@@ -18,9 +18,9 @@
     VectorizedIndexer,
     as_indexable,
 )
+from .npcompat import IS_NEP18_ACTIVE
 from .options import _get_keep_attrs
 from .pycompat import dask_array_type, integer_types
-from .npcompat import IS_NEP18_ACTIVE
 from .utils import (
     OrderedSet,
     decode_numpy_dict_values,

xarray/testing.py

@@ -5,12 +5,11 @@
 import numpy as np
 import pandas as pd
 
-from xarray.core import duck_array_ops
-from xarray.core import formatting
+from xarray.core import duck_array_ops, formatting
 from xarray.core.dataarray import DataArray
 from xarray.core.dataset import Dataset
-from xarray.core.variable import IndexVariable, Variable
 from xarray.core.indexes import default_indexes
+from xarray.core.variable import IndexVariable, Variable
 
 
 def _decode_string_data(data):

xarray/tests/__init__.py

@@ -1,4 +1,5 @@
 import importlib
+import platform
 import re
 import warnings
 from contextlib import contextmanager
@@ -32,7 +33,6 @@
 except ImportError:
     pass
 
-import platform
 
 arm_xfail = pytest.mark.xfail(
     platform.machine() == "aarch64" or "arm" in platform.machine(),