Repository: pandas-dev/pandas

Issue:
TST: split out merge/join tests to a sub-dir
these should live in: ``pandas/tests/reshape/merge/``

     813 pandas/tests/reshape/test_join.py
    1673 pandas/tests/reshape/test_merge.py
     987 pandas/tests/reshape/test_merge_asof.py
     215 pandas/tests/reshape/test_merge_index_as_string.py
      83 pandas/tests/reshape/test_merge_ordered.py



Discussion:

Resolving patch:
diff --git a/setup.py b/setup.py
--- 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']
                     },


Test patch:
diff --git a/pandas/tests/reshape/merge/__init__.py b/pandas/tests/reshape/merge/__init__.py
new file mode 100644
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
--- 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