Skip to content

Commit ce2e9c2

Browse files
reidy-pjreback
authored andcommitted
TST: Move merge/join tests into sub-dir (pandas-dev#18643)
1 parent de6e107 commit ce2e9c2

16 files changed

+3
-1
lines changed

pandas/tests/reshape/merge/__init__.py

Whitespace-only changes.

pandas/tests/reshape/test_join.py renamed to pandas/tests/reshape/merge/test_join.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from pandas._libs import join as libjoin
1515
import pandas.util.testing as tm
16-
from pandas.tests.reshape.test_merge import get_test_data, N, NGROUPS
16+
from pandas.tests.reshape.merge.test_merge import get_test_data, N, NGROUPS
1717

1818

1919
a_ = np.array

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,7 @@ def pxd(name):
761761
'pandas.tests.io.formats',
762762
'pandas.tests.groupby',
763763
'pandas.tests.reshape',
764+
'pandas.tests.reshape.merge',
764765
'pandas.tests.series',
765766
'pandas.tests.scalar',
766767
'pandas.tests.tseries',
@@ -800,6 +801,7 @@ def pxd(name):
800801
'pandas.tests.io.formats': ['data/*.csv'],
801802
'pandas.tests.io.msgpack': ['data/*.mp'],
802803
'pandas.tests.reshape': ['data/*.csv'],
804+
'pandas.tests.reshape.merge': ['data/*.csv'],
803805
'pandas.tests.tseries.offsets': ['data/*.pickle'],
804806
'pandas.io.formats': ['templates/*.tpl']
805807
},

0 commit comments

Comments
 (0)