Skip to content

Commit

Permalink
TST: Fixed version comparison (#20469)
Browse files Browse the repository at this point in the history
* TST: Fixed version comparison

This failed to skip for 3.5.x because the micro component made it False.

* Use pandas.compat

* More pandas compat
  • Loading branch information
TomAugspurger committed Mar 24, 2018
1 parent 0699659 commit 4fb963b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pandas/tests/extension/json/test_json.py
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

0 comments on commit 4fb963b

Please sign in to comment.