From 81d595a70b3136bb6e7c947b7bc99508e313be59 Mon Sep 17 00:00:00 2001 From: thoo Date: Thu, 25 Oct 2018 17:46:01 -0400 Subject: [PATCH 1/4] Run Isort on tests/indexes P4/Final --- .../tests/indexes/period/test_arithmetic.py | 2 +- pandas/tests/indexes/period/test_asfreq.py | 4 +- pandas/tests/indexes/period/test_astype.py | 2 +- .../tests/indexes/period/test_construction.py | 3 +- pandas/tests/indexes/period/test_formats.py | 5 +-- pandas/tests/indexes/period/test_indexing.py | 11 ++--- .../indexes/period/test_partial_slicing.py | 8 ++-- pandas/tests/indexes/period/test_period.py | 10 ++--- .../tests/indexes/period/test_period_range.py | 3 +- .../indexes/period/test_scalar_compat.py | 2 +- pandas/tests/indexes/period/test_setops.py | 7 ++- pandas/tests/indexes/period/test_tools.py | 16 +++---- pandas/tests/indexes/test_base.py | 45 +++++++++---------- pandas/tests/indexes/test_category.py | 10 ++++- pandas/tests/indexes/test_frozen.py | 7 +-- 15 files changed, 69 insertions(+), 66 deletions(-) diff --git a/pandas/tests/indexes/period/test_arithmetic.py b/pandas/tests/indexes/period/test_arithmetic.py index d9cbb3ea27d7b..5864bc0cefcbc 100644 --- a/pandas/tests/indexes/period/test_arithmetic.py +++ b/pandas/tests/indexes/period/test_arithmetic.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -import pytest import numpy as np +import pytest import pandas as pd import pandas.util.testing as tm diff --git a/pandas/tests/indexes/period/test_asfreq.py b/pandas/tests/indexes/period/test_asfreq.py index ea59a57069faa..fed6bbce6259f 100644 --- a/pandas/tests/indexes/period/test_asfreq.py +++ b/pandas/tests/indexes/period/test_asfreq.py @@ -1,9 +1,9 @@ +import numpy as np import pytest -import numpy as np import pandas as pd +from pandas import DataFrame, PeriodIndex, Series from pandas.util import testing as tm -from pandas import PeriodIndex, Series, DataFrame class TestPeriodIndex(object): diff --git a/pandas/tests/indexes/period/test_astype.py b/pandas/tests/indexes/period/test_astype.py index a5042b8c714c8..f254cf2a9cae8 100644 --- a/pandas/tests/indexes/period/test_astype.py +++ b/pandas/tests/indexes/period/test_astype.py @@ -5,7 +5,7 @@ import pandas as pd import pandas.util.testing as tm -from pandas import NaT, Period, PeriodIndex, Int64Index, Index, period_range +from pandas import Index, Int64Index, NaT, Period, PeriodIndex, period_range class TestPeriodIndexAsType(object): diff --git a/pandas/tests/indexes/period/test_construction.py b/pandas/tests/indexes/period/test_construction.py index e1cefaf5905ad..b369c49ea5862 100644 --- a/pandas/tests/indexes/period/test_construction.py +++ b/pandas/tests/indexes/period/test_construction.py @@ -1,8 +1,7 @@ +import numpy as np import pytest -import numpy as np import pandas as pd -import pandas.util.testing as tm import pandas.core.indexes.period as period from pandas.compat import lrange, PY3, text_type, lmap from pandas import (Period, PeriodIndex, period_range, offsets, date_range, diff --git a/pandas/tests/indexes/period/test_formats.py b/pandas/tests/indexes/period/test_formats.py index 2a893ae16e30d..87211d091e4ea 100644 --- a/pandas/tests/indexes/period/test_formats.py +++ b/pandas/tests/indexes/period/test_formats.py @@ -1,10 +1,9 @@ -from pandas import PeriodIndex - import numpy as np import pytest -import pandas.util.testing as tm import pandas as pd +import pandas.util.testing as tm +from pandas import PeriodIndex def test_to_native_types(): diff --git a/pandas/tests/indexes/period/test_indexing.py b/pandas/tests/indexes/period/test_indexing.py index 609c4a828adec..b720f56eeab93 100644 --- a/pandas/tests/indexes/period/test_indexing.py +++ b/pandas/tests/indexes/period/test_indexing.py @@ -1,15 +1,16 @@ from datetime import datetime, timedelta +import numpy as np import pytest -import numpy as np import pandas as pd -from pandas.util import testing as tm -from pandas.compat import lrange +from pandas import ( + DatetimeIndex, Period, PeriodIndex, Series, notna, period_range +) from pandas._libs import tslibs -from pandas import (PeriodIndex, Series, DatetimeIndex, - period_range, Period, notna) from pandas._libs.tslibs import period as libperiod +from pandas.compat import lrange +from pandas.util import testing as tm class TestGetItem(object): diff --git a/pandas/tests/indexes/period/test_partial_slicing.py b/pandas/tests/indexes/period/test_partial_slicing.py index 82527464ea6e7..eec761395d971 100644 --- a/pandas/tests/indexes/period/test_partial_slicing.py +++ b/pandas/tests/indexes/period/test_partial_slicing.py @@ -1,11 +1,11 @@ -import pytest - import numpy as np +import pytest import pandas as pd +from pandas import ( + DataFrame, DatetimeIndex, Period, PeriodIndex, Series, period_range +) from pandas.util import testing as tm -from pandas import (Series, period_range, DatetimeIndex, PeriodIndex, - DataFrame, Period) class TestPeriodIndex(object): diff --git a/pandas/tests/indexes/period/test_period.py b/pandas/tests/indexes/period/test_period.py index 405edba83dc7a..e699a560cb2f6 100644 --- a/pandas/tests/indexes/period/test_period.py +++ b/pandas/tests/indexes/period/test_period.py @@ -1,13 +1,13 @@ -import pytest - import numpy as np +import pytest import pandas as pd import pandas.util._test_decorators as td +from pandas import ( + DataFrame, DatetimeIndex, Index, NaT, Period, PeriodIndex, Series, + date_range, offsets, period_range +) from pandas.util import testing as tm -from pandas import (PeriodIndex, period_range, DatetimeIndex, NaT, - Index, Period, Series, DataFrame, date_range, - offsets) from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 640f24f67f72f..fd8d2f94c1799 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -1,6 +1,7 @@ import pytest + import pandas.util.testing as tm -from pandas import date_range, NaT, period_range, Period, PeriodIndex +from pandas import NaT, Period, PeriodIndex, date_range, period_range class TestPeriodRange(object): diff --git a/pandas/tests/indexes/period/test_scalar_compat.py b/pandas/tests/indexes/period/test_scalar_compat.py index a66a81fe99cd4..48c1d5b8dd706 100644 --- a/pandas/tests/indexes/period/test_scalar_compat.py +++ b/pandas/tests/indexes/period/test_scalar_compat.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """Tests for PeriodIndex behaving like a vectorized Period scalar""" -from pandas import PeriodIndex, date_range, Timedelta import pandas.util.testing as tm +from pandas import PeriodIndex, Timedelta, date_range class TestPeriodIndexOps(object): diff --git a/pandas/tests/indexes/period/test_setops.py b/pandas/tests/indexes/period/test_setops.py index 6598e0663fb9a..479104fedcf74 100644 --- a/pandas/tests/indexes/period/test_setops.py +++ b/pandas/tests/indexes/period/test_setops.py @@ -1,11 +1,10 @@ -import pytest - import numpy as np +import pytest import pandas as pd -import pandas.util.testing as tm import pandas.core.indexes.period as period -from pandas import period_range, PeriodIndex, Index, date_range +import pandas.util.testing as tm +from pandas import Index, PeriodIndex, date_range, period_range def _permute(obj): diff --git a/pandas/tests/indexes/period/test_tools.py b/pandas/tests/indexes/period/test_tools.py index a7bd2f370996b..2919b97da5825 100644 --- a/pandas/tests/indexes/period/test_tools.py +++ b/pandas/tests/indexes/period/test_tools.py @@ -1,17 +1,17 @@ -import numpy as np from datetime import datetime, timedelta + +import numpy as np import pytest import pandas as pd -from pandas import Timedelta -import pandas.util.testing as tm import pandas.core.indexes.period as period -from pandas.compat import lrange - +import pandas.util.testing as tm +from pandas import ( + DatetimeIndex, Period, PeriodIndex, Series, Timedelta, Timestamp, + date_range, period_range, to_datetime +) from pandas._libs.tslibs.ccalendar import MONTHS - -from pandas import (PeriodIndex, Period, DatetimeIndex, Timestamp, Series, - date_range, to_datetime, period_range) +from pandas.compat import lrange class TestPeriodRepresentation(object): diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py index 921bcda62794d..daebc6e95aac4 100644 --- a/pandas/tests/indexes/test_base.py +++ b/pandas/tests/indexes/test_base.py @@ -1,37 +1,34 @@ # -*- coding: utf-8 -*- -import pytest - +import math +import operator +from collections import defaultdict from datetime import datetime, timedelta from decimal import Decimal -from collections import defaultdict +import numpy as np +import pytest + +import pandas as pd +import pandas.core.config as cf import pandas.util.testing as tm -from pandas.core.dtypes.generic import ABCIndex +from pandas import ( + CategoricalIndex, DataFrame, DatetimeIndex, Float64Index, Int64Index, + PeriodIndex, RangeIndex, Series, TimedeltaIndex, UInt64Index, date_range, + isna, period_range +) +from pandas._libs.tslib import Timestamp +from pandas.compat import ( + PY3, PY35, PY36, StringIO, lrange, lzip, range, text_type, u, zip +) +from pandas.compat.numpy import np_datetime64_compat from pandas.core.dtypes.common import is_unsigned_integer_dtype +from pandas.core.dtypes.generic import ABCIndex +from pandas.core.index import _get_combined_index, ensure_index_from_sequences from pandas.core.indexes.api import Index, MultiIndex +from pandas.core.indexes.datetimes import _to_m8 from pandas.tests.indexes.common import Base - -from pandas.compat import (range, lrange, lzip, u, - text_type, zip, PY3, PY35, PY36, StringIO) -import math -import operator -import numpy as np - -from pandas import (period_range, date_range, Series, - DataFrame, Float64Index, Int64Index, UInt64Index, - CategoricalIndex, DatetimeIndex, TimedeltaIndex, - PeriodIndex, RangeIndex, isna) -from pandas.core.index import _get_combined_index, ensure_index_from_sequences from pandas.util.testing import assert_almost_equal -from pandas.compat.numpy import np_datetime64_compat - -import pandas.core.config as cf - -from pandas.core.indexes.datetimes import _to_m8 - -import pandas as pd -from pandas._libs.tslib import Timestamp class TestIndex(Base): diff --git a/pandas/tests/indexes/test_category.py b/pandas/tests/indexes/test_category.py index d89baa41d33fe..d6e9565703f6b 100644 --- a/pandas/tests/indexes/test_category.py +++ b/pandas/tests/indexes/test_category.py @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- +import numpy as np import pytest import numpy as np +import pandas as pd +import pandas.core.config as cf import pandas.util.testing as tm from pandas.core.indexes.api import Index, CategoricalIndex from pandas.core.dtypes.dtypes import CategoricalDtype @@ -12,9 +15,12 @@ from pandas.compat import range, PY3 from pandas import Categorical, IntervalIndex, compat +from pandas.compat import PY3, range +from pandas.core.dtypes.dtypes import CategoricalDtype +from pandas.core.indexes.api import CategoricalIndex, Index from pandas.util.testing import assert_almost_equal -import pandas.core.config as cf -import pandas as pd + +from .common import Base if PY3: unicode = lambda x: x diff --git a/pandas/tests/indexes/test_frozen.py b/pandas/tests/indexes/test_frozen.py index 36d318e7a11aa..bc3e87a4622a7 100644 --- a/pandas/tests/indexes/test_frozen.py +++ b/pandas/tests/indexes/test_frozen.py @@ -1,8 +1,9 @@ import numpy as np -from pandas.util import testing as tm -from pandas.tests.test_base import CheckImmutable, CheckStringMixin -from pandas.core.indexes.frozen import FrozenList, FrozenNDArray + from pandas.compat import u +from pandas.core.indexes.frozen import FrozenList, FrozenNDArray +from pandas.tests.test_base import CheckImmutable, CheckStringMixin +from pandas.util import testing as tm class TestFrozenList(CheckImmutable, CheckStringMixin): From 8fac33b96d0eefb6190abce871f66fb4b4946edd Mon Sep 17 00:00:00 2001 From: thoo Date: Thu, 25 Oct 2018 21:46:36 -0400 Subject: [PATCH 2/4] update setup.cfg --- setup.cfg | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/setup.cfg b/setup.cfg index f26eac0d2ae62..636daf82195fc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -210,12 +210,9 @@ skip= pandas/tests/test_take.py, pandas/tests/test_nanops.py, pandas/tests/test_config.py, - pandas/tests/indexes/test_frozen.py, - pandas/tests/indexes/test_base.py, pandas/tests/indexes/test_numeric.py, pandas/tests/indexes/test_range.py, pandas/tests/indexes/datetimelike.py, - pandas/tests/indexes/test_category.py, pandas/tests/indexes/common.py, pandas/tests/indexes/conftest.py, pandas/tests/indexes/datetimes/test_indexing.py, @@ -258,19 +255,7 @@ skip= pandas/tests/indexes/multi/conftest.py, pandas/tests/indexes/multi/test_join.py, pandas/tests/indexes/multi/test_conversion.py, - pandas/tests/indexes/period/test_indexing.py, - pandas/tests/indexes/period/test_construction.py, - pandas/tests/indexes/period/test_asfreq.py, - pandas/tests/indexes/period/test_setops.py, - pandas/tests/indexes/period/test_period.py, - pandas/tests/indexes/period/test_tools.py, - pandas/tests/indexes/period/test_period_range.py, - pandas/tests/indexes/period/test_arithmetic.py, - pandas/tests/indexes/period/test_astype.py, - pandas/tests/indexes/period/test_scalar_compat.py, - pandas/tests/indexes/period/test_partial_slicing.py, - pandas/tests/indexes/period/test_ops.py, - pandas/tests/indexes/period/test_formats.py, + pandas/tests/indexes/interval/test_construction.py, pandas/tests/indexes/interval/test_interval_new.py, pandas/tests/indexes/interval/test_interval.py, From 1d68b23c7160b13cf84633fabd3225b2907fba43 Mon Sep 17 00:00:00 2001 From: thoo Date: Fri, 26 Oct 2018 00:49:57 -0400 Subject: [PATCH 3/4] add missing tm from manual rebase --- pandas/tests/indexes/period/test_construction.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pandas/tests/indexes/period/test_construction.py b/pandas/tests/indexes/period/test_construction.py index b369c49ea5862..cfc6c3b8b0a2e 100644 --- a/pandas/tests/indexes/period/test_construction.py +++ b/pandas/tests/indexes/period/test_construction.py @@ -3,9 +3,11 @@ import pandas as pd import pandas.core.indexes.period as period -from pandas.compat import lrange, PY3, text_type, lmap -from pandas import (Period, PeriodIndex, period_range, offsets, date_range, - Series, Index) +import pandas.util.testing as tm +from pandas import ( + Index, Period, PeriodIndex, Series, date_range, offsets, period_range +) +from pandas.compat import PY3, lmap, lrange, text_type from pandas.core.dtypes.dtypes import PeriodDtype From a244a170c1d18cd31ffd6b9d67f6fbf05a0d76e0 Mon Sep 17 00:00:00 2001 From: thoo Date: Fri, 26 Oct 2018 16:02:12 -0400 Subject: [PATCH 4/4] rerun isort| might be rebase related --- pandas/tests/indexes/period/test_ops.py | 3 +-- pandas/tests/indexes/test_category.py | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pandas/tests/indexes/period/test_ops.py b/pandas/tests/indexes/period/test_ops.py index 33858a28ec81b..4d3f9b7e95f8a 100644 --- a/pandas/tests/indexes/period/test_ops.py +++ b/pandas/tests/indexes/period/test_ops.py @@ -5,8 +5,7 @@ import pandas as pd import pandas._libs.tslib as tslib import pandas.util.testing as tm -from pandas import DatetimeIndex, PeriodIndex, Series, Period, Index - +from pandas import DatetimeIndex, Index, Period, PeriodIndex, Series from pandas.core.arrays import PeriodArray from pandas.tests.test_base import Ops diff --git a/pandas/tests/indexes/test_category.py b/pandas/tests/indexes/test_category.py index d6e9565703f6b..5c4e4d2417957 100644 --- a/pandas/tests/indexes/test_category.py +++ b/pandas/tests/indexes/test_category.py @@ -2,19 +2,12 @@ import numpy as np import pytest -import numpy as np import pandas as pd import pandas.core.config as cf import pandas.util.testing as tm -from pandas.core.indexes.api import Index, CategoricalIndex -from pandas.core.dtypes.dtypes import CategoricalDtype -from pandas._libs import index as libindex -from .common import Base - -from pandas.compat import range, PY3 - from pandas import Categorical, IntervalIndex, compat +from pandas._libs import index as libindex from pandas.compat import PY3, range from pandas.core.dtypes.dtypes import CategoricalDtype from pandas.core.indexes.api import CategoricalIndex, Index