From 5f064c9cd841200472f96c1585bcc37995170155 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 23 Mar 2018 06:10:42 -0500 Subject: [PATCH 1/3] TST: Fixed version comparison This failed to skip for 3.5.x because the micro component made it False. --- pandas/tests/extension/json/test_json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index aec561ece8573..2e5e1da2dbd8c 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -81,7 +81,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(sys.version_info < (3, 6), reason="Dictionary order unstable") @unhashable From add17ad4bb051a992ab12b905742a4aace792866 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 23 Mar 2018 09:00:07 -0500 Subject: [PATCH 2/3] Use pandas.compat --- pandas/tests/extension/json/test_json.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index 2e5e1da2dbd8c..c4c5fd69a9f9b 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -4,6 +4,7 @@ import pytest +from pandas.compat import PY36 from pandas.tests.extension import base from .array import JSONArray, JSONDtype, make_data @@ -81,7 +82,7 @@ def test_fillna_frame(self): class TestMethods(base.BaseMethodsTests): unhashable = pytest.mark.skip(reason="Unhashable") - unstable = pytest.mark.skipif(sys.version_info < (3, 6), + unstable = pytest.mark.skipif(not PY36, # 3.6 or higher reason="Dictionary order unstable") @unhashable From 291601e401d6ad523daf0b90caaad5dd3ed75075 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 23 Mar 2018 13:12:55 -0500 Subject: [PATCH 3/3] More pandas compat --- pandas/tests/extension/json/test_json.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index c4c5fd69a9f9b..8083a1ce69092 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -1,16 +1,14 @@ import operator -import sys import pytest -from pandas.compat import PY36 +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