Merge branch 'master' into update-plotly-js

Author: LiamConnors

CHANGELOG.md

@@ -18,11 +18,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
   - Fixed another compatibility issue with Pandas 2.0, just affecting `px.*(line_close=True)` [[#4190](https://github.com/plotly/plotly.py/pull/4190)]
+  - Empty pandas dataframe with facet row/column set no longer fails [[#4038](https://github.com/plotly/plotly.py/pull/4038)]
   - Added some rounding to the `make_subplots` function to handle situations where the user-input specs cause the domain to exceed 1 by small amounts [[#4153](https://github.com/plotly/plotly.py/pull/4153)]
   - Sanitize JSON output to prevent an XSS vector when graphs are inserted directly into HTML [[#4196](https://github.com/plotly/plotly.py/pull/4196)]
   - Fixed issue with shapes and annotations plotting on the wrong y axis when supplied with a specific axis in the `yref` parameter [[#4177](https://github.com/plotly/plotly.py/pull/4177)]
   - Remove `use_2to3` setuptools arg, which is invalid in the latest Python and setuptools versions [[#4206](https://github.com/plotly/plotly.py/pull/4206)]
   - Fix [#4066](https://github.com/plotly/plotly.py/issues/4066) JupyterLab v4 giving tiny default graph height [[#4227](https://github.com/plotly/plotly.py/pull/4227)]
+  - Fixed issue with `colors.n_colors` where generated RGB color values were not being constrained to stay between 0 and 255 [[#4110](https://github.com/plotly/plotly.py/pull/4110)]
 
 ## [5.14.1] - 2023-04-05
 

packages/python/plotly/_plotly_utils/colors/__init__.py

@@ -694,11 +694,19 @@ def n_colors(lowcolor, highcolor, n_colors, colortype="tuple"):
     incr_2 = diff_2 / (n_colors - 1)
     list_of_colors = []
 
+    def _constrain_color(c):
+        if c > 255.0:
+            return 255.0
+        elif c < 0.0:
+            return 0.0
+        else:
+            return c
+
     for index in range(n_colors):
         new_tuple = (
-            lowcolor[0] + (index * incr_0),
-            lowcolor[1] + (index * incr_1),
-            lowcolor[2] + (index * incr_2),
+            _constrain_color(lowcolor[0] + (index * incr_0)),
+            _constrain_color(lowcolor[1] + (index * incr_1)),
+            _constrain_color(lowcolor[2] + (index * incr_2)),
         )
         list_of_colors.append(new_tuple)
 

packages/python/plotly/_plotly_utils/tests/validators/test_integer_validator.py

@@ -74,7 +74,7 @@ def test_acceptance_min(val, validator_min):
     assert validator_min.validate_coerce(val) == approx(val)
 
 
-@pytest.mark.parametrize("val", [-2, -123, np.iinfo(np.int).min])
+@pytest.mark.parametrize("val", [-2, -123, np.iinfo(int).min])
 def test_rejection_min(val, validator_min):
     with pytest.raises(ValueError) as validation_failure:
         validator_min.validate_coerce(val)

packages/python/plotly/plotly/express/_core.py

@@ -1880,6 +1880,10 @@ def infer_config(args, constructor, trace_patch, layout_patch):
         args[position] = args["marginal"]
         args[other_position] = None
 
+    # Ignore facet rows and columns when data frame is empty so as to prevent nrows/ncols equaling 0
+    if len(args["data_frame"]) == 0:
+        args["facet_row"] = args["facet_col"] = None
+
     # If both marginals and faceting are specified, faceting wins
     if args.get("facet_col") is not None and args.get("marginal_y") is not None:
         args["marginal_y"] = None

packages/python/plotly/plotly/io/_renderers.py

@@ -525,13 +525,15 @@ def show(fig, renderer=None, validate=True, **kwargs):
 else:
     # If ipython isn't available, try to display figures in the default
     # browser
-    import webbrowser
-
     try:
+        import webbrowser
+
         webbrowser.get()
         default_renderer = "browser"
-    except webbrowser.Error:
-        # Default browser could not be loaded
+    except Exception:
+        # Many things could have gone wrong
+        # There could not be a webbrowser Python module,
+        # or the module may be a dumb placeholder
         pass
 
 renderers.render_on_display = True

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

@@ -210,3 +210,30 @@ def test_sample_colorscale(self):
             colors.sample_colorscale("TuRbId_r", 12),
             colors.sequential.turbid_r,
         )
+
+    def test_n_colors(self):
+        # test that n_colors constrains values to between 0 and 255
+        generated_colorscale = colors.n_colors(
+            lowcolor="rgb(255,0,0)",
+            highcolor="rgb(0,255,0)",
+            n_colors=14,
+            colortype="rgb",
+        )
+        expected_colorscale = [
+            "rgb(255.0, 0.0, 0.0)",
+            "rgb(235.3846153846154, 19.615384615384617, 0.0)",
+            "rgb(215.76923076923077, 39.23076923076923, 0.0)",
+            "rgb(196.15384615384613, 58.846153846153854, 0.0)",
+            "rgb(176.53846153846155, 78.46153846153847, 0.0)",
+            "rgb(156.9230769230769, 98.07692307692308, 0.0)",
+            "rgb(137.3076923076923, 117.69230769230771, 0.0)",
+            "rgb(117.69230769230768, 137.30769230769232, 0.0)",
+            "rgb(98.07692307692307, 156.92307692307693, 0.0)",
+            "rgb(78.46153846153845, 176.53846153846155, 0.0)",
+            "rgb(58.84615384615384, 196.15384615384616, 0.0)",
+            "rgb(39.230769230769226, 215.76923076923077, 0.0)",
+            "rgb(19.615384615384585, 235.38461538461542, 0.0)",
+            "rgb(0.0, 255.0, 0.0)",
+        ]
+
+        self.assertEqual(generated_colorscale, expected_colorscale)

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

@@ -126,6 +126,7 @@ def test_plotly_mimetype_renderer_show(fig1, renderer):
 # ------------
 # See plotly/tests/test_orca/test_image_renderers.py
 
+
 # HTML
 # ----
 def assert_full_html(html):
@@ -381,3 +382,45 @@ def test_repr_mimebundle_mixed_renderer(fig1):
     assert set(fig1._repr_mimebundle_().keys()) == set(
         {"application/vnd.plotly.v1+json", "text/html"}
     )
+
+
+def test_missing_webbrowser_module(fig1):
+    """
+    Assert that no errors occur if the webbrowser module is absent
+    """
+    try:
+        import builtins
+    except ImportError:
+        import __builtin__ as builtins
+    realimport = builtins.__import__
+
+    def webbrowser_absent_import(name, globals, locals, fromlist, level):
+        """
+        Mimick an absent webbrowser module
+        """
+        if name == "webbrowser":
+            raise ImportError
+        return realimport(name, globals, locals, fromlist, level)
+
+    with mock.patch("builtins.__import__", webbrowser_absent_import):
+        # 1: check whether importing webbrowser actually results in an ImportError
+        with pytest.raises(ImportError):
+            import webbrowser
+
+        # 2: check whether the _repr_html_ can handle it regardless
+        fig1._repr_html_()
+
+
+def test_missing_webbrowser_methods(fig1):
+    """
+    Assert that no errors occur if the webbrowser module does not contain some methods
+    """
+    import webbrowser
+
+    removed_webbrowser_get_method = webbrowser.get
+    try:
+        del webbrowser.get
+        fig1._repr_html_()
+    finally:
+        # restore everything after this test
+        webbrowser.get = removed_webbrowser_get_method

test/percy/plotly-express.py

@@ -543,3 +543,6 @@
 )
 fig = px.timeline(df, x_start="Start", x_end="Finish", y="Task", color="Task")
 fig.write_html(os.path.join(dir_name, "timeline.html"), auto_play=False)
+
+
+px.bar(pd.DataFrame(columns=["A", "B", "X"]), x="A", y="X", facet_col="B")