From d75e18e7acea548c356e3a9e6c5589160fceb0b9 Mon Sep 17 00:00:00 2001 From: Paul Reidy Date: Tue, 5 Dec 2017 07:45:27 +0000 Subject: [PATCH] TST: Move merge/join tests into sub-dir --- pandas/tests/reshape/merge/__init__.py | 0 pandas/tests/reshape/{ => merge}/data/allow_exact_matches.csv | 0 .../{ => merge}/data/allow_exact_matches_and_tolerance.csv | 0 pandas/tests/reshape/{ => merge}/data/asof.csv | 0 pandas/tests/reshape/{ => merge}/data/asof2.csv | 0 pandas/tests/reshape/{ => merge}/data/quotes.csv | 0 pandas/tests/reshape/{ => merge}/data/quotes2.csv | 0 pandas/tests/reshape/{ => merge}/data/tolerance.csv | 0 pandas/tests/reshape/{ => merge}/data/trades.csv | 0 pandas/tests/reshape/{ => merge}/data/trades2.csv | 0 pandas/tests/reshape/{ => merge}/test_join.py | 2 +- pandas/tests/reshape/{ => merge}/test_merge.py | 0 pandas/tests/reshape/{ => merge}/test_merge_asof.py | 0 pandas/tests/reshape/{ => merge}/test_merge_index_as_string.py | 0 pandas/tests/reshape/{ => merge}/test_merge_ordered.py | 0 setup.py | 2 ++ 16 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 pandas/tests/reshape/merge/__init__.py rename pandas/tests/reshape/{ => merge}/data/allow_exact_matches.csv (100%) rename pandas/tests/reshape/{ => merge}/data/allow_exact_matches_and_tolerance.csv (100%) rename pandas/tests/reshape/{ => merge}/data/asof.csv (100%) rename pandas/tests/reshape/{ => merge}/data/asof2.csv (100%) rename pandas/tests/reshape/{ => merge}/data/quotes.csv (100%) rename pandas/tests/reshape/{ => merge}/data/quotes2.csv (100%) rename pandas/tests/reshape/{ => merge}/data/tolerance.csv (100%) rename pandas/tests/reshape/{ => merge}/data/trades.csv (100%) rename pandas/tests/reshape/{ => merge}/data/trades2.csv (100%) rename pandas/tests/reshape/{ => merge}/test_join.py (99%) rename pandas/tests/reshape/{ => merge}/test_merge.py (100%) rename pandas/tests/reshape/{ => merge}/test_merge_asof.py (100%) rename pandas/tests/reshape/{ => merge}/test_merge_index_as_string.py (100%) rename pandas/tests/reshape/{ => merge}/test_merge_ordered.py (100%) diff --git a/pandas/tests/reshape/merge/__init__.py b/pandas/tests/reshape/merge/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pandas/tests/reshape/data/allow_exact_matches.csv b/pandas/tests/reshape/merge/data/allow_exact_matches.csv similarity index 100% rename from pandas/tests/reshape/data/allow_exact_matches.csv rename to pandas/tests/reshape/merge/data/allow_exact_matches.csv diff --git a/pandas/tests/reshape/data/allow_exact_matches_and_tolerance.csv b/pandas/tests/reshape/merge/data/allow_exact_matches_and_tolerance.csv similarity index 100% rename from pandas/tests/reshape/data/allow_exact_matches_and_tolerance.csv rename to pandas/tests/reshape/merge/data/allow_exact_matches_and_tolerance.csv diff --git a/pandas/tests/reshape/data/asof.csv b/pandas/tests/reshape/merge/data/asof.csv similarity index 100% rename from pandas/tests/reshape/data/asof.csv rename to pandas/tests/reshape/merge/data/asof.csv diff --git a/pandas/tests/reshape/data/asof2.csv b/pandas/tests/reshape/merge/data/asof2.csv similarity index 100% rename from pandas/tests/reshape/data/asof2.csv rename to pandas/tests/reshape/merge/data/asof2.csv diff --git a/pandas/tests/reshape/data/quotes.csv b/pandas/tests/reshape/merge/data/quotes.csv similarity index 100% rename from pandas/tests/reshape/data/quotes.csv rename to pandas/tests/reshape/merge/data/quotes.csv diff --git a/pandas/tests/reshape/data/quotes2.csv b/pandas/tests/reshape/merge/data/quotes2.csv similarity index 100% rename from pandas/tests/reshape/data/quotes2.csv rename to pandas/tests/reshape/merge/data/quotes2.csv diff --git a/pandas/tests/reshape/data/tolerance.csv b/pandas/tests/reshape/merge/data/tolerance.csv similarity index 100% rename from pandas/tests/reshape/data/tolerance.csv rename to pandas/tests/reshape/merge/data/tolerance.csv diff --git a/pandas/tests/reshape/data/trades.csv b/pandas/tests/reshape/merge/data/trades.csv similarity index 100% rename from pandas/tests/reshape/data/trades.csv rename to pandas/tests/reshape/merge/data/trades.csv diff --git a/pandas/tests/reshape/data/trades2.csv b/pandas/tests/reshape/merge/data/trades2.csv similarity index 100% rename from pandas/tests/reshape/data/trades2.csv rename to pandas/tests/reshape/merge/data/trades2.csv diff --git a/pandas/tests/reshape/test_join.py b/pandas/tests/reshape/merge/test_join.py similarity index 99% rename from pandas/tests/reshape/test_join.py rename to pandas/tests/reshape/merge/test_join.py index 76791b08a26be..a64069fa700b8 100644 --- a/pandas/tests/reshape/test_join.py +++ b/pandas/tests/reshape/merge/test_join.py @@ -13,7 +13,7 @@ from pandas._libs import join as libjoin import pandas.util.testing as tm -from pandas.tests.reshape.test_merge import get_test_data, N, NGROUPS +from pandas.tests.reshape.merge.test_merge import get_test_data, N, NGROUPS a_ = np.array diff --git a/pandas/tests/reshape/test_merge.py b/pandas/tests/reshape/merge/test_merge.py similarity index 100% rename from pandas/tests/reshape/test_merge.py rename to pandas/tests/reshape/merge/test_merge.py diff --git a/pandas/tests/reshape/test_merge_asof.py b/pandas/tests/reshape/merge/test_merge_asof.py similarity index 100% rename from pandas/tests/reshape/test_merge_asof.py rename to pandas/tests/reshape/merge/test_merge_asof.py diff --git a/pandas/tests/reshape/test_merge_index_as_string.py b/pandas/tests/reshape/merge/test_merge_index_as_string.py similarity index 100% rename from pandas/tests/reshape/test_merge_index_as_string.py rename to pandas/tests/reshape/merge/test_merge_index_as_string.py diff --git a/pandas/tests/reshape/test_merge_ordered.py b/pandas/tests/reshape/merge/test_merge_ordered.py similarity index 100% rename from pandas/tests/reshape/test_merge_ordered.py rename to pandas/tests/reshape/merge/test_merge_ordered.py diff --git a/setup.py b/setup.py index 004f111115079..5820b0dd9933c 100755 --- a/setup.py +++ b/setup.py @@ -761,6 +761,7 @@ def pxd(name): 'pandas.tests.io.formats', 'pandas.tests.groupby', 'pandas.tests.reshape', + 'pandas.tests.reshape.merge', 'pandas.tests.series', 'pandas.tests.scalar', 'pandas.tests.tseries', @@ -800,6 +801,7 @@ def pxd(name): 'pandas.tests.io.formats': ['data/*.csv'], 'pandas.tests.io.msgpack': ['data/*.mp'], 'pandas.tests.reshape': ['data/*.csv'], + 'pandas.tests.reshape.merge': ['data/*.csv'], 'pandas.tests.tseries.offsets': ['data/*.pickle'], 'pandas.io.formats': ['templates/*.tpl'] },