tikzplotly 0.2.1__tar.gz → 0.2.2__tar.gz

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplotly
-Version: 0.2.1
+Version: 0.2.2
 Summary: Convert plotly figures to LaTeX / TikZ figures
 Author-email: Thomas Saigre <tikzplotly@outlook.fr>
 License: The MIT License (MIT)
@@ -44,6 +44,7 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: plotly
 Requires-Dist: pillow
+Requires-Dist: kaleido
 Provides-Extra: dev
 Requires-Dist: pandas; extra == "dev"
 Dynamic: license-file

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tikzplotly"
-version = "0.2.1"
+version = "0.2.2"
 description = "Convert plotly figures to LaTeX / TikZ figures"
 readme = "README.md"
 authors = [{name = "Thomas Saigre", email = "tikzplotly@outlook.fr"}]
@@ -27,7 +27,8 @@ keywords = ["plotly", "latex", "tikz", "figure", "conversion", "graphics"]
 dependencies = [
     "numpy",
     "plotly",
-    "pillow"
+    "pillow",
+    "kaleido"
 ]
 
 [project.optional-dependencies]
@@ -36,3 +37,10 @@ dev = ["pandas"]
 [project.urls]
 Code = "https://github.com/thomas-saigre/tikzplotly"
 Issues = "https://github.com/thomas-saigre/tikzplotly/issues"
+
+
+[tool.pytest.ini_options]
+filterwarnings = [
+    "ignore:png image has not been reduced.*:UserWarning",
+    "ignore:Text template is not supported yet.:UserWarning",
+]

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/__about__.py

@@ -1,7 +1,7 @@
 """
 Module metadata for tikzplotly.
 """
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __author__ = "Thomas Saigre"
 __license__ = "MIT"
 __description__ = "Convert plotly figures to TikZ code for inclusion into PGFPlots figures."

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_color.py

@@ -30,7 +30,7 @@ def convert_color(color):
         string from plotly color palette, can be one of the following:
         - hex string : "#______"
         - rgb string : "rgb(__, __, __)" with values between 0 and 255
-        - rgba string : "rgba(__, __, __, __)" with values between 0 and 255 and an opacity value between 0 and 1
+        - rgba string : "rgba(__, __, __[, __])" with values between 0 and 255 and an opacity value between 0 and 1 (optional)
         - color name : "red", "green", "blue", "yellow", "orange", "purple", "brown", "black", "gray", "white" or any other color name from
                         https://github.com/plotly/plotly.py/blob/main/templategen/utils/colors.py
 
@@ -45,20 +45,21 @@ def convert_color(color):
     if color is None:
         return None, None, None, 1
     if isinstance(color, numpy.ndarray):
-        warn("Color from data is not supported yet. Returning the default color: blue.")
-        return "blue", "HTML", "0000ff", 1
+        warn("Color from data is not supported yet. Returning no color.")
+        return None, None, None, 1
     if not isinstance(color, str):
-        warn(f"Color {color} type '{color.__class__.__name__}' is not supported yet. Returning the default color: blue.")
-        return "blue", "HTML", "0000ff", 1
+        warn(f"Color {color} type '{color.__class__.__name__}' is not supported yet. Returning no color.")
+        return None, None, None, 1
 
     if color.startswith("#"):
         return color[1:], "HTML", color[1:], 1
 
     if color.startswith("rgba"):
-        sp = color.split("(")[1].split(",")
-        rgb_color = sp[:-1]
-        rgb_color = convert_color(f"rgb({rgb_color[0]},{rgb_color[1]},{rgb_color[2]})")[:-1]
-        return rgb_color + (float(sp[-1][:-1]),)
+        sp = color.split("(")[1].replace(')', '').split(",")
+        rgb_color = [s.strip() for s in sp]
+        r, g, b = int(rgb_color[0]), int(rgb_color[1]), int(rgb_color[2])
+        opacity = float(rgb_color[3]) if len(rgb_color) == 4 else 1.0
+        return hashlib.sha1(f"{r}, {g}, {b}".encode('UTF-8')).hexdigest()[:10], "RGB", rgb_str(r, g, b), opacity
 
     if color.startswith("rgb"):
         color = color[4:-1].replace("[", "{").replace("]", "}")

tikzplotly-0.2.1/src/tikzplotly/_dataContainer.py → tikzplotly-0.2.2/src/tikzplotly/_data_container.py

@@ -186,7 +186,7 @@ class DataContainer:
                     return data.name, data.z_name
         data_obj = Data3D(x, y, z, name)
         self.data.append(data_obj)
