Fix for Python 4: do not compare sys.version_info.minor to integer

Author: hugovk

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_api/__init__.py

@@ -8,7 +8,7 @@
 import sys
 
 # import from mock
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import patch
 else:
     from mock import patch

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_plotly/test_credentials.py

@@ -9,7 +9,7 @@
 import sys
 
 # import from mock
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import patch
 else:
     from mock import patch

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_plotly/test_plot.py

@@ -25,7 +25,7 @@
 
 
 # import from mock
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import patch
 else:
     from mock import patch

packages/python/plotly/_plotly_utils/utils.py

@@ -7,9 +7,6 @@
 from _plotly_utils.basevalidators import ImageUriValidator
 
 
-PY36_OR_LATER = sys.version_info.major == 3 and sys.version_info.minor >= 6
-
-
 class PlotlyJSONEncoder(_json.JSONEncoder):
     """
     Meant to be passed as the `cls` kwarg to json.dumps(obj, cls=..)

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_add_traces.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_batch_animate.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_move_delete_traces.py

@@ -4,7 +4,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_on_change.py

@@ -4,7 +4,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_plotly_relayout.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_plotly_restyle.py

@@ -3,7 +3,7 @@
 
 import plotly.graph_objs as go
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_figure_messages/test_plotly_update.py

@@ -4,7 +4,7 @@
 import plotly.graph_objs as go
 from plotly.basedatatypes import Undefined
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/plotly/tests/test_core/test_optional_imports/test_optional_imports.py

@@ -27,7 +27,7 @@ def test_get_module_import_exception(self):
         # Get module that raises an exception on import
         module_str = "plotly.tests.test_core." "test_optional_imports.exploding_module"
 
-        if sys.version_info.major == 3 and sys.version_info.minor >= 4:
+        if sys.version_info >= (3, 4):
             with self.assertLogs("_plotly_utils.optional_imports", level="ERROR") as cm:
                 module = get_module(module_str)
 

packages/python/plotly/plotly/tests/test_io/test_renderers.py

@@ -12,7 +12,7 @@
 import plotly.io as pio
 from plotly.offline import get_plotlyjs
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     import unittest.mock as mock
     from unittest.mock import MagicMock
 else:

packages/python/plotly/plotly/tests/test_io/test_to_from_json.py

@@ -6,7 +6,7 @@
 import sys
 import os
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
     import tempfile
 else:

packages/python/plotly/plotly/tests/test_orca/test_image_renderers.py

@@ -10,7 +10,7 @@
 
 from plotly.offline.offline import _get_jconfig
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     import unittest.mock as mock
 else:
     import mock

packages/python/plotly/plotly/tests/test_orca/test_to_image.py

@@ -7,7 +7,7 @@
 import sys
 import pandas as pd
 
-if sys.version_info.major == 3 and sys.version_info.minor >= 3:
+if sys.version_info.major >= 3:
     from unittest.mock import MagicMock
 else:
     from mock import MagicMock

packages/python/plotly/setup.py

@@ -161,7 +161,7 @@ def finalize_options(self):
         pass
 
     def run(self):
-        if sys.version_info.major != 3 or sys.version_info.minor < 6:
+        if sys.version_info < (3, 6):
             raise ImportError("Code generation must be executed with Python >= 3.6")
 
         from codegen import perform_codegen