Skip to content

CLN/TST: Cleanup tests in test_ujson.py #21739

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
jreback merged 1 commit into from
Jul 5, 2018
Merged

CLN/TST: Cleanup tests in test_ujson.py #21739

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
6 changes: 3 additions & 3 deletions pandas/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def string_dtype(request):
return request.param


@pytest.fixture(params=["float32", "float64"])
@pytest.fixture(params=[float, "float32", "float64"])
def float_dtype(request):
"""
Parameterized fixture for float dtypes.
Expand All @@ -262,7 +262,7 @@ def float_dtype(request):
return request.param


@pytest.fixture(params=["complex64", "complex128"])
@pytest.fixture(params=[complex, "complex64", "complex128"])
def complex_dtype(request):
"""
Parameterized fixture for complex dtypes.
Expand All @@ -275,7 +275,7 @@ def complex_dtype(request):


UNSIGNED_INT_DTYPES = ["uint8", "uint16", "uint32", "uint64"]
SIGNED_INT_DTYPES = ["int8", "int16", "int32", "int64"]
SIGNED_INT_DTYPES = [int, "int8", "int16", "int32", "int64"]
ALL_INT_DTYPES = UNSIGNED_INT_DTYPES + SIGNED_INT_DTYPES


Expand Down
Loading