-        return data_obj.name, data_obj.z_name
+        return data_obj.name
 
     def export_data(self):
         """Generate LaTeX code to export the data from DataContainer.

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_heatmap.py

@@ -102,9 +102,10 @@ def draw_heatmap(data, fig, img_name, axis: Axis):
 
     img_bytes = fig_copy.to_image(format="png")  # The image created by plotly keeps places around the heatmap
     cropped_image = crop_image(Image.open(io.BytesIO(img_bytes)))   # so we crop all the white around the figure
-    resized_image = resize_image(cropped_image, *figure_data.shape)  # and we resize it so each square is a 1px x 1px square
+    resized_image = resize_image(cropped_image, *figure_data.shape) # and we resize it so each square is a 1px x 1px square
 
-    os.makedirs(os.path.dirname(img_name), exist_ok=True) # Make sure the directory exists
+    dirname = os.path.dirname(img_name) or '.'  # Ensure that dirname is not empty
+    os.makedirs(dirname, exist_ok=True)         # Make sure the directory exists
     resized_image.save(img_name)
 
 

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_histogram.py

@@ -50,6 +50,27 @@ def formalize_data(data, axis:Axis, row_sep="\\\\"):
 
     return data_str
 
+def treat_histnorm(histnorm: str, hist_options: dict):
+    """Handle the normalization option of the histogram
+
+    Parameters
+    ----------
+    histnorm : str
+        The normalization mode for the histogram.
+    hist_options : dict
+        Dictionary to store histogram options.
+    """
+    if histnorm in ("percent", "probability", "density"):
+        warn(
+            f"Sorry, I did not find an equivalent for histnorm='{histnorm}' in TikZ. "
+            "If you need this feature implemented, please open an issue, if possible with a MWE pgfplots code "
+            "that would plot this :).\nFor now, the histogram will be plotted without normalization "
+            "(as if histnorm='probability density')."
+        )
+        hist_options["density"] = None
+    elif histnorm in ("probability density", ):
+        hist_options["density"] = None
+
 def draw_histogram(trace, axis: Axis, colors_set, row_sep="\\\\"):
     """
     Draw a histogram and return the TikZ code.
@@ -79,7 +100,8 @@ def draw_histogram(trace, axis: Axis, colors_set, row_sep="\\\\"):
 
     code = ""
 
-    plot_options = {"hist": None}
+    plot_options = {}
+    plot_options["hist"] = None
     type_options = {"row sep": row_sep, "y index": 0}
     hist_options = {}
 
@@ -92,36 +114,15 @@ def draw_histogram(trace, axis: Axis, colors_set, row_sep="\\\\"):
         axis.add_option("x filter/.expression", "rawy")
         axis.add_option("y filter/.expression", "rawx")
         hist_options["handler/.style"] = "{xbar interval}"
-
+    else:   # trace.x and trace.y are both empty
+        warn("Empty histogram. Returning no plot")
+        return ""
 
 
     if trace.nbinsx is not None:
         hist_options["bins"] = trace.nbinsx
 
-    if trace.histnorm == "percent":
-        warn(
-            f"Sorry, I did not find an equivalent for histnorm='{trace.histnorm}' in TikZ. "
-            "If you need this feature implemented, please open an issue, if possible with a MWE pgfplots code "
-            "that would plot this :).\nFor now, the histogram will be plotted without normalization "
-            "(as if histnorm='probability density')."
-        )
-        hist_options["density"] = None
-    elif trace.histnorm == "probability":
-        warn(
-            f"Sorry, I did not find an equivalent for histnorm='{trace.histnorm}' in TikZ. "
-            "If you need this feature implemented, please open an issue, if possible with a MWE pgfplots code that would plot this :).\n"
-            "For now, the histogram will be plotted without normalization (as if histnorm='probability density')."
-        )
-        hist_options["density"] = None
-    elif trace.histnorm == "density":
-        warn(
-            f"Sorry, I did not find an equivalent for histnorm='{trace.histnorm}' in TikZ. "
-            "If you need this feature implemented, please open an issue, if possible with a MWE pgfplots code that would plot this :).\n"
-            "For now, the histogram will be plotted without normalization (as if histnorm='probability density')."
-        )
-        hist_options["density"] = None
-    elif trace.histnorm == "probability density":
-        hist_options["density"] = None
+    treat_histnorm(trace.histnorm, hist_options)
 
     if trace.cumulative.enabled:
         hist_options["cumulative"] = None
@@ -152,5 +153,4 @@ def draw_histogram(trace, axis: Axis, colors_set, row_sep="\\\\"):
     code += tex_addplot(data_str, plot_type = "table",
                         options = option_dict_to_str(plot_options), type_options=option_dict_to_str(type_options))
 
-
     return code

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_polar.py

@@ -7,7 +7,7 @@ from ._axis import Axis
 from ._utils import option_dict_to_str
 from ._tex import tex_addplot
 from ._color import convert_color
