make cdn url generator not test exclusive

Author: adehad

packages/python/plotly/plotly/io/_base_renderers.py

@@ -7,9 +7,10 @@
 from os.path import isdir
 
 import six
-from plotly.io import to_json, to_image, write_image, write_html
 from plotly import utils, optional_imports
+from plotly.io import to_json, to_image, write_image, write_html
 from plotly.io._orca import ensure_server
+from plotly.io._utils import plotly_cdn_url
 from plotly.offline.offline import _get_jconfig, get_plotlyjs
 from plotly.tools import return_figure_from_figure_or_data
 
@@ -289,7 +290,7 @@ def activate(self):
         require.undef("plotly");
         requirejs.config({{
             paths: {{
-                'plotly': ['https://cdn.plot.ly/plotly-latest.min']
+                'plotly': ['{plotly_cdn}']
             }}
         }});
         require(['plotly'], function(Plotly) {{
@@ -298,7 +299,9 @@ def activate(self):
         }}
         </script>
         """.format(
-                    win_config=_window_plotly_config, mathjax_config=_mathjax_config
+                    win_config=_window_plotly_config,
+                    mathjax_config=_mathjax_config,
+                    plotly_cdn=plotly_cdn_url().rstrip(".js"),
                 )
 
             else:

packages/python/plotly/plotly/io/_html.py

@@ -5,8 +5,8 @@
 
 import six
 
-from plotly.io._utils import validate_coerce_fig_to_dict
-from plotly.offline.offline import _get_jconfig, get_plotlyjs, get_plotlyjs_version
+from plotly.io._utils import validate_coerce_fig_to_dict, plotly_cdn_url
+from plotly.offline.offline import _get_jconfig, get_plotlyjs
 from plotly import utils
 
 
@@ -273,14 +273,14 @@ def to_html(
         require_end = "});"
 
     elif include_plotlyjs == "cdn" or include_plotlyjs == "cdn-latest":
-        cdn_ver = get_plotlyjs_version()
+        cdn_url = plotly_cdn_url()
         if include_plotlyjs == "cdn-latest":
-            cdn_ver = "latest"
+            cdn_url = plotly_cdn_url(cdn_ver="latest")
         load_plotlyjs = """\
         {win_config}
-        <script src="https://cdn.plot.ly/plotly-{cdn_ver}.min.js"></script>\
+        <script src="{cdn_url}"></script>\
     """.format(
-            win_config=_window_plotly_config, cdn_ver=cdn_ver
+            win_config=_window_plotly_config, cdn_url=cdn_url
         )
 
     elif include_plotlyjs == "directory":

packages/python/plotly/plotly/io/_utils.py

@@ -2,6 +2,7 @@
 
 import plotly
 import plotly.graph_objs as go
+from plotly.offline import get_plotlyjs_version
 
 
 def validate_coerce_fig_to_dict(fig, validate):
@@ -40,3 +41,10 @@ def validate_coerce_output_type(output_type):
     Must be one of: 'Figure', 'FigureWidget'"""
         )
     return cls
+
+
+def plotly_cdn_url(cdn_ver=get_plotlyjs_version()):
+    """Return a valid plotly CDN url."""
+    return "https://cdn.plot.ly/plotly-{cdn_ver}.min.js".format(
+        cdn_ver=cdn_ver,
+    )

packages/python/plotly/plotly/tests/test_html.py renamed to packages/python/plotly/plotly/tests/test_io/test_html.py

@@ -6,7 +6,7 @@
 
 import plotly.graph_objs as go
 import plotly.io as pio
-from plotly.tests.utils import plotly_cdn_url
+from plotly.io._utils import plotly_cdn_url
 
 
 if sys.version_info >= (3, 3):

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

@@ -11,7 +11,7 @@
 import plotly.graph_objs as go
 import plotly.io as pio
 from plotly.offline import get_plotlyjs
-from plotly.tests.utils import plotly_cdn_url
+from plotly.io._utils import plotly_cdn_url
 
 if sys.version_info >= (3, 3):
     import unittest.mock as mock
@@ -135,8 +135,8 @@ def assert_not_full_html(html):
     assert not html.startswith("<html")
 
 
-def assert_connected(html):
-    assert plotly_cdn_url() in html
+def assert_html_renderer_connected(html):
+    assert plotly_cdn_url().rstrip(".js") in html
 
 
 def assert_offline(html):
@@ -167,7 +167,7 @@ def test_colab_renderer_show(fig1):
     # Check html contents
     html = mock_arg1["text/html"]
     assert_full_html(html)
-    assert_connected(html)
+    assert_html_renderer_connected(html)
     assert_not_requirejs(html)
 
     # check kwargs
@@ -196,7 +196,7 @@ def test_notebook_connected_show(fig1, name, connected):
     # Check init display contents
     bundle_display_html = mock_arg1_html
     if connected:
-        assert_connected(bundle_display_html)
+        assert_html_renderer_connected(bundle_display_html)
     else:
         assert_offline(bundle_display_html)
 

packages/python/plotly/plotly/tests/utils.py

@@ -2,7 +2,6 @@
 from numbers import Number as Num
 from unittest import TestCase
 import plotly.io as pio
-from plotly.offline import get_plotlyjs_version
 
 
 class TestCaseNoTemplate(TestCase):
@@ -96,10 +95,3 @@ def is_num_list(item):
     except TypeError:
         return False
     return True
-
-
-def plotly_cdn_url(cdn_ver=get_plotlyjs_version()):
-    """Return plotly CDN url for use in assertions."""
-    return "https://cdn.plot.ly/plotly-{cdn_ver}.min.js".format(
-        cdn_ver=cdn_ver
-    )