Require python 3.6 and CI maintenance

packages/python/chart-studio/test_requirements/requirements_37.txt

@@ -0,0 +1,12 @@
+decorator==4.0.9
+nose==1.3.7
+requests==2.12.4
+six==1.10.0
+pytz==2016.10
+retrying==1.3.3
+pytest==3.5.1
+pandas==0.23.2
+numpy==1.14.3
+ipywidgets==7.2.0
+matplotlib==2.2.3
+--editable=./plotly

packages/python/plotly/_plotly_utils/optional_imports.py

@@ -32,5 +32,5 @@ def get_module(name, should_load=True):
             _not_importable.add(name)
         except Exception as e:
             _not_importable.add(name)
-            msg = "Error importing optional module {}".format(name)
+            msg = f"Error importing optional module {name}"
             logger.exception(msg)

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

@@ -66,36 +66,6 @@ def test_add_traces(self):
         )
 
 
-class TestAddTracesRowsColsDataTypes(TestCase):
-    def test_add_traces_with_iterable(self):
-        import plotly.express as px
-
-        df = px.data.tips()
-        fig = px.scatter(df, x="total_bill", y="tip", color="day")
-        from plotly.subplots import make_subplots
-
-        fig2 = make_subplots(1, 2)
-        fig2.add_traces(fig.data, rows=[1,] * len(fig.data), cols=[1,] * len(fig.data))
-
-        expected_data_length = 4
-
-        self.assertEqual(expected_data_length, len(fig2.data))
-
-    def test_add_traces_with_integers(self):
-        import plotly.express as px
-
-        df = px.data.tips()
-        fig = px.scatter(df, x="total_bill", y="tip", color="day")
-        from plotly.subplots import make_subplots
-
-        fig2 = make_subplots(1, 2)
-        fig2.add_traces(fig.data, rows=1, cols=2)
-
-        expected_data_length = 4
-
-        self.assertEqual(expected_data_length, len(fig2.data))
-
-
 def test_add_trace_exclude_empty_subplots():
     # Add traces
     fig = make_subplots(2, 2)

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

@@ -2,12 +2,8 @@
 
 from unittest import TestCase
 
-import json as _json
-
 from plotly.utils import PlotlyJSONEncoder, get_by_path, node_generator
-from time import time
-import numpy as np
-import plotly.graph_objects as go
+import json as _json
 
 
 class TestJSONEncoder(TestCase):
@@ -21,38 +17,6 @@ def test_invalid_encode_exception(self):
         with self.assertRaises(TypeError):
             _json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)
 
-    def test_fast_track_finite_arrays(self):
-        # if NaN or Infinity is found in the json dump
-        # of a figure, it is decoded and re-encoded to replace these values
-        # with null. This test checks that NaN and Infinity values are
-        # indeed converted to null, and that the encoding of figures
-        # without inf or nan is faster (because we can avoid decoding
-        # and reencoding).
-        z = np.random.randn(100, 100)
-        x = np.arange(100.0)
-        fig_1 = go.Figure(go.Heatmap(z=z, x=x))
-        t1 = time()
-        json_str_1 = _json.dumps(fig_1, cls=PlotlyJSONEncoder)
-        t2 = time()
-        x[0] = np.nan
-        x[1] = np.inf
-        fig_2 = go.Figure(go.Heatmap(z=z, x=x))
-        t3 = time()
-        json_str_2 = _json.dumps(fig_2, cls=PlotlyJSONEncoder)
-        t4 = time()
-        assert t2 - t1 < t4 - t3
-        assert "null" in json_str_2
-        assert "NaN" not in json_str_2
-        assert "Infinity" not in json_str_2
-        x = np.arange(100.0)
-        fig_3 = go.Figure(go.Heatmap(z=z, x=x))
-        fig_3.update_layout(title_text="Infinity")
-        t5 = time()
-        json_str_3 = _json.dumps(fig_3, cls=PlotlyJSONEncoder)
-        t6 = time()
-        assert t2 - t1 < t6 - t5
-        assert "Infinity" in json_str_3
-
 
 class TestGetByPath(TestCase):
     def test_get_by_path(self):
@@ -86,46 +50,3 @@ def test_node_generator(self):
         ]
         for i, item in enumerate(node_generator(node0)):
             self.assertEqual(item, expected_node_path_tuples[i])