-from ._dataContainer import DataContainer
+from ._data_container import DataContainer
 
 def get_polar_coord(trace, axis: Axis, data_container: DataContainer):
     """Get polar coordinates from the trace

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_save.py

@@ -19,7 +19,7 @@ from ._polar import get_polar_coord, draw_scatterpolar
 from ._axis import Axis
 from ._color import convert_color
 from ._annotations import str_from_annotation
-from ._dataContainer import DataContainer
+from ._data_container import DataContainer
 from ._utils import sanitize_tex_text, sanitize_text
 
 
@@ -78,13 +78,13 @@ def get_tikz_code(
 
             # If x is textual => symbolic x coords
             if all(isinstance(v, str) for v in trace.x):
-                sanitized_trace_x = [sanitize_text(x, keep_space=-1) for x in trace.x]
+                sanitized_trace_x = [sanitize_text(str(x), keep_space=-1) for x in trace.x]
                 axis.add_option("symbolic x coords", "{" + ",".join(sanitized_trace_x) + "}")
                 axis.add_option("xtick", "data")
 
             # If y is textual => symbolic y coords
             if all(isinstance(v, str) for v in trace.y):
-                sanitized_trace_y = [sanitize_text(y, keep_space=-1) for y in trace.y]
+                sanitized_trace_y = [sanitize_text(str(y), keep_space=-1) for y in trace.y]
                 axis.add_option("symbolic y coords", "{" + ",".join(sanitized_trace_y) + "}")
                 axis.add_option("ytick", "data")
 
@@ -173,7 +173,7 @@ def get_tikz_code(
             if hasattr(figure_layout.scene, "title") and getattr(figure_layout.scene.title, "text", None):
                 axis.add_option("title", f"{{{sanitize_tex_text(figure_layout.scene.title.text)}}}")
 
-            data_name_macro, z_name = data_container.add_data3d(trace.x, trace.y, trace.z, trace.name)
+            data_name_macro = data_container.add_data3d(trace.x, trace.y, trace.z, trace.name)
             data_str.append(draw_scatter3d(data_name_macro, trace, colors_set))
 
             if trace.name and trace['showlegend'] is not False:

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_scatter.py

@@ -2,16 +2,16 @@
 Provides functionality to convert Plotly scatter traces into TikZ/PGFPlots code for LaTeX documents.
 """
 
-from warnings import warn
 import numpy as np
 from ._tex import tex_addplot, tex_add_text
 from ._color import convert_color
-from ._marker import marker_symbol_to_tex
 from ._dash import DASH_PATTERN
 from ._axis import Axis
 from ._data import data_type
+from ._trace_utils import configure_marker_options, finalize_marker_options
 from ._utils import px_to_pt, option_dict_to_str
 
+
 def draw_scatter2d(data_name, scatter, y_name, axis: Axis, color_set):
     """Get code for a scatter trace.
 
@@ -53,15 +53,8 @@ def draw_scatter2d(data_name, scatter, y_name, axis: Axis, color_set):
     options_dict = {}
     mark_option_dict = {}
 
-    if mode == "markers":
-        if marker.symbol is not None:
-            symbol, symbol_options = marker_symbol_to_tex(marker.symbol)
-            options_dict["mark"] = symbol
-            options_dict["only marks"] = None
-            if symbol_options is not None:
-                mark_option_dict[symbol_options[0]] = symbol_options[1]
-        else:
-            options_dict["only marks"] = None
+    if "markers" in mode:
+        configure_marker_options(mode, marker, options_dict, mark_option_dict, color_set)
 
         if scatter.marker.size is not None:
             options_dict["mark size"] = px_to_pt(marker.size)
@@ -71,14 +64,7 @@ def draw_scatter2d(data_name, scatter, y_name, axis: Axis, color_set):
             mark_option_dict["solid"] = None
             mark_option_dict["fill"] = convert_color(scatter.marker.color)[0]
 
-        if (line:=scatter.marker.line) is not None:
-            if line.color is not None:
-                color_set.add(convert_color(line.color)[:3])
-                mark_option_dict["draw"] = convert_color(line.color)[0]
-            if line.width is not None:
-                mark_option_dict["line width"] = px_to_pt(line.width)
-
-        if (angle:=scatter.marker.angle) is not None:
+        if (angle := scatter.marker.angle) is not None:
             mark_option_dict["rotate"] = angle
 
         if (opacity := scatter.opacity) is not None:
@@ -86,22 +72,7 @@ def draw_scatter2d(data_name, scatter, y_name, axis: Axis, color_set):
         if (opacity := scatter.marker.opacity) is not None:
             mark_option_dict["opacity"] = np.round(opacity, 2)
 
-        if mark_option_dict:
-            mark_options = option_dict_to_str(mark_option_dict)
-            options_dict["mark options"] = f"{{{mark_options}}}"
-
-    elif mode == "lines":
-        options_dict["mark"] = "none"
-
-    elif "lines" in mode and "markers" in mode:
-        if marker.symbol is not None:
-            symbol, symbol_options = marker_symbol_to_tex(marker.symbol)
-            options_dict["mark"] = symbol
-            if symbol_options is not None:
-                mark_option_dict[symbol_options[0]] = symbol_options[1]
-
-    else:
-        warn(f"Scatter : Mode {mode} is not supported yet.")
+    finalize_marker_options(mode, options_dict, mark_option_dict, "Scatter")
 
     if scatter.line.width is not None:
         options_dict["line width"] = px_to_pt(scatter.line.width)
@@ -110,7 +81,6 @@ def draw_scatter2d(data_name, scatter, y_name, axis: Axis, color_set):
     if scatter.connectgaps in [False, None] and None in scatter.x:
         options_dict["unbounded coords"] = "jump"
 
-
     if scatter.line.color is not None:
         options_dict["color"] = convert_color(scatter.line.color)[0]
         if "mark" in mode:

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_scatter3d.py

@@ -1,12 +1,13 @@
 """
 Provides functionality to convert Plotly 3D scatter traces into TikZ/PGFPlots code for LaTeX documents.
 """
-from warnings import warn
+
 import numpy as np
 from ._color import convert_color
-from ._marker import marker_symbol_to_tex
+from ._trace_utils import configure_marker_options, finalize_marker_options
 from ._utils import px_to_pt, option_dict_to_str
 
+
 def draw_scatter3d(data_name, scatter, color_set):
     """
     Get code for a scatter3d trace.
