Skip to content

Commit 3d65f02

Browse files
max-sixtyshoyer
authored andcommitted
isort (#2469)
1 parent 5153240 commit 3d65f02

35 files changed

+79
-87
lines changed

asv_bench/benchmarks/dataset_io.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import xarray as xr
77

8-
from . import randn, randint, requires_dask
8+
from . import randint, randn, requires_dask
99

1010
try:
1111
import dask

asv_bench/benchmarks/unstacking.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from __future__ import absolute_import, division, print_function
22

33
import numpy as np
4+
45
import xarray as xr
56

67
from . import requires_dask

properties/test_encode_decode.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"""
77
from __future__ import absolute_import, division, print_function
88

9-
from hypothesis import given, settings
10-
import hypothesis.strategies as st
119
import hypothesis.extra.numpy as npst
10+
import hypothesis.strategies as st
11+
from hypothesis import given, settings
1212

1313
import xarray as xr
1414

setup.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#!/usr/bin/env python
22
import sys
33

4-
from setuptools import find_packages, setup
5-
64
import versioneer
7-
5+
from setuptools import find_packages, setup
86

97
DISTNAME = 'xarray'
108
LICENSE = 'Apache'

versioneer.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -277,17 +277,19 @@
277277
"""
278278

279279
from __future__ import print_function
280-
try:
281-
import configparser
282-
except ImportError:
283-
import ConfigParser as configparser
280+
284281
import errno
285282
import json
286283
import os
287284
import re
288285
import subprocess
289286
import sys
290287

288+
try:
289+
import configparser
290+
except ImportError:
291+
import ConfigParser as configparser
292+
291293

292294
class VersioneerConfig:
293295
"""Container for Versioneer configuration parameters."""

xarray/backends/netCDF4_.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
from .. import Variable, coding
1111
from ..coding.variables import pop_to
1212
from ..core import indexing
13-
from ..core.pycompat import (
14-
PY3, OrderedDict, basestring, iteritems, suppress)
13+
from ..core.pycompat import PY3, OrderedDict, basestring, iteritems, suppress
1514
from ..core.utils import FrozenOrderedDict, close_on_error, is_remote_uri
1615
from .common import (
1716
HDF5_LOCK, BackendArray, DataStorePickleMixin, WritableCFDataStore,

xarray/backends/pseudonetcdf_.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
from __future__ import absolute_import
2-
from __future__ import division
3-
from __future__ import print_function
1+
from __future__ import absolute_import, division, print_function
42

53
import functools
64

75
import numpy as np
86

97
from .. import Variable
10-
from ..core.pycompat import OrderedDict
11-
from ..core.utils import (FrozenOrderedDict, Frozen)
128
from ..core import indexing
13-
14-
from .common import AbstractDataStore, DataStorePickleMixin, BackendArray
9+
from ..core.pycompat import OrderedDict
10+
from ..core.utils import Frozen, FrozenOrderedDict
11+
from .common import AbstractDataStore, BackendArray, DataStorePickleMixin
1512

1613

1714
class PncArrayWrapper(BackendArray):

xarray/backends/rasterio_.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
2+
import warnings
23
from collections import OrderedDict
34
from distutils.version import LooseVersion
4-
import warnings
55

66
import numpy as np
77

xarray/coding/cftime_offsets.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,14 @@
4141
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4242

4343
import re
44-
4544
from datetime import timedelta
4645
from functools import partial
4746

4847
import numpy as np
4948

50-
from .cftimeindex import _parse_iso8601_with_reso, CFTimeIndex
51-
from .times import format_cftime_datetime
5249
from ..core.pycompat import basestring
50+
from .cftimeindex import CFTimeIndex, _parse_iso8601_with_reso
51+
from .times import format_cftime_datetime
5352

5453

5554
def get_date_type(calendar):

xarray/coding/cftimeindex.py

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4141

4242
from __future__ import absolute_import
43+
4344
import re
4445
from datetime import timedelta
4546

xarray/coding/strings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from ..core.pycompat import bytes_type, dask_array_type, unicode_type
1010
from ..core.variable import Variable
1111
from .variables import (
12-
VariableCoder, lazy_elemwise_func, pop_to,
13-
safe_setitem, unpack_for_decoding, unpack_for_encoding)
12+
VariableCoder, lazy_elemwise_func, pop_to, safe_setitem,
13+
unpack_for_decoding, unpack_for_encoding)
1414

1515

1616
def create_vlen_dtype(element_type):

xarray/coding/times.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import numpy as np
1010
import pandas as pd
1111

12-
from ..core.common import contains_cftime_datetimes
1312
from ..core import indexing
13+
from ..core.common import contains_cftime_datetimes
1414
from ..core.formatting import first_n_items, format_timestamp, last_item
1515
from ..core.options import OPTIONS
1616
from ..core.pycompat import PY3

xarray/conventions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import numpy as np
77
import pandas as pd
88

9-
from .coding import times, strings, variables
9+
from .coding import strings, times, variables
1010
from .coding.variables import SerializationWarning
1111
from .core import duck_array_ops, indexing
1212
from .core.pycompat import (
13-
OrderedDict, basestring, bytes_type, iteritems, dask_array_type,
13+
OrderedDict, basestring, bytes_type, dask_array_type, iteritems,
1414
unicode_type)
1515
from .core.variable import IndexVariable, Variable, as_variable
1616

xarray/core/accessors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy as np
44
import pandas as pd
55

6-
from .common import is_np_datetime_like, _contains_datetime_like_objects
6+
from .common import _contains_datetime_like_objects, is_np_datetime_like
77
from .pycompat import dask_array_type
88

99

xarray/core/combine.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from .alignment import align
99
from .merge import merge
1010
from .pycompat import OrderedDict, basestring, iteritems
11-
from .variable import concat as concat_vars
1211
from .variable import IndexVariable, Variable, as_variable
12+
from .variable import concat as concat_vars
1313

1414

1515
def concat(objs, dim=None, data_vars='all', coords='different',

xarray/core/common.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import numpy as np
88
import pandas as pd
99

10-
from . import duck_array_ops, dtypes, formatting, ops
10+
from . import dtypes, duck_array_ops, formatting, ops
1111
from .arithmetic import SupportsArithmetic
1212
from .pycompat import OrderedDict, basestring, dask_array_type, suppress
13-
from .utils import either_dict_or_kwargs, Frozen, SortedKeysDict, ReprObject
14-
13+
from .utils import Frozen, ReprObject, SortedKeysDict, either_dict_or_kwargs
1514

1615
# Used as a sentinel value to indicate a all dimensions
1716
ALL_DIMS = ReprObject('<all-dims>')

xarray/core/computation.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
Functions for applying functions that act on arrays to xarray's labeled data.
33
"""
44
from __future__ import absolute_import, division, print_function
5-
from distutils.version import LooseVersion
5+
66
import functools
77
import itertools
88
import operator
99
from collections import Counter
10+
from distutils.version import LooseVersion
1011

1112
import numpy as np
1213

13-
from . import duck_array_ops
14-
from . import utils
14+
from . import duck_array_ops, utils
1515
from .alignment import deep_align
1616
from .merge import expand_and_merge_variables
17-
from .pycompat import OrderedDict, dask_array_type, basestring
17+
from .pycompat import OrderedDict, basestring, dask_array_type
1818
from .utils import is_dict_like
1919

2020
_DEFAULT_FROZEN_SET = frozenset()

xarray/core/dask_array_compat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
from distutils.version import LooseVersion
44

5+
import dask.array as da
56
import numpy as np
67
from dask import __version__ as dask_version
7-
import dask.array as da
88

99
try:
1010
from dask.array import isin

xarray/core/dask_array_ops.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from __future__ import absolute_import, division, print_function
2+
23
from distutils.version import LooseVersion
34

45
import numpy as np
56

6-
from . import nputils
7-
from . import dtypes
7+
from . import dtypes, nputils
88

99
try:
1010
import dask

xarray/core/dataset.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
alignment, computation, duck_array_ops, formatting, groupby, indexing, ops,
1717
resample, rolling, utils)
1818
from .. import conventions
19+
from ..coding.cftimeindex import _parse_array_of_cftime_strings
1920
from .alignment import align
2021
from .common import (
2122
ALL_DIMS, DataWithCoords, ImplementsDatasetReduce,
@@ -31,12 +32,11 @@
3132
from .pycompat import (
3233
OrderedDict, basestring, dask_array_type, integer_types, iteritems, range)
3334
from .utils import (
34-
Frozen, SortedKeysDict, either_dict_or_kwargs, decode_numpy_dict_values,
35-
ensure_us_time_resolution, hashable, maybe_wrap_array, datetime_to_numeric)
35+
Frozen, SortedKeysDict, datetime_to_numeric, decode_numpy_dict_values,
36+
either_dict_or_kwargs, ensure_us_time_resolution, hashable,
37+
maybe_wrap_array)
3638
from .variable import IndexVariable, Variable, as_variable, broadcast_variables
3739

38-
from ..coding.cftimeindex import _parse_array_of_cftime_strings
39-
4040
# list of attributes of pd.DatetimeIndex that are ndarrays of time info
4141
_DATETIMEINDEX_COMPONENTS = ['year', 'month', 'day', 'hour', 'minute',
4242
'second', 'microsecond', 'nanosecond', 'date',

xarray/core/formatting.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
from .options import OPTIONS
1717
from .pycompat import (
18-
PY2, bytes_type, dask_array_type, unicode_type, zip_longest,
19-
)
18+
PY2, bytes_type, dask_array_type, unicode_type, zip_longest)
2019

2120
try:
2221
from pandas.errors import OutOfBoundsDatetime

xarray/core/missing.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
from __future__ import absolute_import, division, print_function
22

3+
import warnings
34
from collections import Iterable
45
from functools import partial
56

6-
import warnings
7-
87
import numpy as np
98
import pandas as pd
109

1110
from . import rolling
1211
from .common import _contains_datetime_like_objects
1312
from .computation import apply_ufunc
13+
from .duck_array_ops import dask_array_type
1414
from .pycompat import iteritems
15-
from .utils import is_scalar, OrderedSet, datetime_to_numeric
15+
from .utils import OrderedSet, datetime_to_numeric, is_scalar
1616
from .variable import Variable, broadcast_variables
17-
from .duck_array_ops import dask_array_type
1817

1918

2019
class BaseInterpolator(object):

xarray/core/nanops.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import numpy as np
44

5-
from . import dtypes
5+
from . import dtypes, nputils
6+
from .duck_array_ops import (
7+
_dask_or_eager_func, count, fillna, isnull, where_method)
68
from .pycompat import dask_array_type
7-
from . duck_array_ops import (count, isnull, fillna, where_method,
8-
_dask_or_eager_func)
9-
from . import nputils
109

1110
try:
1211
import dask.array as dask_array

xarray/core/npcompat.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from __future__ import absolute_import, division, print_function
22

33
from distutils.version import LooseVersion
4+
45
import numpy as np
56

67
try:

xarray/core/resample.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import absolute_import, division, print_function
22

33
from . import ops
4-
from .groupby import DataArrayGroupBy, DatasetGroupBy, DEFAULT_DIMS
4+
from .groupby import DEFAULT_DIMS, DataArrayGroupBy, DatasetGroupBy
55
from .pycompat import OrderedDict, dask_array_type
66

77
RESAMPLE_DIM = '__resample_dim__'

xarray/plot/facetgrid.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import warnings
66

77
import numpy as np
8+
89
from ..core.formatting import format_item
910
from ..core.pycompat import getargspec
1011
from .utils import (

xarray/plot/utils.py

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from ..core.options import OPTIONS
99
from ..core.pycompat import basestring
1010
from ..core.utils import is_scalar
11-
from ..core.options import OPTIONS
1211

1312
ROBUST_PERCENTILE = 2.0
1413

xarray/tests/test_cftime_offsets.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
import pytest
2-
31
from itertools import product
42

53
import numpy as np
4+
import pytest
65

7-
from xarray.coding.cftime_offsets import (
8-
BaseCFTimeOffset, YearBegin, YearEnd, MonthBegin, MonthEnd,
9-
Day, Hour, Minute, Second, _days_in_month,
10-
to_offset, get_date_type, _MONTH_ABBREVIATIONS, to_cftime_datetime,
11-
cftime_range)
126
from xarray import CFTimeIndex
7+
from xarray.coding.cftime_offsets import (
8+
_MONTH_ABBREVIATIONS, BaseCFTimeOffset, Day, Hour, Minute, MonthBegin,
9+
MonthEnd, Second, YearBegin, YearEnd, _days_in_month, cftime_range,
10+
get_date_type, to_cftime_datetime, to_offset)
1311

1412
cftime = pytest.importorskip('cftime')
1513

xarray/tests/test_cftimeindex.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
from __future__ import absolute_import
22

3-
import pytest
3+
from datetime import timedelta
44

55
import numpy as np
66
import pandas as pd
7-
import xarray as xr
7+
import pytest
88

9-
from datetime import timedelta
9+
import xarray as xr
1010
from xarray.coding.cftimeindex import (
11-
parse_iso8601, CFTimeIndex, assert_all_valid_date_type,
12-
_parsed_string_to_bounds, _parse_iso8601_with_reso,
13-
_parse_array_of_cftime_strings)
11+
CFTimeIndex, _parse_array_of_cftime_strings, _parse_iso8601_with_reso,
12+
_parsed_string_to_bounds, assert_all_valid_date_type, parse_iso8601)
1413
from xarray.tests import assert_array_equal, assert_identical
1514

1615
from . import has_cftime, has_cftime_or_netCDF4, requires_cftime

0 commit comments

Comments
 (0)