Skip to content

One-off isort run #3705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
os.environ["PYTHONPATH"] = str(root)
sys.path.insert(0, str(root))

import xarray
import xarray # isort:skip

allowed_failures = set()

Expand Down
16 changes: 8 additions & 8 deletions properties/test_pandas_roundtrip.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Property-based tests for roundtripping between xarray and pandas objects.
"""
import pytest

pytest.importorskip("hypothesis")

from functools import partial
import hypothesis.extra.numpy as npst
import hypothesis.extra.pandas as pdst
import hypothesis.strategies as st
from hypothesis import given

import numpy as np
import pandas as pd
import pytest

import xarray as xr

pytest.importorskip("hypothesis")
import hypothesis.extra.numpy as npst # isort:skip
import hypothesis.extra.pandas as pdst # isort:skip
import hypothesis.strategies as st # isort:skip
from hypothesis import given # isort:skip

numeric_dtypes = st.one_of(
npst.unsigned_integer_dtypes(), npst.integer_dtypes(), npst.floating_dtypes()
)
Expand Down
2 changes: 1 addition & 1 deletion xarray/core/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
IndexVariable,
Variable,
as_variable,
broadcast_variables,
assert_unique_multiindex_level_names,
broadcast_variables,
)

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion xarray/core/duck_array_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import numpy as np
import pandas as pd

from . import dask_array_ops, dask_array_compat, dtypes, npcompat, nputils
from . import dask_array_compat, dask_array_ops, dtypes, npcompat, nputils
from .nputils import nanfirst, nanlast
from .pycompat import dask_array_type

Expand Down
2 changes: 1 addition & 1 deletion xarray/core/parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
from typing import (
Any,
Callable,
Dict,
DefaultDict,
Dict,
Hashable,
Mapping,
Sequence,
Expand Down
3 changes: 1 addition & 2 deletions xarray/tests/test_accessor_dt.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
requires_cftime,
requires_dask,
)

from .test_dask import raise_if_dask_computes, assert_chunks_equal
from .test_dask import assert_chunks_equal, raise_if_dask_computes


class TestDatetimeAccessor:
Expand Down
1 change: 1 addition & 0 deletions xarray/tests/test_units.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import xarray as xr
from xarray.core import formatting
from xarray.core.npcompat import IS_NEP18_ACTIVE

from .test_variable import VariableSubclassobjects

pint = pytest.importorskip("pint")
Expand Down