@@ -28,16 +29,8 @@ def draw_scatter3d(data_name, scatter, color_set):
     options_dict = {}
     mark_option_dict = {}
 
-    # Markers only
-    if mode == "markers":
-        if marker.symbol is not None:
-            symbol, symbol_options = marker_symbol_to_tex(marker.symbol)
-            options_dict["mark"] = symbol
-            options_dict["only marks"] = None
-            if symbol_options is not None:
-                mark_option_dict[symbol_options[0]] = symbol_options[1]
-        else:
-            options_dict["only marks"] = None
+    if "markers" in mode:
+        configure_marker_options(mode, marker, options_dict, mark_option_dict, color_set)
 
         if marker.size is not None:
             size = marker.size
@@ -53,34 +46,12 @@ def draw_scatter3d(data_name, scatter, color_set):
             mark_option_dict["solid"] = None
             mark_option_dict["fill"] = convert_color(c)[0]
 
-        if (line := marker.line) is not None:
-            if line.color is not None:
-                color_set.add(convert_color(line.color)[:3])
-                mark_option_dict["draw"] = convert_color(line.color)[0]
-            if line.width is not None:
-                mark_option_dict["line width"] = px_to_pt(line.width)
-
         if (opacity := scatter.opacity) is not None:
             options_dict["opacity"] = opacity
         if (opacity := marker.opacity) is not None:
             mark_option_dict["opacity"] = opacity
 
-        if mark_option_dict:
-            mark_options = option_dict_to_str(mark_option_dict)
-            options_dict["mark options"] = f"{{{mark_options}}}"
-
-    elif mode == "lines":
-        options_dict["mark"] = "none"
-
-    elif "lines" in mode and "markers" in mode:
-        if marker.symbol is not None:
-            symbol, symbol_options = marker_symbol_to_tex(marker.symbol)
-            options_dict["mark"] = symbol
-            if symbol_options is not None:
-                mark_option_dict[symbol_options[0]] = symbol_options[1]
-
-    else:
-        warn(f"Scatter3d : Mode {mode} is not supported yet.")
+    finalize_marker_options(mode, options_dict, mark_option_dict, "Scatter3d")
 
     if scatter.line is not None:
         if scatter.line.width is not None:

tikzplotly-0.2.2/src/tikzplotly/_trace_utils.py