-
-
-class TestNumpyIntegerBaseType(TestCase):
-    def test_numpy_integer_import(self):
-        # should generate a figure with subplots of array and not throw a ValueError
-        import numpy as np
-        import plotly.graph_objects as go
-        from plotly.subplots import make_subplots
-
-        indices_rows = np.array([1], dtype=np.int)
-        indices_cols = np.array([1], dtype=np.int)
-        fig = make_subplots(rows=1, cols=1)
-        fig.add_trace(go.Scatter(y=[1]), row=indices_rows[0], col=indices_cols[0])
-
-        data_path = ("data", 0, "y")
-        value = get_by_path(fig, data_path)
-        expected_value = (1,)
-        self.assertEqual(value, expected_value)
-
-    def test_get_numpy_int_type(self):
-        import numpy as np
-        from _plotly_utils.utils import _get_int_type
-
-        int_type_tuple = _get_int_type()
-        expected_tuple = (int, np.integer)
-
-        self.assertEqual(int_type_tuple, expected_tuple)
-
-
-class TestNoNumpyIntegerBaseType(TestCase):
-    def test_no_numpy_int_type(self):
-        import sys
-        from _plotly_utils.utils import _get_int_type
-        from _plotly_utils.optional_imports import get_module
-
-        np = get_module("numpy", should_load=False)
-        if np:
-            sys.modules.pop("numpy")
-
-        int_type_tuple = _get_int_type()
-        expected_tuple = (int,)
-
-        self.assertEqual(int_type_tuple, expected_tuple)

packages/python/plotly/plotly/tests/test_core/test_autoshapes/test_annotated_shapes.py → packages/python/plotly/plotly/tests/test_optional/test_autoshapes/test_annotated_shapes.py

@@ -28,7 +28,7 @@
 import sys
 import pytest
 import json
-from common import _cmp_partial_dict, _check_figure_layout_objects
+from .common import _cmp_partial_dict, _check_figure_layout_objects
 
 
 @pytest.fixture

packages/python/plotly/plotly/tests/test_core/test_autoshapes/test_axis_span_shapes.py → packages/python/plotly/plotly/tests/test_optional/test_autoshapes/test_axis_span_shapes.py

@@ -3,7 +3,7 @@
 from plotly.basedatatypes import _indexing_combinations
 import plotly.express as px
 import pytest
-from common import _cmp_partial_dict, _check_figure_layout_objects
+from .common import _cmp_partial_dict, _check_figure_layout_objects
 
 
 @pytest.fixture

packages/python/plotly/plotly/tests/test_optional/test_offline/test_offline.py

@@ -40,6 +40,7 @@ def test_iplot_works_after_you_call_init_notebook_mode(self):
 
         @pytest.mark.matplotlib
         def test_iplot_mpl_works(self):
+            plotly.offline.init_notebook_mode()
             # Generate matplotlib plot for tests
             fig = plt.figure()
 

packages/python/plotly/plotly/tests/test_optional/test_subplots/test_make_subplots.py

@@ -16,3 +16,33 @@ def test_subplot_titles_numpy_array(self):
             subplot_titles=np.array(["", "Inset"]),
         )
         self.assertEqual(fig, expected)
+
+
+class TestAddTracesRowsColsDataTypes(TestCase):
+    def test_add_traces_with_iterable(self):
+        import plotly.express as px
+
+        df = px.data.tips()
+        fig = px.scatter(df, x="total_bill", y="tip", color="day")
+        from plotly.subplots import make_subplots
+
+        fig2 = make_subplots(1, 2)
+        fig2.add_traces(fig.data, rows=[1,] * len(fig.data), cols=[1,] * len(fig.data))
+
+        expected_data_length = 4
+
+        self.assertEqual(expected_data_length, len(fig2.data))
+
+    def test_add_traces_with_integers(self):
+        import plotly.express as px
+
+        df = px.data.tips()
+        fig = px.scatter(df, x="total_bill", y="tip", color="day")
+        from plotly.subplots import make_subplots
+
+        fig2 = make_subplots(1, 2)
+        fig2.add_traces(fig.data, rows=1, cols=2)
+
+        expected_data_length = 4
+
+        self.assertEqual(expected_data_length, len(fig2.data))