From 6932fdbaf7ff0bcf3b42becd71972b9c42a8b17e Mon Sep 17 00:00:00 2001 From: mwoss Date: Thu, 3 Jan 2019 03:11:20 +0100 Subject: [PATCH 1/5] Fix import format at pandas/tests/io/arithmetic directory --- pandas/tests/arithmetic/conftest.py | 7 +++---- pandas/tests/arithmetic/test_datetime64.py | 21 +++++++++------------ pandas/tests/arithmetic/test_numeric.py | 11 +++++------ pandas/tests/arithmetic/test_object.py | 8 +++----- pandas/tests/arithmetic/test_period.py | 9 ++++----- pandas/tests/arithmetic/test_timedelta64.py | 13 ++++++------- setup.cfg | 6 ------ 7 files changed, 30 insertions(+), 45 deletions(-) diff --git a/pandas/tests/arithmetic/conftest.py b/pandas/tests/arithmetic/conftest.py index 44e6cc664de6d..15b5f0b8a9db0 100644 --- a/pandas/tests/arithmetic/conftest.py +++ b/pandas/tests/arithmetic/conftest.py @@ -1,12 +1,11 @@ # -*- coding: utf-8 -*- -import pytest - import numpy as np -import pandas as pd +import pytest from pandas.compat import long -import pandas.util.testing as tm +import pandas as pd +import pandas.util.testing as tm # ------------------------------------------------------------------ # Helper Functions diff --git a/pandas/tests/arithmetic/test_datetime64.py b/pandas/tests/arithmetic/test_datetime64.py index d4e82fe2659a0..37ad45d3b93ed 100644 --- a/pandas/tests/arithmetic/test_datetime64.py +++ b/pandas/tests/arithmetic/test_datetime64.py @@ -2,29 +2,26 @@ # Arithmetic tests for DataFrame/Series/Index/Array classes that should # behave identically. # Specifically for datetime64 and datetime64tz dtypes -import operator from datetime import datetime, timedelta -import warnings from itertools import product, starmap +import operator +import warnings import numpy as np import pytest import pytz -import pandas as pd -import pandas.util.testing as tm - -from pandas.compat.numpy import np_datetime64_compat -from pandas.errors import PerformanceWarning, NullFrequencyError - from pandas._libs.tslibs.conversion import localize_pydatetime from pandas._libs.tslibs.offsets import shift_months +from pandas.compat.numpy import np_datetime64_compat +from pandas.errors import NullFrequencyError, PerformanceWarning -from pandas.core.indexes.datetimes import _to_m8 - +import pandas as pd from pandas import ( - Timestamp, Timedelta, Period, Series, date_range, NaT, - DatetimeIndex, TimedeltaIndex) + DatetimeIndex, NaT, Period, Series, Timedelta, TimedeltaIndex, Timestamp, + date_range) +from pandas.core.indexes.datetimes import _to_m8 +import pandas.util.testing as tm def assert_all(obj): diff --git a/pandas/tests/arithmetic/test_numeric.py b/pandas/tests/arithmetic/test_numeric.py index c603485f6f076..0ea27e98d4846 100644 --- a/pandas/tests/arithmetic/test_numeric.py +++ b/pandas/tests/arithmetic/test_numeric.py @@ -6,16 +6,15 @@ from itertools import combinations import operator -import pytest import numpy as np - -import pandas as pd -import pandas.util.testing as tm +import pytest from pandas.compat import PY3, Iterable -from pandas.core import ops -from pandas import Timedelta, Series, Index, TimedeltaIndex +import pandas as pd +from pandas import Index, Series, Timedelta, TimedeltaIndex +from pandas.core import ops +import pandas.util.testing as tm # ------------------------------------------------------------------ # Comparisons diff --git a/pandas/tests/arithmetic/test_object.py b/pandas/tests/arithmetic/test_object.py index e9a3f4accc486..20a1122d1ef48 100644 --- a/pandas/tests/arithmetic/test_object.py +++ b/pandas/tests/arithmetic/test_object.py @@ -4,15 +4,13 @@ # Specifically for object dtype import operator -import pytest import numpy as np +import pytest import pandas as pd -import pandas.util.testing as tm -from pandas.core import ops - from pandas import Series, Timestamp - +from pandas.core import ops +import pandas.util.testing as tm # ------------------------------------------------------------------ # Comparisons diff --git a/pandas/tests/arithmetic/test_period.py b/pandas/tests/arithmetic/test_period.py index 469353042a878..891fa5bfe7134 100644 --- a/pandas/tests/arithmetic/test_period.py +++ b/pandas/tests/arithmetic/test_period.py @@ -7,16 +7,15 @@ import numpy as np import pytest -import pandas as pd -import pandas.util.testing as tm - from pandas._libs.tslibs.period import IncompatibleFrequency from pandas.errors import PerformanceWarning +import pandas as pd +from pandas import Period, PeriodIndex, Series, period_range from pandas.core import ops -from pandas import Period, PeriodIndex, period_range, Series -from pandas.tseries.frequencies import to_offset +import pandas.util.testing as tm +from pandas.tseries.frequencies import to_offset # ------------------------------------------------------------------ # Comparisons diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py index 12ed174d6cc53..4474b06b19536 100644 --- a/pandas/tests/arithmetic/test_timedelta64.py +++ b/pandas/tests/arithmetic/test_timedelta64.py @@ -3,17 +3,16 @@ # behave identically. from datetime import datetime, timedelta -import pytest import numpy as np - -import pandas as pd -import pandas.util.testing as tm +import pytest from pandas.errors import NullFrequencyError, PerformanceWarning + +import pandas as pd from pandas import ( - timedelta_range, - Timedelta, Timestamp, NaT, Series, TimedeltaIndex, DatetimeIndex, - DataFrame) + DataFrame, DatetimeIndex, NaT, Series, Timedelta, TimedeltaIndex, + Timestamp, timedelta_range) +import pandas.util.testing as tm def get_upcast_box(box, vector): diff --git a/setup.cfg b/setup.cfg index 032a41df90f83..57125fc05bd71 100644 --- a/setup.cfg +++ b/setup.cfg @@ -128,12 +128,6 @@ skip= pandas/tests/dtypes/test_dtypes.py, pandas/tests/dtypes/test_inference.py, pandas/tests/dtypes/test_missing.py, - pandas/tests/arithmetic/test_numeric.py, - pandas/tests/arithmetic/test_object.py, - pandas/tests/arithmetic/test_period.py, - pandas/tests/arithmetic/test_datetime64.py, - pandas/tests/arithmetic/conftest.py, - pandas/tests/arithmetic/test_timedelta64.py, pandas/tests/internals/test_internals.py, pandas/tests/plotting/test_datetimelike.py, pandas/tests/plotting/test_series.py, From 6ffd1263d6f455bb2ee7c76d7497cb031d264285 Mon Sep 17 00:00:00 2001 From: mwoss Date: Thu, 3 Jan 2019 12:36:50 +0100 Subject: [PATCH 2/5] Fix a partially incorrect conflict resolve from previous commit (wrong function name) --- pandas/tests/arithmetic/test_datetime64.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/arithmetic/test_datetime64.py b/pandas/tests/arithmetic/test_datetime64.py index 37ad45d3b93ed..7d01d39ae6bb5 100644 --- a/pandas/tests/arithmetic/test_datetime64.py +++ b/pandas/tests/arithmetic/test_datetime64.py @@ -20,7 +20,7 @@ from pandas import ( DatetimeIndex, NaT, Period, Series, Timedelta, TimedeltaIndex, Timestamp, date_range) -from pandas.core.indexes.datetimes import _to_m8 +from pandas.core.indexes.datetimes import _to_M8 import pandas.util.testing as tm @@ -346,7 +346,7 @@ class TestDatetimeIndexComparisons(object): def test_comparators(self, op): index = tm.makeDateIndex(100) element = index[len(index) // 2] - element = _to_m8(element) + element = _to_M8(element) arr = np.array(index) arr_result = op(arr, element) From 7aa472ed430cf14aaf14b56e6feeffcdd4b77fa0 Mon Sep 17 00:00:00 2001 From: mwoss Date: Thu, 3 Jan 2019 14:35:24 +0100 Subject: [PATCH 3/5] Fix linting errors --- pandas/tests/arithmetic/conftest.py | 4 ++-- pandas/tests/arithmetic/test_numeric.py | 1 + pandas/tests/arithmetic/test_object.py | 1 + pandas/tests/arithmetic/test_period.py | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pandas/tests/arithmetic/conftest.py b/pandas/tests/arithmetic/conftest.py index 15b5f0b8a9db0..c69ad98e002e3 100644 --- a/pandas/tests/arithmetic/conftest.py +++ b/pandas/tests/arithmetic/conftest.py @@ -2,10 +2,10 @@ import numpy as np import pytest -from pandas.compat import long - import pandas as pd import pandas.util.testing as tm +from pandas.compat import long + # ------------------------------------------------------------------ # Helper Functions diff --git a/pandas/tests/arithmetic/test_numeric.py b/pandas/tests/arithmetic/test_numeric.py index 0ea27e98d4846..7afb90978131d 100644 --- a/pandas/tests/arithmetic/test_numeric.py +++ b/pandas/tests/arithmetic/test_numeric.py @@ -19,6 +19,7 @@ # ------------------------------------------------------------------ # Comparisons + class TestNumericComparisons(object): def test_operator_series_comparison_zerorank(self): # GH#13006 diff --git a/pandas/tests/arithmetic/test_object.py b/pandas/tests/arithmetic/test_object.py index 20a1122d1ef48..9917c45ef6d12 100644 --- a/pandas/tests/arithmetic/test_object.py +++ b/pandas/tests/arithmetic/test_object.py @@ -15,6 +15,7 @@ # ------------------------------------------------------------------ # Comparisons + class TestObjectComparisons(object): def test_comparison_object_numeric_nas(self): diff --git a/pandas/tests/arithmetic/test_period.py b/pandas/tests/arithmetic/test_period.py index 891fa5bfe7134..cdacd4b42d683 100644 --- a/pandas/tests/arithmetic/test_period.py +++ b/pandas/tests/arithmetic/test_period.py @@ -20,6 +20,7 @@ # ------------------------------------------------------------------ # Comparisons + class TestPeriodIndexComparisons(object): @pytest.mark.parametrize("other", ["2017", 2017]) From 0a55c589f40b1b31ec40d9be4bc9cf20f81d6f72 Mon Sep 17 00:00:00 2001 From: mwoss Date: Thu, 3 Jan 2019 22:20:12 +0100 Subject: [PATCH 4/5] Remove tests/arithmetic from setup.cfg --- setup.cfg | 6 ------ 1 file changed, 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index c21f09f131dbd..a1c82304c5a72 100644 --- a/setup.cfg +++ b/setup.cfg @@ -121,12 +121,6 @@ skip= pandas/tests/api/test_types.py, pandas/tests/api/test_api.py, pandas/tests/tools/test_numeric.py, - pandas/tests/arithmetic/test_numeric.py, - pandas/tests/arithmetic/test_object.py, - pandas/tests/arithmetic/test_period.py, - pandas/tests/arithmetic/test_datetime64.py, - pandas/tests/arithmetic/conftest.py, - pandas/tests/arithmetic/test_timedelta64.py, pandas/tests/internals/test_internals.py, pandas/tests/plotting/test_datetimelike.py, pandas/tests/plotting/test_series.py, From 2eb02d872d000cb64f71d9223d6da86667744691 Mon Sep 17 00:00:00 2001 From: mwoss Date: Thu, 3 Jan 2019 23:28:57 +0100 Subject: [PATCH 5/5] Repair import order in test/arithmetic/conftest.py --- pandas/tests/arithmetic/conftest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandas/tests/arithmetic/conftest.py b/pandas/tests/arithmetic/conftest.py index c69ad98e002e3..671fe69750c57 100644 --- a/pandas/tests/arithmetic/conftest.py +++ b/pandas/tests/arithmetic/conftest.py @@ -2,14 +2,15 @@ import numpy as np import pytest -import pandas as pd -import pandas.util.testing as tm from pandas.compat import long +import pandas as pd +import pandas.util.testing as tm # ------------------------------------------------------------------ # Helper Functions + def id_func(x): if isinstance(x, tuple): assert len(x) == 2