Skip to content

TST: Move merge/join tests into sub-dir #18643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2017
Merged

TST: Move merge/join tests into sub-dir #18643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added pandas/tests/reshape/merge/__init__.py
View file
Open in desktop
Empty file.
0 ...ests/reshape/data/allow_exact_matches.csv → ...eshape/merge/data/allow_exact_matches.csv
View file
Open in desktop
File renamed without changes.
0 ...ata/allow_exact_matches_and_tolerance.csv → ...ata/allow_exact_matches_and_tolerance.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/asof.csv → pandas/tests/reshape/merge/data/asof.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/asof2.csv → pandas/tests/reshape/merge/data/asof2.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/quotes.csv → pandas/tests/reshape/merge/data/quotes.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/quotes2.csv → pandas/tests/reshape/merge/data/quotes2.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/tolerance.csv → ...as/tests/reshape/merge/data/tolerance.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/trades.csv → pandas/tests/reshape/merge/data/trades.csv
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/data/trades2.csv → pandas/tests/reshape/merge/data/trades2.csv
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pandas/tests/reshape/test_join.py → pandas/tests/reshape/merge/test_join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 pandas/tests/reshape/test_merge.py → pandas/tests/reshape/merge/test_merge.py
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/test_merge_asof.py → ...as/tests/reshape/merge/test_merge_asof.py
View file
Open in desktop
File renamed without changes.
0 ...sts/reshape/test_merge_index_as_string.py → ...shape/merge/test_merge_index_as_string.py
View file
Open in desktop
File renamed without changes.
0 pandas/tests/reshape/test_merge_ordered.py → ...tests/reshape/merge/test_merge_ordered.py
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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']
},
Expand Down