@@ -0,0 +1,70 @@
+"""Shared helpers for Plotly trace to TikZ conversion."""
+
+from warnings import warn
+
+from ._color import convert_color
+from ._marker import marker_symbol_to_tex
+from ._utils import px_to_pt, option_dict_to_str
+
+
+def configure_marker_options(mode, marker, options_dict, mark_option_dict, color_set):
+    """Populate marker-related TikZ options for scatter-like traces.
+
+    Parameters
+    ----------
+    mode
+        Plotly trace mode string (for example ``markers`` or ``markers+lines``).
+    marker
+        Plotly marker object from the trace.
+    options_dict
+        Dictionary collecting top-level PGFPlots options.
+    mark_option_dict
+        Dictionary collecting nested ``mark options`` for PGFPlots.
+    color_set
+        Set used to track colors that must be defined in the LaTeX output.
+    """
+
+    if marker.symbol is not None:
+        symbol, symbol_options = marker_symbol_to_tex(marker.symbol)
+        options_dict["mark"] = symbol
+        if "lines" not in mode:
+            options_dict["only marks"] = None
+        if symbol_options is not None:
+            mark_option_dict[symbol_options[0]] = symbol_options[1]
+    elif "lines" not in mode:
+        options_dict["only marks"] = None
+
+    if (line := marker.line) is not None:
+        if line.color is not None:
+            color = convert_color(line.color)
+            color_set.add(color[:3])
+            mark_option_dict["draw"] = color[0]
+        if line.width is not None:
+            mark_option_dict["line width"] = px_to_pt(line.width)
+
+
+def finalize_marker_options(mode, options_dict, mark_option_dict, trace_name):
+    """Finalize marker options and handle unsupported modes.
+
+    Parameters
+    ----------
+    mode
+        Plotly trace mode string.
+    options_dict
+        Dictionary collecting top-level PGFPlots options.
+    mark_option_dict
+        Dictionary collecting nested ``mark options`` for PGFPlots.
+    trace_name
+        Name used in warnings to identify the trace kind.
+    """
+
+    if "markers" in mode:
+        if mark_option_dict:
+            mark_options = option_dict_to_str(mark_option_dict)
+            options_dict["mark options"] = f"{{{mark_options}}}"
+        return
+
+    if mode == "lines":
+        options_dict["mark"] = "none"
+    else:
+        warn(f"{trace_name} : Mode {mode} is not supported yet.")

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly/_utils.py

@@ -93,18 +93,10 @@ def sanitize_char(ch: str, keep_space: int = 0) -> str:
     if ch == "@":
         return "at"
     if ch == " ":
-        if keep_space == 1:
-            return " "
-        if keep_space == 0:
-            return "_"
-        return ""
+        return " " if keep_space == 1 else "_" if keep_space == 0 else ""
     if ch in "[]{}= ":
         return f"x{ord(ch):x}"
-    # if not ascii, return hex
-    if ord(ch) > 127:
-        return f"x{ord(ch):x}"
-    # if not printable, return hex
-    if not ch.isprintable():
+    if ord(ch) > 127 or not ch.isprintable():   # not ascii or not printable: return hex
         return f"x{ord(ch):x}"
     return ch
 

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tikzplotly
-Version: 0.2.1
+Version: 0.2.2
 Summary: Convert plotly figures to LaTeX / TikZ figures
 Author-email: Thomas Saigre <tikzplotly@outlook.fr>
 License: The MIT License (MIT)
@@ -44,6 +44,7 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: plotly
 Requires-Dist: pillow
+Requires-Dist: kaleido
 Provides-Extra: dev
 Requires-Dist: pandas; extra == "dev"
 Dynamic: license-file

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly.egg-info/SOURCES.txt

@@ -16,7 +16,7 @@ src/tikzplotly/_bar.py
 src/tikzplotly/_color.py
 src/tikzplotly/_dash.py
 src/tikzplotly/_data.py
-src/tikzplotly/_dataContainer.py
+src/tikzplotly/_data_container.py
 src/tikzplotly/_heatmap.py
 src/tikzplotly/_histogram.py
 src/tikzplotly/_marker.py
@@ -25,6 +25,7 @@ src/tikzplotly/_save.py
 src/tikzplotly/_scatter.py
 src/tikzplotly/_scatter3d.py
 src/tikzplotly/_tex.py
+src/tikzplotly/_trace_utils.py
 src/tikzplotly/_utils.py
 src/tikzplotly.egg-info/PKG-INFO
 src/tikzplotly.egg-info/SOURCES.txt
@@ -32,6 +33,7 @@ src/tikzplotly.egg-info/dependency_links.txt
 src/tikzplotly.egg-info/requires.txt
 src/tikzplotly.egg-info/top_level.txt
 tests/test_bars.py
+tests/test_colors.py
 tests/test_heatmap.py
 tests/test_histograms.py
 tests/test_markers.py

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/src/tikzplotly.egg-info/requires.txt

@@ -1,6 +1,7 @@
 numpy
 plotly
 pillow
+kaleido
 
 [dev]
 pandas

tikzplotly-0.2.2/tests/test_colors.py

