Merge branch 'master' into cleanfigure

Author: theRealSuperMario

.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:

.flake8

@@ -1,5 +1,5 @@
 [flake8]
 ignore = E203, E266, E501, W503
-max-line-length = 80
+max-line-length = 88
 max-complexity = 20
 select = B,C,E,F,W,T4,B9

.github/workflows/test.yml renamed to .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: test
+name: ci
 
 on: [push]
 
@@ -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)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2010-2019 Nico Schlömer
+Copyright (c) 2010-2020 Nico Schlömer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -9,6 +9,7 @@ tag:
 	@echo "Tagging v$(VERSION)..."
 	git tag v$(VERSION)
 	git push --tags
+	curl -H "Authorization: token `cat $(HOME)/.github-access-token`" -d '{"tag_name": "$(VERSION)"}' https://api.github.com/repos/nschloe/tikzplotlib/releases
 
 upload: setup.py
 	@if [ "$(shell git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi

README.md

@@ -59,19 +59,21 @@ tikzplotlib.save("test.tex")
 \definecolor{color1}{rgb}{0.203921568627451,0.541176470588235,0.741176470588235}
 
 \begin{axis}[
-axis background/.style={fill=white!89.80392156862746!black},
+axis background/.style={fill=white!89.8039215686275!black},
 axis line style={white},
 tick align=outside,
 tick pos=left,
-title={Simple plot $\frac{\alpha}{2}$},
+title={Simple plot \(\displaystyle \frac{\alpha}{2}\)},
 x grid style={white},
 xlabel={time (s)},
 xmajorgrids,
 xmin=-0.095, xmax=1.995,
+xtick style={color=white!33.3333333333333!black},
 y grid style={white},
 ylabel={Voltage (mV)},
 ymajorgrids,
-ymin=-1.1, ymax=1.1
+ymin=-1.1, ymax=1.1,
+ytick style={color=white!33.3333333333333!black}
 ]
 \addplot [line width=1.64pt, color0, mark=*, mark size=3, mark options={solid}]
 table {%

doc/conf.py

@@ -19,7 +19,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "tikzplotlib"
-copyright = "2010-2019, Nico Schlömer"
+copyright = "2010-2020, Nico Schlömer"
 author = "Nico Schlömer"
 
 # https://packaging.python.org/single_source_version/

setup.py

@@ -1,4 +1,3 @@
-import codecs
 import os
 
 from setuptools import find_packages, setup
@@ -10,10 +9,6 @@
     exec(f.read(), about)
 
 
-def read(fname):
-    return codecs.open(os.path.join(base_dir, fname), encoding="utf-8").read()
-
-
 setup(
     name="tikzplotlib",
     version=about["__version__"],
@@ -23,10 +18,10 @@ def read(fname):
     author_email=about["__email__"],
     install_requires=["matplotlib >= 1.4.0", "numpy", "Pillow"],
     description="Convert matplotlib figures into TikZ/PGFPlots",
-    long_description=read("README.md"),
+    long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     license=about["__license__"],
-    python_requires=">=3",
+    python_requires=">=3.6",
     classifiers=[
         about["__status__"],
         about["__license__"],

test/helpers.py

@@ -18,7 +18,6 @@ def print_tree(obj, indent=""):
 
     for child in obj.get_children():
         print_tree(child, indent + "   ")
-    return
 
 
 # https://stackoverflow.com/a/845432/353337
@@ -31,10 +30,12 @@ def _unidiff_output(expected, actual):
     return "".join(diff)
 
 
-def assert_equality(plot, filename, **extra_get_tikz_code_args):
+def assert_equality(
+    plot, filename, assert_compilation=True, **extra_get_tikz_code_args
+):
     plot()
     code = tikzplotlib.get_tikz_code(
-        include_disclaimer=False, **extra_get_tikz_code_args
+        include_disclaimer=False, float_format=".8g", **extra_get_tikz_code_args
     )
     plt.close()
 
@@ -43,11 +44,13 @@ def assert_equality(plot, filename, **extra_get_tikz_code_args):
         reference = f.read()
     assert reference == code, _unidiff_output(code, reference)
 
-    code = tikzplotlib.get_tikz_code(
-        include_disclaimer=False, standalone=True, **extra_get_tikz_code_args
-    )
-    assert _compile(code) is not None
-    return
+    if assert_compilation:
+        plot()
+        code = tikzplotlib.get_tikz_code(
+            include_disclaimer=False, standalone=True, **extra_get_tikz_code_args
+        )
+        plt.close()
+        assert _compile(code) is not None, code
 
 
 def _compile(code):
@@ -96,4 +99,3 @@ def compare_mpl_latex(plot):
     png_path = os.path.join(pdf_dirname, "test-1.png")
 
     os.rename(png_path, os.path.join(directory, "test-1.png"))
-    return

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,13 +24,12 @@ 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, float_format=".8g")
             plt.close()
 
             tex_filename = filename[:-3] + "_reference.tex"
-            with open(os.path.join(this_dir, tex_filename), "w") as f:
+            with open(os.path.join(this_dir, tex_filename), "w", encoding="utf8") as f:
                 f.write(code)
-    return
 
 
 if __name__ == "__main__":