Merge pull request nschloe#305 from nschloe/update-tests

update tests, fix warning

Author: nschloe

README.md

@@ -154,17 +154,6 @@ To run the tests, just check out this repository and type
 pytest
 ```
 
-### Distribution
-
-To create a new release
-
-1. bump the `__version__` number,
-
-2. publish to PyPi and GitHub:
-    ```
-    $ make publish
-    ```
-
 ### License
 
 matplotlib2tikz is published under the [MIT license](https://en.wikipedia.org/wiki/MIT_License).

doc/conf.py

@@ -16,42 +16,43 @@
 import os
 
 import mock
-MOCK_MODULES = ['matplotlib', 'pipdate']
+
+MOCK_MODULES = ["matplotlib", "pipdate"]
 for mod_name in MOCK_MODULES:
     sys.modules[mod_name] = mock.Mock()
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('../src'))
+sys.path.append(os.path.abspath("../src"))
 
 # -- General configuration ----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.todo',
-    'sphinx.ext.coverage',
-    'sphinx.ext.pngmath'
-    ]
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.todo",
+    "sphinx.ext.coverage",
+    "sphinx.ext.pngmath",
+]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 # source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'matplotlib2tikz'
-copyright = u'2010-2018, Nico Schlömer'
+project = u"matplotlib2tikz"
+copyright = u"2010-2018, Nico Schlömer"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -60,13 +61,13 @@
 # https://packaging.python.org/single_source_version/
 this_dir = os.path.abspath(os.path.dirname(__file__))
 about = {}
-about_file = os.path.join(this_dir, '..', 'matplotlib2tikz', '__about__.py')
+about_file = os.path.join(this_dir, "..", "matplotlib2tikz", "__about__.py")
 with open(about_file) as f:
     exec(f.read(), about)
 # The short X.Y version.
-version = '.'.join(about['__version__'].split('.')[:2])
+version = ".".join(about["__version__"].split(".")[:2])
 # The full version, including alpha/beta/rc tags.
-release = about['__version__']
+release = about["__version__"]
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -83,7 +84,7 @@
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = ['_build']
+exclude_trees = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -101,7 +102,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -111,7 +112,7 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = "default"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -140,7 +141,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -178,22 +179,27 @@
 # html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'matplotlib2tikzdoc'
+htmlhelp_basename = "matplotlib2tikzdoc"
 
 
 # -- Options for LaTeX output -------------------------------------------------
 
 # The paper size ('letter' or 'a4').
-latex_paper_size = 'a4'
+latex_paper_size = "a4"
 
 # The font size ('10pt', '11pt' or '12pt').
 # latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples (source start
 # file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'matplotlib2tikz.tex', u'matplotlib2tikz Documentation',
-   u'Nico Schlömer', 'manual'),
+    (
+        "index",
+        "matplotlib2tikz.tex",
+        u"matplotlib2tikz Documentation",
+        u"Nico Schlömer",
+        "manual",
+    )
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

matplotlib2tikz/axes.py

@@ -505,8 +505,8 @@ def _get_label_rotation_and_horizontal_alignment(self, obj, data, x_or_y):
 def _get_tick_position(obj, axes_obj):
     major_ticks = obj.xaxis.majorTicks if axes_obj == "x" else obj.yaxis.majorTicks
 
-    major_ticks_bottom = [tick.tick1On for tick in major_ticks]
-    major_ticks_top = [tick.tick2On for tick in major_ticks]
+    major_ticks_bottom = [tick.tick1line.get_visible() for tick in major_ticks]
+    major_ticks_top = [tick.tick2line.get_visible() for tick in major_ticks]
 
     major_ticks_bottom_show_all = False
     if len(set(major_ticks_bottom)) == 1 and major_ticks_bottom[0] is True:

test/helpers.py

@@ -43,7 +43,7 @@ def assert_equality(plot, filename, **extra_get_tikz_code_args):
     this_dir = os.path.dirname(os.path.abspath(__file__))
     with open(os.path.join(this_dir, filename), "r", encoding="utf-8") as f:
         reference = f.read()
-    assert reference == code, _unidiff_output(reference, code)
+    assert reference == code, _unidiff_output(code, reference)
 
     code = matplotlib2tikz.get_tikz_code(
         include_disclaimer=False, standalone=True, **extra_get_tikz_code_args

test/test_loglogplot_reference.tex

@@ -8,11 +8,11 @@
 tick align=outside,
 tick pos=left,
 x grid style={white!69.01960784313725!black},
-xmin=0.501187233627272, xmax=1995262.31496887,
+xmin=0.501187233627272, xmax=1995262.31496888,
 xmode=log,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
-ymin=0.251188643150958, ymax=3981071705534.95,
+ymin=0.251188643150958, ymax=3981071705534.97,
 ymode=log,
 ytick style={color=black}
 ]

test/test_logplot_reference.tex

@@ -11,7 +11,7 @@
 xtick style={color=black},
 y grid style={green!50.0!black},
 ymajorgrids,
-ymin=0.354813389233575, ymax=2818382931.26444,
+ymin=0.354813389233575, ymax=2818382931.26445,
 yminorgrids,
 ymode=log,
 ytick style={color=black}

test/test_tick_positions_reference.tex

@@ -27,8 +27,8 @@
 xmin=0.85, xmax=4.15,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=right,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -46,8 +46,8 @@
 xmin=0.85, xmax=4.15,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=left,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -65,8 +65,8 @@
 xmin=0.85, xmax=4.15,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=both,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -80,8 +80,8 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=right,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
 ymajorticks=false,
@@ -98,11 +98,12 @@
 
 \nextgroupplot[
 tick align=outside,
-tick pos=right,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
 ytick style={color=black}
 ]
@@ -117,12 +118,12 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=right,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=left,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -136,12 +137,12 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=right,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=both,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -155,8 +156,8 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=left,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
 ymajorticks=false,
@@ -174,12 +175,12 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=left,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=right,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -192,11 +193,12 @@
 
 \nextgroupplot[
 tick align=outside,
-tick pos=left,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
 ytick style={color=black}
 ]
@@ -211,12 +213,12 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=left,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=both,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -230,8 +232,8 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=both,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
 ymajorticks=false,
@@ -249,12 +251,12 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=both,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=right,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -268,12 +270,12 @@
 \nextgroupplot[
 tick align=outside,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
-xtick pos=both,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
-ytick pos=left,
 ytick style={color=black}
 ]
 \addplot [semithick, red, mark=*, mark size=3, mark options={solid}, only marks]
@@ -286,11 +288,12 @@
 
 \nextgroupplot[
 tick align=outside,
-tick pos=both,
 x grid style={white!69.01960784313725!black},
+xmajorticks=false,
 xmin=0.85, xmax=4.15,
 xtick style={color=black},
 y grid style={white!69.01960784313725!black},
+ymajorticks=false,
 ymin=0.6, ymax=9.4,
 ytick style={color=black}
 ]