Skip to content

TST: Fixed version comparison #20469

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 3 commits into from
Mar 24, 2018
Merged

TST: Fixed version comparison #20469

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f064c9
TST: Fixed version comparison
TomAugspurger Mar 23, 2018
add17ad
Use pandas.compat
TomAugspurger Mar 23, 2018
291601e
More pandas compat
TomAugspurger Mar 23, 2018
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
7 changes: 3 additions & 4 deletions pandas/tests/extension/json/test_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import operator
import sys

import pytest


from pandas.compat import PY2, PY36
from pandas.tests.extension import base

from .array import JSONArray, JSONDtype, make_data

pytestmark = pytest.mark.skipif(sys.version_info[0] == 2,
reason="Py2 doesn't have a UserDict")
pytestmark = pytest.mark.skipif(PY2, reason="Py2 doesn't have a UserDict")


@pytest.fixture
Expand Down Expand Up @@ -81,7 +80,7 @@ def test_fillna_frame(self):

class TestMethods(base.BaseMethodsTests):
unhashable = pytest.mark.skip(reason="Unhashable")
unstable = pytest.mark.skipif(sys.version_info <= (3, 5),
unstable = pytest.mark.skipif(not PY36, # 3.6 or higher
reason="Dictionary order unstable")

@unhashable
Expand Down