Skip to content

Commit

Permalink
isort (pydata#1924)
Browse files Browse the repository at this point in the history
* isort configs

* all files sorted

* default to thirdparty

* sorting after defaulting to third party

* don't ignore sorting errors in Stickler (though I don't think it'll check anyway!)

* lots of gaps?

* double negative

* @stickler-ci

* isort home stretch

* unsure why this is being picked up now

* ok fun is fading now

* Fixing style errors.

* random char

* lint
  • Loading branch information
max-sixty authored Feb 27, 2018
1 parent fd2e542 commit 0e73e24
Show file tree
Hide file tree
Showing 87 changed files with 492 additions and 609 deletions.
12 changes: 5 additions & 7 deletions asv_bench/benchmarks/dataarray_missing.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import pandas as pd

import xarray as xr

from . import randn, requires_dask

try:
import dask # noqa
except ImportError:
pass

import xarray as xr

from . import randn, requires_dask


def make_bench_data(shape, frac_nan, chunks):
vals = randn(shape, frac_nan)
Expand Down
12 changes: 5 additions & 7 deletions asv_bench/benchmarks/dataset_io.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import numpy as np
import pandas as pd

import xarray as xr

from . import randn, requires_dask

try:
import dask
import dask.multiprocessing
except ImportError:
pass

import xarray as xr

from . import randn, requires_dask


class IOSingleNetCDF(object):
"""
Expand Down
8 changes: 3 additions & 5 deletions asv_bench/benchmarks/indexing.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import numpy as np
import pandas as pd
import xarray as xr

from . import randn, randint, requires_dask
import xarray as xr

from . import randint, randn, requires_dask

nx = 3000
ny = 2000
Expand Down
5 changes: 2 additions & 3 deletions asv_bench/benchmarks/reindexing.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import numpy as np

import xarray as xr

from . import requires_dask
Expand Down
11 changes: 5 additions & 6 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from __future__ import absolute_import, division, print_function

import sys
import os
import datetime
import importlib
import os
import sys

import xarray

allowed_failures = set()

Expand All @@ -44,7 +44,6 @@
'gallery/plot_rasterio_rgb.py',
'gallery/plot_rasterio.py'])

import xarray
print("xarray: %s, %s" % (xarray.__version__, xarray.__file__))

# -- General configuration ------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion doc/examples/_code/weather_data_setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import xarray as xr
import numpy as np
import pandas as pd
import seaborn as sns # pandas aware plotting library

import xarray as xr

np.random.seed(123)

times = pd.date_range('2000-01-01', '2001-12-31', name='time')
Expand Down
3 changes: 2 additions & 1 deletion doc/gallery/plot_cartopy_facetgrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@

from __future__ import division

import xarray as xr
import cartopy.crs as ccrs
import matplotlib.pyplot as plt

import xarray as xr

# Load the data
ds = xr.tutorial.load_dataset('air_temperature')
air = ds.air.isel(time=[0, 724]) - 273.15
Expand Down
3 changes: 2 additions & 1 deletion doc/gallery/plot_colorbar_center.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
"""

import xarray as xr
import matplotlib.pyplot as plt

import xarray as xr

# Load the data
ds = xr.tutorial.load_dataset('air_temperature')
air = ds.air.isel(time=0)
Expand Down
3 changes: 2 additions & 1 deletion doc/gallery/plot_lines_from_2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
"""

import xarray as xr
import matplotlib.pyplot as plt

import xarray as xr

# Load the data
ds = xr.tutorial.load_dataset('air_temperature')
air = ds.air - 273.15 # to celsius
Expand Down
5 changes: 3 additions & 2 deletions doc/gallery/plot_rasterio.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@

import os
import urllib.request
import numpy as np
import xarray as xr

import cartopy.crs as ccrs
import matplotlib.pyplot as plt
import numpy as np
from rasterio.warp import transform

import xarray as xr

# Download the file from rasterio's repository
url = 'https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif'
Expand Down
4 changes: 3 additions & 1 deletion doc/gallery/plot_rasterio_rgb.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@

import os
import urllib.request
import xarray as xr

import cartopy.crs as ccrs
import matplotlib.pyplot as plt

import xarray as xr

# Download the file from rasterio's repository
url = 'https://github.com/mapbox/rasterio/raw/master/tests/data/RGB.byte.tif'
urllib.request.urlretrieve(url, 'RGB.byte.tif')
Expand Down
7 changes: 6 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ python_files=test_*.py

[flake8]
max-line-length=79
ignore=I002
ignore=
exclude=
doc/

[isort]
default_section=THIRDPARTY
known_first_party=xarray
multi_line_output=4
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import sys
import warnings

from setuptools import setup, find_packages
from setuptools import find_packages, setup

MAJOR = 0
MINOR = 10
Expand Down
12 changes: 5 additions & 7 deletions xarray/backends/api.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import os.path
from glob import glob
from io import BytesIO
from numbers import Number


import numpy as np

from .. import backends, conventions, Dataset
from .common import ArrayWriter, GLOBAL_LOCK
from .. import Dataset, backends, conventions
from ..core import indexing
from ..core.combine import auto_combine
from ..core.utils import close_on_error, is_remote_uri
from ..core.pycompat import basestring, path_type
from ..core.utils import close_on_error, is_remote_uri
from .common import GLOBAL_LOCK, ArrayWriter

DATAARRAY_NAME = '__xarray_dataarray_name__'
DATAARRAY_VARIABLE = '__xarray_dataarray_variable__'
Expand Down
14 changes: 7 additions & 7 deletions xarray/backends/common.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
import numpy as np
from __future__ import absolute_import, division, print_function

import contextlib
import logging
import time
import traceback
import contextlib
from collections import Mapping, OrderedDict
import warnings
from collections import Mapping, OrderedDict

import numpy as np

from ..conventions import cf_encoder
from ..core import indexing
from ..core.pycompat import dask_array_type, iteritems
from ..core.utils import FrozenOrderedDict, NdimSizeLenMixin
from ..core.pycompat import iteritems, dask_array_type

try:
from dask.utils import SerializableLock as Lock
Expand Down
15 changes: 7 additions & 8 deletions xarray/backends/h5netcdf_.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import functools

import numpy as np

from .. import Variable
from ..core import indexing
from ..core.pycompat import OrderedDict, bytes_type, iteritems, unicode_type
from ..core.utils import FrozenOrderedDict, close_on_error
from ..core.pycompat import iteritems, bytes_type, unicode_type, OrderedDict

from .common import WritableCFDataStore, DataStorePickleMixin, find_root
from .netCDF4_ import (_nc4_group, _encode_nc4_variable, _get_datatype,
_extract_nc4_variable_encoding, BaseNetCDF4Array)
from .common import DataStorePickleMixin, WritableCFDataStore, find_root
from .netCDF4_ import (
BaseNetCDF4Array, _encode_nc4_variable, _extract_nc4_variable_encoding,
_get_datatype, _nc4_group)


class H5NetCDFArrayWrapper(BaseNetCDF4Array):
Expand Down
8 changes: 3 additions & 5 deletions xarray/backends/memory.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import copy

import numpy as np

from ..core.variable import Variable
from ..core.pycompat import OrderedDict

from ..core.variable import Variable
from .common import AbstractWritableDataStore


Expand Down
20 changes: 9 additions & 11 deletions xarray/backends/netCDF4_.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import functools
import operator
import warnings
from distutils.version import LooseVersion

import numpy as np

from .. import conventions
from .. import Variable
from .. import Variable, conventions
from ..conventions import pop_to
from ..core import indexing
from ..core.utils import (FrozenOrderedDict, close_on_error, is_remote_uri)
from ..core.pycompat import iteritems, basestring, OrderedDict, PY3, suppress

from .common import (WritableCFDataStore, robust_getitem, BackendArray,
DataStorePickleMixin, find_root)
from .netcdf3 import (encode_nc3_attr_value, encode_nc3_variable)
from ..core.pycompat import PY3, OrderedDict, basestring, iteritems, suppress
from ..core.utils import FrozenOrderedDict, close_on_error, is_remote_uri
from .common import (
BackendArray, DataStorePickleMixin, WritableCFDataStore, find_root,
robust_getitem)
from .netcdf3 import encode_nc3_attr_value, encode_nc3_variable

# This lookup table maps from dtype.byteorder to a readable endian
# string used by netCDF4.
Expand Down
10 changes: 4 additions & 6 deletions xarray/backends/netcdf3.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import unicodedata

import numpy as np

from .. import conventions, Variable
from ..core.pycompat import basestring, unicode_type, OrderedDict

from .. import Variable, conventions
from ..core.pycompat import OrderedDict, basestring, unicode_type

# Special characters that are permitted in netCDF names except in the
# 0th position of the string
Expand Down
8 changes: 3 additions & 5 deletions xarray/backends/pydap_.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import numpy as np

from .. import Variable
from ..core.utils import FrozenOrderedDict, Frozen, is_dict_like
from ..core import indexing
from ..core.pycompat import integer_types

from ..core.utils import Frozen, FrozenOrderedDict, is_dict_like
from .common import AbstractDataStore, BackendArray, robust_getitem


Expand Down
9 changes: 3 additions & 6 deletions xarray/backends/pynio_.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import absolute_import, division, print_function

import functools

import numpy as np

from .. import Variable
from ..core.utils import (FrozenOrderedDict, Frozen)
from ..core import indexing

from .common import AbstractDataStore, DataStorePickleMixin, BackendArray
from ..core.utils import Frozen, FrozenOrderedDict
from .common import AbstractDataStore, BackendArray, DataStorePickleMixin


class NioArrayWrapper(BackendArray):
Expand Down
Loading

0 comments on commit 0e73e24

Please sign in to comment.