From cfffa5600771202712ad59bbe8ec8ff2a44bd670 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 7 Jul 2018 14:33:24 -0500 Subject: [PATCH 1/2] TST: create pandas/tests/arrays to consolidate pandas-extension array testing --- pandas/tests/{categorical => arrays}/__init__.py | 0 pandas/tests/arrays/categorical/__init__.py | 0 pandas/tests/{ => arrays}/categorical/common.py | 0 pandas/tests/{ => arrays}/categorical/conftest.py | 0 pandas/tests/{ => arrays}/categorical/test_algos.py | 0 pandas/tests/{ => arrays}/categorical/test_analytics.py | 0 pandas/tests/{ => arrays}/categorical/test_api.py | 0 pandas/tests/{ => arrays}/categorical/test_constructors.py | 0 pandas/tests/{ => arrays}/categorical/test_dtypes.py | 0 pandas/tests/{ => arrays}/categorical/test_indexing.py | 0 pandas/tests/{ => arrays}/categorical/test_missing.py | 0 pandas/tests/{ => arrays}/categorical/test_operators.py | 0 pandas/tests/{ => arrays}/categorical/test_repr.py | 0 pandas/tests/{ => arrays}/categorical/test_sorting.py | 0 pandas/tests/{ => arrays}/categorical/test_subclass.py | 0 pandas/tests/{ => arrays}/categorical/test_warnings.py | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename pandas/tests/{categorical => arrays}/__init__.py (100%) create mode 100644 pandas/tests/arrays/categorical/__init__.py rename pandas/tests/{ => arrays}/categorical/common.py (100%) rename pandas/tests/{ => arrays}/categorical/conftest.py (100%) rename pandas/tests/{ => arrays}/categorical/test_algos.py (100%) rename pandas/tests/{ => arrays}/categorical/test_analytics.py (100%) rename pandas/tests/{ => arrays}/categorical/test_api.py (100%) rename pandas/tests/{ => arrays}/categorical/test_constructors.py (100%) rename pandas/tests/{ => arrays}/categorical/test_dtypes.py (100%) rename pandas/tests/{ => arrays}/categorical/test_indexing.py (100%) rename pandas/tests/{ => arrays}/categorical/test_missing.py (100%) rename pandas/tests/{ => arrays}/categorical/test_operators.py (100%) rename pandas/tests/{ => arrays}/categorical/test_repr.py (100%) rename pandas/tests/{ => arrays}/categorical/test_sorting.py (100%) rename pandas/tests/{ => arrays}/categorical/test_subclass.py (100%) rename pandas/tests/{ => arrays}/categorical/test_warnings.py (100%) diff --git a/pandas/tests/categorical/__init__.py b/pandas/tests/arrays/__init__.py similarity index 100% rename from pandas/tests/categorical/__init__.py rename to pandas/tests/arrays/__init__.py diff --git a/pandas/tests/arrays/categorical/__init__.py b/pandas/tests/arrays/categorical/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pandas/tests/categorical/common.py b/pandas/tests/arrays/categorical/common.py similarity index 100% rename from pandas/tests/categorical/common.py rename to pandas/tests/arrays/categorical/common.py diff --git a/pandas/tests/categorical/conftest.py b/pandas/tests/arrays/categorical/conftest.py similarity index 100% rename from pandas/tests/categorical/conftest.py rename to pandas/tests/arrays/categorical/conftest.py diff --git a/pandas/tests/categorical/test_algos.py b/pandas/tests/arrays/categorical/test_algos.py similarity index 100% rename from pandas/tests/categorical/test_algos.py rename to pandas/tests/arrays/categorical/test_algos.py diff --git a/pandas/tests/categorical/test_analytics.py b/pandas/tests/arrays/categorical/test_analytics.py similarity index 100% rename from pandas/tests/categorical/test_analytics.py rename to pandas/tests/arrays/categorical/test_analytics.py diff --git a/pandas/tests/categorical/test_api.py b/pandas/tests/arrays/categorical/test_api.py similarity index 100% rename from pandas/tests/categorical/test_api.py rename to pandas/tests/arrays/categorical/test_api.py diff --git a/pandas/tests/categorical/test_constructors.py b/pandas/tests/arrays/categorical/test_constructors.py similarity index 100% rename from pandas/tests/categorical/test_constructors.py rename to pandas/tests/arrays/categorical/test_constructors.py diff --git a/pandas/tests/categorical/test_dtypes.py b/pandas/tests/arrays/categorical/test_dtypes.py similarity index 100% rename from pandas/tests/categorical/test_dtypes.py rename to pandas/tests/arrays/categorical/test_dtypes.py diff --git a/pandas/tests/categorical/test_indexing.py b/pandas/tests/arrays/categorical/test_indexing.py similarity index 100% rename from pandas/tests/categorical/test_indexing.py rename to pandas/tests/arrays/categorical/test_indexing.py diff --git a/pandas/tests/categorical/test_missing.py b/pandas/tests/arrays/categorical/test_missing.py similarity index 100% rename from pandas/tests/categorical/test_missing.py rename to pandas/tests/arrays/categorical/test_missing.py diff --git a/pandas/tests/categorical/test_operators.py b/pandas/tests/arrays/categorical/test_operators.py similarity index 100% rename from pandas/tests/categorical/test_operators.py rename to pandas/tests/arrays/categorical/test_operators.py diff --git a/pandas/tests/categorical/test_repr.py b/pandas/tests/arrays/categorical/test_repr.py similarity index 100% rename from pandas/tests/categorical/test_repr.py rename to pandas/tests/arrays/categorical/test_repr.py diff --git a/pandas/tests/categorical/test_sorting.py b/pandas/tests/arrays/categorical/test_sorting.py similarity index 100% rename from pandas/tests/categorical/test_sorting.py rename to pandas/tests/arrays/categorical/test_sorting.py diff --git a/pandas/tests/categorical/test_subclass.py b/pandas/tests/arrays/categorical/test_subclass.py similarity index 100% rename from pandas/tests/categorical/test_subclass.py rename to pandas/tests/arrays/categorical/test_subclass.py diff --git a/pandas/tests/categorical/test_warnings.py b/pandas/tests/arrays/categorical/test_warnings.py similarity index 100% rename from pandas/tests/categorical/test_warnings.py rename to pandas/tests/arrays/categorical/test_warnings.py From 9b48d015fbe75e061c21e5ef1999f7c5c7728393 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 7 Jul 2018 15:29:29 -0500 Subject: [PATCH 2/2] fix import locations --- pandas/tests/arrays/categorical/test_api.py | 2 +- pandas/tests/arrays/categorical/test_indexing.py | 2 +- pandas/tests/arrays/categorical/test_operators.py | 2 +- pandas/tests/arrays/categorical/test_repr.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/tests/arrays/categorical/test_api.py b/pandas/tests/arrays/categorical/test_api.py index ad5b78b36438b..037f01733b51c 100644 --- a/pandas/tests/arrays/categorical/test_api.py +++ b/pandas/tests/arrays/categorical/test_api.py @@ -8,7 +8,7 @@ from pandas import Categorical, CategoricalIndex, Index, Series, DataFrame from pandas.core.arrays.categorical import _recode_for_categories -from pandas.tests.categorical.common import TestCategorical +from pandas.tests.arrays.categorical.common import TestCategorical class TestCategoricalAPI(object): diff --git a/pandas/tests/arrays/categorical/test_indexing.py b/pandas/tests/arrays/categorical/test_indexing.py index cf7b5cfa55882..b54ac2835bee3 100644 --- a/pandas/tests/arrays/categorical/test_indexing.py +++ b/pandas/tests/arrays/categorical/test_indexing.py @@ -6,7 +6,7 @@ import pandas.util.testing as tm from pandas import Categorical, Index, CategoricalIndex, PeriodIndex -from pandas.tests.categorical.common import TestCategorical +from pandas.tests.arrays.categorical.common import TestCategorical class TestCategoricalIndexingWithFactor(TestCategorical): diff --git a/pandas/tests/arrays/categorical/test_operators.py b/pandas/tests/arrays/categorical/test_operators.py index a26de32d7446c..6d7a98f146679 100644 --- a/pandas/tests/arrays/categorical/test_operators.py +++ b/pandas/tests/arrays/categorical/test_operators.py @@ -7,7 +7,7 @@ import pandas.util.testing as tm from pandas import Categorical, Series, DataFrame, date_range -from pandas.tests.categorical.common import TestCategorical +from pandas.tests.arrays.categorical.common import TestCategorical class TestCategoricalOpsWithFactor(TestCategorical): diff --git a/pandas/tests/arrays/categorical/test_repr.py b/pandas/tests/arrays/categorical/test_repr.py index 0cadf66b24d46..520d6637c0310 100644 --- a/pandas/tests/arrays/categorical/test_repr.py +++ b/pandas/tests/arrays/categorical/test_repr.py @@ -6,7 +6,7 @@ period_range, timedelta_range) from pandas.compat import u, PY3 from pandas.core.config import option_context -from pandas.tests.categorical.common import TestCategorical +from pandas.tests.arrays.categorical.common import TestCategorical class TestCategoricalReprWithFactor(TestCategorical):