tikzplotly 0.1.5__tar.gz → 0.1.6__tar.gz

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tikzplotly
-Version: 0.1.5
+Version: 0.1.6
 Summary: Convert plotly figures to LaTeX / tikz figures
 Author-email: Thomas Saigre <tikzplotly@outlook.fr>
 License: The MIT License (MIT)
@@ -30,7 +30,6 @@ Keywords: plotly,latex,tikz,figure,conversion,graphics
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -52,6 +51,9 @@ Requires-Dist: pandas; extra == "dev"
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/tikzplotly.svg?style=flat-square)](https://pypi.org/pypi/tikzplotly/)
 
 [![Issue](https://img.shields.io/github/issues-raw/thomas-saigre/tikzplotly?style=flat-square)](https://github.com/thomas-saigre/tikzplotly/issues)
+[![codecov](https://img.shields.io/codecov/c/github/thomas-saigre/tikzplotly.svg?style=flat-square)](https://codecov.io/gh/thomas-saigre/tikzplotly)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/thomas-saigre/tikzplotly/ci.yml?style=flat-square)
+
 
 # Tikzplotly
 

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/README.md

@@ -4,6 +4,9 @@
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/tikzplotly.svg?style=flat-square)](https://pypi.org/pypi/tikzplotly/)
 
 [![Issue](https://img.shields.io/github/issues-raw/thomas-saigre/tikzplotly?style=flat-square)](https://github.com/thomas-saigre/tikzplotly/issues)
+[![codecov](https://img.shields.io/codecov/c/github/thomas-saigre/tikzplotly.svg?style=flat-square)](https://codecov.io/gh/thomas-saigre/tikzplotly)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/thomas-saigre/tikzplotly/ci.yml?style=flat-square)
+
 
 # Tikzplotly
 

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tikzplotly"
-version = "0.1.5"
+version = "0.1.6"
 description = "Convert plotly figures to LaTeX / tikz figures"
 readme = "README.md"
 authors = [{name = "Thomas Saigre", email = "tikzplotly@outlook.fr"}]
@@ -13,7 +13,6 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/src/tests/test_heatmaps.py

@@ -6,11 +6,9 @@ from tikzplotly._tex import tex_create_document, tex_begin_environment, tex_end_
 
 import plotly
 import plotly.express as px
-import pandas as pd
 import plotly.graph_objects as go
 import numpy as np
 import datetime
-import numpy as np
 np.random.seed(1)
 
 def fig1():
@@ -168,17 +166,16 @@ if __name__ == "__main__":
     file_directory = os.path.dirname(os.path.abspath(__file__))
 
     functions = [
-        ("1", fig1),
-        ("2", fig2),
-        # ("3", fig3),          # texttemplate not supported
-        ("4", fig4),
-        ("5", fig5),
-        ("6", fig6),
+        # ("1", fig1),
+        # ("2", fig2),
+        # # ("3", fig3),          # texttemplate not supported
+        # ("4", fig4),
+        # ("5", fig5),
+        # ("6", fig6),
         ("7", fig7),
-        # ("8", fig8),          # Not supported
-        ("9", fig9),
-        ("11", fig11)
-
+        # # ("8", fig8),          # Not supported
+        # ("9", fig9),
+        # ("11", fig11)
     ]
 
     main_tex_content = tex_create_document(options="twocolumn", compatibility="newest")
@@ -190,7 +187,6 @@ if __name__ == "__main__":
     for i, f in functions:
         print(f"Figure {i}")
         fig, title = f()
-        data = fig.data
         save_path = os.path.join(file_directory, "outputs", "test_heatmap", "fig{}.tex".format(i))
         tikzplotly.save(save_path, fig, img_name=os.path.join(file_directory, "outputs", "test_heatmap", "fig{}.png".format(i)))
         main_tex_content += tex_begin_environment("figure", stack_env)

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/src/tests/test_markers.py

@@ -1,7 +1,6 @@
 # From https://plotly.com/python/marker-style/
 import plotly
 import plotly.express as px
-import pandas as pd
 import plotly.graph_objects as go
 import numpy as np
 import tikzplotly

tikzplotly-0.1.6/src/tikzplotly/__about__.py

@@ -0,0 +1 @@
+__version__ = "0.1.6"

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/src/tikzplotly/_heatmap.py

@@ -131,8 +131,8 @@ def draw_heatmap(data, fig, img_name, axis: Axis):
         axis.add_option("colormap", get_tikz_colorscale(DEFAULT_COLORSCALE))
 
     tmp = np.where(figure_data == None, np.nan, figure_data)
-    axis.add_option("point meta max", tmp.max())
-    axis.add_option("point meta min", tmp.min())
+    axis.add_option("point meta max", np.nanmax(tmp))
+    axis.add_option("point meta min", np.nanmin(tmp))
     axis.add_option("xmin", xmin)
     axis.add_option("xmax", xmax)
     axis.add_option("ymin", ymax)

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/src/tikzplotly/_save.py

@@ -78,13 +78,16 @@ def get_tikz_code(
     if include_disclamer:
         code += tex_comment(f"This file was created with tikzplotly version {__version__}.")
 
-    code += data_container.exportData()
-    code += "\n"
+    if len(data_container.data) > 0:
+        code += data_container.exportData()
+        code += "\n"
 
     code += tex_begin_environment("tikzpicture", stack_env, options=tikz_options)
 
     code += "\n"
-    for color in colors_set:
+    color_list = list(colors_set)
+    color_list.sort()
+    for color in color_list:
         code += tex_add_color(color[0], color[1], color[2])
     code += "\n"
 
@@ -107,7 +110,7 @@ def get_tikz_code(
     return code
 
 
-def save(filepath: str | Path, *args, encoding: str | None = None, **kwargs):
+def save(filepath, *args, **kwargs):
     """Save a figure to a file or a stream.
 
     Parameters

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/src/tikzplotly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tikzplotly
-Version: 0.1.5
+Version: 0.1.6
 Summary: Convert plotly figures to LaTeX / tikz figures
 Author-email: Thomas Saigre <tikzplotly@outlook.fr>
 License: The MIT License (MIT)
@@ -30,7 +30,6 @@ Keywords: plotly,latex,tikz,figure,conversion,graphics
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -52,6 +51,9 @@ Requires-Dist: pandas; extra == "dev"
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/tikzplotly.svg?style=flat-square)](https://pypi.org/pypi/tikzplotly/)
 
 [![Issue](https://img.shields.io/github/issues-raw/thomas-saigre/tikzplotly?style=flat-square)](https://github.com/thomas-saigre/tikzplotly/issues)
+[![codecov](https://img.shields.io/codecov/c/github/thomas-saigre/tikzplotly.svg?style=flat-square)](https://codecov.io/gh/thomas-saigre/tikzplotly)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/thomas-saigre/tikzplotly/ci.yml?style=flat-square)
+
 
 # Tikzplotly
 

{tikzplotly-0.1.5 → tikzplotly-0.1.6}/src/tikzplotly.egg-info/SOURCES.txt

@@ -22,4 +22,7 @@ src/tikzplotly.egg-info/PKG-INFO
 src/tikzplotly.egg-info/SOURCES.txt
 src/tikzplotly.egg-info/dependency_links.txt
 src/tikzplotly.egg-info/requires.txt
-src/tikzplotly.egg-info/top_level.txt
+src/tikzplotly.egg-info/top_level.txt
+tests/test_heatmap.py
+tests/test_markers.py
+tests/test_scatter.py

tikzplotly-0.1.6/tests/test_heatmap.py

@@ -0,0 +1,65 @@
+import plotly.express as px
+import plotly.graph_objects as go
+import numpy as np
+import os
+from .helpers import assert_equality
+import pathlib
+import datetime
+
+this_dir = pathlib.Path(__file__).resolve().parent
+test_name = "test_heatmap"
+pathlib.Path("/tmp/tikzplotly").mkdir(parents=True, exist_ok=True)
+
+def plot_1():
+    fig = px.imshow([[1, 20, 30],
+                    [20, 1, 60],
+                    [30, 60, 1]])
+    return fig
+
+def plot_2():
+    df = px.data.medals_wide(indexed=True)
+    fig = px.imshow(df)
+    return fig
+
+def plot_3():
+    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'],
+                   y=['Morning', 'Afternoon', 'Evening'],
+                   hoverongaps = False))
+    return fig
+
+def plot_4():
+    import plotly.graph_objects as go
+
+    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)
+    np.random.seed(43)
+    z = np.random.poisson(size=(len(programmers), len(dates)))
+
+    fig = go.Figure(data=go.Heatmap(
+            z=z,
+            x=dates,
+            y=programmers,
+            colorscale='Viridis'))
+
+    fig.update_layout(
+        title='GitHub commits per day',
+        xaxis_nticks=36)
+
+    return fig
+
+
+def test_1():
+    assert_equality(plot_1(), os.path.join(this_dir, test_name, test_name + "_1_reference.tex"), img_name="/tmp/tikzplotly/fig1.png")
+
+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")
+
+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")

tikzplotly-0.1.6/tests/test_markers.py

@@ -0,0 +1,89 @@
+import plotly.express as px
+import plotly.graph_objects as go
+import numpy as np
+import os
+from .helpers import assert_equality
+import pathlib
+
+this_dir = pathlib.Path(__file__).resolve().parent
+test_name = "test_markers"
+
+def plot_1():
+
+    df = px.data.iris()
+    fig = px.scatter(df, x="sepal_width", y="sepal_length", color="species")
+
+    fig.update_traces(marker=dict(size=12,
+                              line=dict(width=2,
+                                        color='DarkSlateGrey')),
+                  selector=dict(mode='markers'))
+    return fig
+
+def plot_2():
+    np.random.seed(1)
+    x = np.random.uniform(low=3, high=6, size=(500,))
+    y = np.random.uniform(low=3, high=6, size=(500,))
+
+    # Build figure
+    fig = go.Figure()
+
+    # Add scatter trace with medium sized markers
+    fig.add_trace(
+        go.Scatter(
+            mode='markers',
+            x=x,
+            y=y,
+            marker=dict(
+                color='LightSkyBlue',
+                size=20,
+                opacity=0.5,
+                line=dict(
+                    color='MediumPurple',
+                    width=2
+                )
+            ),
+            showlegend=False
+        )
+    )
+
+
+    # Add trace with large markers
+    fig.add_trace(
+        go.Scatter(
+            mode='markers',
+            x=[2, 2],
+            y=[4.25, 4.75],
+            marker=dict(
+                color='LightSkyBlue',
+                size=80,
+                opacity=0.5,
+                line=dict(
+                    color='MediumPurple',
+                    width=8
+                )
+            ),
+            showlegend=False
+        )
+    )
+
+    return fig
+
+def plot_3():
+    df = px.data.iris()
+    fig = px.scatter(df, x="sepal_width", y="sepal_length", color="species")
+
+    fig.update_traces(
+        marker=dict(size=8, symbol="diamond", line=dict(width=2, color="DarkSlateGrey")),
+        selector=dict(mode="markers"),
+    )
+
+    return fig
+
+def test_1():
+    assert_equality(plot_1(), 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"))
+
+def test_3():
+    assert_equality(plot_3(), os.path.join(this_dir, test_name, test_name + "_3_reference.tex"))

tikzplotly-0.1.6/tests/test_scatter.py

@@ -0,0 +1,152 @@
+import plotly.express as px
+import plotly.graph_objects as go
+import numpy as np
+import os
+from .helpers import assert_equality
+import pathlib
+
+this_dir = pathlib.Path(__file__).resolve().parent
+test_name = "test_scatter"
+
+def plot_1():
+    df = px.data.gapminder().query("continent == 'Oceania'")
+    fig = px.line(df, x='year', y='lifeExp', color='country', markers=True)
+    return fig
+
+def plot_2():
+    df = px.data.gapminder().query("country in ['Canada', 'Botswana']")
+    fig = px.line(df, x="lifeExp", y="gdpPercap", color="country", text="year")
+    fig.update_traces(textposition="bottom right")
+
+    # fig.show()
+    return fig
+
+def plot_3():
+    x = np.arange(10)
+    fig = go.Figure(data=go.Scatter(x=x, y=x**2))
+    return fig
+
+def plot_4():
+    labels = ['Television', 'Newspaper', 'Internet', 'Radio']
+    colors = ['rgb(67,67,67)', 'rgb(115,115,115)', 'rgb(49,130,189)', 'rgb(189,189,189)']
+
+    mode_size = [4, 4, 6, 4]
+    line_size = [2, 2, 4, 2]
+
+    x_data = np.vstack((np.arange(2001, 2013),)*4)
+
+    y_data = np.array([
+        [74, 82, 80, 74, 73, 72, 74, 70, 70, 66, 66, 69],
+        [45, 42, 50, 46, 36, 36, 34, 35, 32, 31, 31, 28],
+        [13, 14, 20, 24, 20, 24, 24, 40, 35, 41, 43, 50],
+        [18, 21, 18, 21, 16, 14, 13, 18, 17, 16, 19, 23],
+    ])
+
+    fig = go.Figure()
+
+    for i in range(0, 4):
+        fig.add_trace(go.Scatter(x=x_data[i], y=y_data[i], mode='lines',
+            name=labels[i],
+            line=dict(color=colors[i], width=line_size[i]),
+            connectgaps=True,
+        ))
+
+        # endpoints
+        fig.add_trace(go.Scatter(
+            x=[x_data[i][0], x_data[i][-1]],
+            y=[y_data[i][0], y_data[i][-1]],
+            mode='markers',
+            marker=dict(color=colors[i], size=mode_size[i])
+        ))
+
+    fig.update_layout(
+        xaxis=dict(
+            showline=True,
+            showgrid=False,
+            showticklabels=True,
+            linecolor='rgb(204, 204, 204)',
+            linewidth=2,
+            ticks='outside',
+            tickfont=dict(
+                family='Arial',
+                size=12,
+                color='rgb(82, 82, 82)',
+            ),
+        ),
+        yaxis=dict(
+            showgrid=False,
+            zeroline=False,
+            showline=False,
+            showticklabels=False,
+        ),
+        autosize=False,
+        margin=dict(
+            autoexpand=False,
+            l=100,
+            r=20,
+            t=110,
+        ),
+        showlegend=False,
+        plot_bgcolor='white'
+    )
+
+    annotations = []
+
+    # Adding labels
+    for y_trace, label, color in zip(y_data, labels, colors):
+        # labeling the left_side of the plot
+        annotations.append(dict(xref='paper', x=0.05, y=y_trace[0],
+                                    xanchor='right', yanchor='middle',
+                                    text=label + ' {}%'.format(y_trace[0]),
+                                    font=dict(family='Arial',
+                                                size=16),
+                                    showarrow=False))
+        # labeling the right_side of the plot
+        annotations.append(dict(xref='paper', x=0.95, y=y_trace[11],
+                                    xanchor='left', yanchor='middle',
+                                    text='{}%'.format(y_trace[11]),
+                                    font=dict(family='Arial',
+                                                size=16),
+                                    showarrow=False))
+    # Title
+    annotations.append(dict(xref='paper', yref='paper', x=0.0, y=1.05,
+                                xanchor='left', yanchor='bottom',
+                                text='Main Source for News',
+                                font=dict(family='Arial',
+                                            size=30,
+                                            color='rgb(37,37,37)'),
+                                showarrow=False))
+    # Source
+    annotations.append(dict(xref='paper', yref='paper', x=0.5, y=-0.1,
+                                xanchor='center', yanchor='top',
+                                text='Source: PewResearch Center & ' +
+                                    'Storytelling with data',
+                                font=dict(family='Arial',
+                                            size=12,
+                                            color='rgb(150,150,150)'),
+                                showarrow=False))
+
+    fig.update_layout(annotations=annotations)
+
+    # fig.show()
+    return fig
+
+def plot_5():
+    df = px.data.stocks()
+    fig = px.line(df, x='date', y="GOOG")
+    return fig
+
+def test_1():
+    assert_equality(plot_1(), 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"))
+
+def test_3():
+    assert_equality(plot_3(), os.path.join(this_dir, test_name, test_name + "_3_reference.tex"))
+
+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"))

tikzplotly-0.1.5/src/tikzplotly/__about__.py

@@ -1 +0,0 @@
-__version__ = "0.1.4"