@@ -0,0 +1,53 @@
+import os
+import pathlib
+from contextlib import nullcontext
+
+import numpy
+import plotly.graph_objects as go
+import plotly.express as px
+import pytest
+
+from .helpers import assert_equality
+
+
+this_dir = pathlib.Path(__file__).resolve().parent
+test_name = "test_colors"
+
+
+def plot_color(color_scheme):
+    fig = go.Figure()
+    fig.add_trace(go.Scatter(x=[0, 1, 2, 3, 4], y=[0, 1, 4, 9, 16], marker_color=color_scheme))
+    return fig
+
+def plot_transparent_background():
+    fig = px.scatter(x=[0, 1, 2, 3, 4], y=[0, 1, 4, 9, 16])
+    fig.update_layout(plot_bgcolor='rgba(255, 182, 193, .5)')
+
+    return fig
+
+
+@pytest.mark.parametrize(
+    "color, warning_match",
+    [
+        pytest.param(None, None, id="none"),
+        pytest.param(numpy.array([1, 2, 3]), "Color from data is not supported yet", id="numpy-array"), # ("blue", "HTML", "0000ff", 1)
+        pytest.param(123, "Color 123 type 'int' is not supported yet", id="non-string"), # ("blue", "HTML", "0000ff", 1)
+        pytest.param("#ffb6c1", None, id="hex"),
+        pytest.param("rgba(255, 182, 193, .2)", None, id="rgba-with-opacity"),
+        pytest.param("rgba(255, 182, 193)", None, id="rgba-without-opacity"),
+        pytest.param("rgb(255, 182, 193)", None, id="rgb"),
+        pytest.param("red", None, id="named-color"),
+        pytest.param("LightBlue", None, id="colors-dict-hit"),
+    ],
+)
+def test_color(color, warning_match, request):
+    id = request.node.callspec.id
+    if warning_match is None:
+        context = nullcontext()
+    else:
+        context =  pytest.warns(UserWarning, match=warning_match)
+    with context:
+        assert_equality(plot_color(color), os.path.join(this_dir, test_name, f"{test_name}_{id}_reference.tex"))
+
+def test_transparent_background():
+    assert_equality(plot_transparent_background(), os.path.join(this_dir, test_name, test_name + "_transparent_background_reference.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_heatmap.py

@@ -1,6 +1,7 @@
 import plotly.express as px
 import plotly.graph_objects as go
 import numpy as np
+import pytest
 import os
 from .helpers import assert_equality
 import pathlib
@@ -22,6 +23,7 @@ def plot_2():
     return fig
 
 def plot_3():
+    # A plot with no colorscale
     fig = go.Figure(data=go.Heatmap(
                    z=[[1, None, 30, 50, 1], [20, 1, 60, 80, 30], [30, 60, 1, -10, 20]],
                    x=['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
@@ -35,7 +37,7 @@ def plot_4():
     programmers = ['Alex','Nicole','Sara','Etienne','Chelsea','Jody','Marianne']
 
     base = datetime.datetime(2021, 7, 20, 19, 30, 0)
-    dates = base - np.arange(180) * datetime.timedelta(days=1)
+    dates = [base - datetime.timedelta(days=int(i)) for i in np.arange(180)]
     np.random.seed(43)
     z = np.random.poisson(size=(len(programmers), len(dates)))
 
@@ -51,7 +53,7 @@ def plot_4():
 
     return fig
 
-def plot_5():
+def plot_empty_trace():
     fig = px.imshow([[1, 20, 30],
                     [20, 1, 60],
                     [30, 60, 1]])
@@ -65,10 +67,12 @@ def test_2():
     assert_equality(plot_2(), os.path.join(this_dir, test_name, test_name + "_2_reference.tex"), img_name="/tmp/tikzplotly/fig2.png")
 
 def test_3():
-    assert_equality(plot_3(), os.path.join(this_dir, test_name, test_name + "_3_reference.tex"), img_name="/tmp/tikzplotly/fig3.png")
+    with pytest.warns(UserWarning, match="No colorscale found, using default"):
+        assert_equality(plot_3(), os.path.join(this_dir, test_name, test_name + "_3_reference.tex"), img_name="/tmp/tikzplotly/fig3.png")
 
 def test_4():
     assert_equality(plot_4(), os.path.join(this_dir, test_name, test_name + "_4_reference.tex"), img_name="/tmp/tikzplotly/fig4.png")
 
-def test_5():
-    assert_equality(plot_5(), os.path.join(this_dir, test_name, test_name + "_5_reference.tex"))
+def test_empty_trace():
+    with pytest.warns(UserWarning, match="Adding empty trace."):
+        assert_equality(plot_empty_trace(), os.path.join(this_dir, test_name, test_name + "_5_reference.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_histograms.py

@@ -2,6 +2,7 @@ import plotly.express as px
 import plotly.graph_objects as go
 import numpy as np
 import os
+from contextlib import nullcontext
 from .helpers import assert_equality
 import pathlib
 import pytest
@@ -77,7 +78,12 @@ def test_3():
 
 @pytest.mark.parametrize("histnorm", ["percent", "probability", "density", "probability density"])
 def test_4(histnorm):
-    assert_equality(plot_4(histnorm), os.path.join(this_dir, test_name, test_name + "_4_reference.tex"))
+    if histnorm in ["percent", "probability", "density"]:
+        context = pytest.warns(UserWarning, match=r"Sorry, I did not find an equivalent for histnorm='\w+' in TikZ*")
+    else:
+        context = nullcontext()
+    with context:
+        assert_equality(plot_4(histnorm), os.path.join(this_dir, test_name, test_name + "_4_reference.tex"))
 
 def test_5():
     assert_equality(plot_5(), os.path.join(this_dir, test_name, test_name + "_5_reference.tex"))
@@ -86,10 +92,11 @@ def test_6():
     assert_equality(plot_6(), os.path.join(this_dir, test_name, test_name + "_6_reference.tex"))
 
 def test_7():
-    assert_equality(plot_7(), os.path.join(this_dir, test_name, test_name + "_7_reference.tex"))
+    with pytest.warns(UserWarning, match="To the best of our knowledge, other aggregate function than 'count' are not supported in pgfplots.*"):
+        assert_equality(plot_7(), os.path.join(this_dir, test_name, test_name + "_7_reference.tex"))
 
 def test_8():
     assert_equality(plot_8(), os.path.join(this_dir, test_name, test_name + "_8_reference.tex"))
 
 def test_9():
-    assert_equality(plot_9(), os.path.join(this_dir, test_name, test_name + "_9_reference.tex"))
+    assert_equality(plot_9(), os.path.join(this_dir, test_name, test_name + "_9_reference.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_markers.py

@@ -3,6 +3,7 @@ import plotly.graph_objects as go
 import pytest
 import numpy as np
 import os
+from contextlib import nullcontext
 from .helpers import assert_equality
 import pathlib
 
@@ -96,7 +97,12 @@ def plot_with_angle():
 
 @pytest.mark.parametrize("symbol", ["circle", 0, "0", "circle-dot"])
 def test_1(symbol):
-    assert_equality(plot_1(symbol), os.path.join(this_dir, test_name, test_name + "_1_reference.tex"))
+    if symbol == "circle-dot":
+        context = pytest.warns(UserWarning, match=r"Dotted markers are not supported \(yet\), the symbol without dot will be used instead.")
+    else:
+        context = nullcontext()
+    with context:
+        assert_equality(plot_1(symbol), os.path.join(this_dir, test_name, test_name + "_1_reference.tex"))
 
 def test_2():
     assert_equality(plot_2(), os.path.join(this_dir, test_name, test_name + "_2_reference.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_polar.py

@@ -5,6 +5,7 @@ import os, pathlib
 import plotly.express as px
 import plotly.graph_objects as go
 import pandas as pd
+import pytest
 from .helpers import assert_equality
 
 this_dir = pathlib.Path(__file__).resolve().parent
@@ -275,4 +276,5 @@ def test_polar_1():
     assert_equality(fig_polar_1(), os.path.join(this_dir, test_name, test_name + "_1_reference.tex"))
 
 def test_polar_matplotlib():
-    assert_equality(fig_polar_matplotlib(), os.path.join(this_dir, "empty_plot.tex"))
+    with pytest.warns(UserWarning, match="Trace type barpolar is not supported yet"):
+        assert_equality(fig_polar_matplotlib(), os.path.join(this_dir, "empty_plot.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_scatter.py

@@ -2,6 +2,7 @@ import plotly.express as px
 import plotly.graph_objects as go
 import numpy as np
 import os
+from contextlib import nullcontext
 from .helpers import assert_equality
 import pathlib
 import pytest
@@ -220,9 +221,6 @@ def test_2():
 def test_tranparent_color():
     assert_equality(plot_transparent_color(), os.path.join(this_dir, test_name, test_name + "_transparent_color_reference.tex"))
 
-# def test_tranparent_color_rgba():
-    # assert_equality(plot_transparent_color_rgba(), os.path.join(this_dir, test_name, test_name + "_transparent_color_rgba_reference.tex"))
-
 def test_3():
     assert_equality(plot_3(), os.path.join(this_dir, test_name, test_name + "_3_reference.tex"))
 
@@ -230,14 +228,18 @@ def test_4():
     assert_equality(plot_4(), os.path.join(this_dir, test_name, test_name + "_4_reference.tex"))
 
 def test_5():
-    assert_equality(plot_5(), os.path.join(this_dir, test_name, test_name + "_5_reference.tex"))
+    with pytest.warns(UserWarning, match="Assuming this is a date*"):
+        assert_equality(plot_5(), os.path.join(this_dir, test_name, test_name + "_5_reference.tex"))
 
 @pytest.mark.parametrize("x, y", [(True, True), (True, False), (False, True)])
 def test_6(x, y):
-    assert_equality(plot_6(x, y), os.path.join(this_dir, test_name, test_name + f"_6_{x}_{y}_reference.tex"))
+    context = pytest.warns(UserWarning, match="Adding empty trace.") if x and y else nullcontext()
+    with context:
+        assert_equality(plot_6(x, y), os.path.join(this_dir, test_name, test_name + f"_6_{x}_{y}_reference.tex"))
 
 def test_7():
-    assert_equality(plot_7(), os.path.join(this_dir, test_name, test_name + "_7_reference.tex"))
+    with pytest.warns(UserWarning, match="Assuming data January is a month*"):
+        assert_equality(plot_7(), os.path.join(this_dir, test_name, test_name + "_7_reference.tex"))
 
 def test_8():
     assert_equality(plot_8(), os.path.join(this_dir, test_name, test_name + "_8_reference.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_scatter3d.py

@@ -2,6 +2,7 @@
 Test of 3D scatter plots https://plotly.com/python/3d-scatter-plots/
 """
 import os, pathlib
+from contextlib import nullcontext
 import plotly.express as px
 import plotly.graph_objects as go
 import numpy as np
@@ -88,7 +89,13 @@ def test_scatter_3d_1():
 
 @pytest.mark.parametrize("mode", ["markers", "markers+lines", "lines"])
 def test_scatter_3d_2(mode):
-    assert_equality(plot_scatter_3d_2(mode), os.path.join(this_dir, test_name, test_name + f"_2_{mode}_reference.tex"))
+    if "markers" in mode:
+        context = pytest.warns(UserWarning, match="Color from data is not supported yet*")
+    #     context = nullcontext()
+    else:
+        context = nullcontext()
+    with context:
+        assert_equality(plot_scatter_3d_2(mode), os.path.join(this_dir, test_name, test_name + f"_2_{mode}_reference.tex"))
 
 def test_scatter_3d_3():
     assert_equality(plot_scatter_3d_3(), os.path.join(this_dir, test_name, test_name + "_3_reference.tex"))
@@ -97,4 +104,5 @@ def test_scatter_3d_view():
     assert_equality(plot_scatter_3d_view(), os.path.join(this_dir, test_name, test_name + "_view_reference.tex"))
 
 def test_scatter_3d_empty():
-    assert_equality(plot_scatter_3d_empty(), os.path.join(this_dir, test_name, test_name + "_empty_reference.tex"))
+    with pytest.warns(UserWarning, match="Adding empty 3D trace."):
+        assert_equality(plot_scatter_3d_empty(), os.path.join(this_dir, test_name, test_name + "_empty_reference.tex"))

{tikzplotly-0.2.1 → tikzplotly-0.2.2}/tests/test_specific.py

@@ -2,8 +2,9 @@
 In this file are present the test of some very specific usage case, that should occur very rarely.
 """
 import os, pathlib
-import plotly.express as px
+import pytest
 import plotly.graph_objects as go
+import plotly.express as px
 from .helpers import assert_equality
 
 this_dir = pathlib.Path(__file__).resolve().parent
@@ -29,24 +30,27 @@ def plot_sanitized_text():
 
     return fig
 
-def plot_transparent_background():
-    # TODO: move it into test_color (when created)
-    fig = px.scatter(x=[0, 1, 2, 3, 4], y=[0, 1, 4, 9, 16])
-    fig.update_layout(plot_bgcolor='rgba(255, 182, 193, .5)')
 
-    return fig
 
 def plot_empty_figure():
     fig = go.Figure()
-    fig.show()
     return fig
 
+def plot_empty_histogram():
+    # Normally user shouldn't create this kind on figure, but we never know !
+    fig = px.histogram(x=[1])
+    fig.data[0].x = None
+    return fig
 
-def test_sanitized_text():
-    assert_equality(plot_sanitized_text(), os.path.join(this_dir, test_name, test_name + "_sanitized_text_reference.tex"))
 
-def test_transparent_background():
-    assert_equality(plot_transparent_background(), os.path.join(this_dir, test_name, test_name + "_transparent_background_reference.tex"))
+def test_sanitized_text():
+    with pytest.warns(UserWarning, match="Character .+ has been replaced by \"x[0-9a-f]+\" in output file"):
+        assert_equality(plot_sanitized_text(), os.path.join(this_dir, test_name, test_name + "_sanitized_text_reference.tex"))
 
 def test_empty_figure():
-    assert_equality(plot_empty_figure(), os.path.join(this_dir, "empty_plot.tex"))
+    with pytest.warns(UserWarning, match="No data in figure."):
+        assert_equality(plot_empty_figure(), os.path.join(this_dir, "empty_plot.tex"))
+
+def test_empty_histogram():
+    with pytest.warns(UserWarning, match="Empty histogram.*"):
+        assert_equality(plot_empty_histogram(), os.path.join(this_dir, test_name, test_name + "_empty_histogram_reference.tex"))