Merge pull request #341 from nschloe/fix-339

protect against int/float in xdata

Author: nschloe

.circleci/config.yml

@@ -3,34 +3,34 @@ version: 2
 jobs:
   lint:
     docker:
-      - image: ubuntu:18.04
+      - image: circleci/python:3.7
     steps:
       - checkout
-      - run: apt update
-      - run: apt install -y python3-pip
-      - run: pip3 install -U black flake8
-      - run: LC_ALL=C.UTF-8 black --check .
+      - run: pip3 install -U black flake8 --user
+      - run: black --check .
       - run: flake8 .
   build:
     working_directory: ~/work
     docker:
-      - image: ubuntu:18.04
+      - image: circleci/python:3.7
     steps:
-      - run: apt update
+      - run: sudo apt update
       # <https://stackoverflow.com/a/44333806/353337>
-      - run: DEBIAN_FRONTEND=noninteractive apt install tzdata
-      - run: apt install -y texlive-latex-base texlive-latex-extra python3-pip python3-tk python3-scipy
-      - run: pip3 install -U pytest pytest-cov excode
+      - run: DEBIAN_FRONTEND=noninteractive sudo apt install tzdata
+      - run: sudo apt install -y texlive-latex-base texlive-latex-extra
+      - run: pip3 install -U pytest pytest-cov excode --user
       - checkout
-      - run: cd ~/work
       - run: excode README.md test/zzz_readme_test.py --filter python,test
-      - run: pip3 install -r test_requirements.txt
-      - run: pip3 install .[all]
+      - run: pip3 install -r test_requirements.txt --user
+      - run: pip3 install .[all] --user
       - run: pip3 check
       # The actual test
-      - run: cd test/ && MPLBACKEND=Agg pytest --cov tikzplotlib
+      - run:
+          command: pytest --cov tikzplotlib
+          working_directory: test/
+          environment:
+            MPLBACKEND: Agg
       # submit to codecov
-      - run: apt install -y curl
       - run: bash <(curl -s https://codecov.io/bash)
 
 workflows:

.github/workflows/test.yml

@@ -42,5 +42,5 @@ jobs:
         pip install pytest pytest-cov
         pip install -r test_requirements.txt
         cd test/ && MPLBACKEND=Agg pytest --cov tikzplotlib
-    - name: Submit to codecov
-      run: bash <(curl -s https://codecov.io/bash) -R ~/work/tikzplotlib
+    # - name: Submit to codecov
+    #   run: bash <(curl -s https://codecov.io/bash)

test/refresh_reference_files.py

@@ -4,7 +4,7 @@
 
 import matplotlib.pyplot as plt
 
-import tikzplotlib as m2t
+import tikzplotlib as tpl
 
 
 def _main():
@@ -24,7 +24,7 @@ def _main():
             spec.loader.exec_module(module)
             module.plot()
 
-            code = m2t.get_tikz_code(include_disclaimer=False)
+            code = tpl.get_tikz_code(include_disclaimer=False)
             plt.close()
 
             tex_filename = filename[:-3] + "_reference.tex"

test/test_line_set_data.py

@@ -0,0 +1,16 @@
+# from <https://github.com/nschloe/tikzplotlib/issues/339>
+import matplotlib.pyplot as plt
+
+from helpers import assert_equality
+
+
+def plot():
+    fig = plt.figure()
+    line = plt.plot(0, 0, "kx")[0]
+    line.set_data(0, 0)
+    return fig
+
+
+def test():
+    assert_equality(plot, "test_line_set_data_reference.tex")
+    return

test/test_line_set_data_reference.tex

@@ -0,0 +1,19 @@
+\begin{tikzpicture}
+
+\begin{axis}[
+tick align=outside,
+tick pos=left,
+x grid style={white!69.01960784313725!black},
+xmin=-0.055, xmax=0.055,
+xtick style={color=black},
+y grid style={white!69.01960784313725!black},
+ymin=-0.055, ymax=0.055,
+ytick style={color=black}
+]
+\addplot [semithick, black, mark=x, mark size=3, mark options={solid}, only marks]
+table {%
+0 0
+};
+\end{axis}
+
+\end{tikzpicture}

tikzplotlib/line2d.py

@@ -18,7 +18,12 @@ def draw_line2d(data, obj):
     # If line is of length 0, do nothing.  Otherwise, an empty \addplot table will be
     # created, which will be interpreted as an external data source in either the file
     # '' or '.tex'.  Instead, render nothing.
-    if len(obj.get_xdata()) == 0:
+    xdata = obj.get_xdata()
+    if isinstance(xdata, int) or isinstance(xdata, float):
+        # https://github.com/nschloe/tikzplotlib/issues/339
+        xdata = [xdata]
+
+    if len(xdata) == 0:
         return data, []
 
     # get the linewidth (in pt)
@@ -250,12 +255,15 @@ def _marker(
     return
 
 
-def _table(obj, data):
+def _table(obj, data):  # noqa: C901
     # get_xydata() always gives float data, no matter what
     xdata, ydata = obj.get_xydata().T
 
     # get_{x,y}data gives datetime or string objects if so specified in the plotter
     xdata_alt = obj.get_xdata()
+    if isinstance(xdata_alt, int) or isinstance(xdata, float):
+        # https://github.com/nschloe/tikzplotlib/issues/339
+        xdata_alt = [xdata_alt]
 
     ff = data["float format"]