Merge pull request #460 from nschloe/np

some updates

Author: nschloe

.github/workflows/ci.yml

@@ -35,8 +35,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - uses: actions/checkout@v2
-    - name: Install system dependencies
-      run: sudo apt-get install -y texlive-latex-base texlive-latex-extra context python3-tk
+    # - name: Install system dependencies
+    #   run: sudo apt-get install -y texlive-latex-base texlive-latex-extra context python3-tk
     - name: Test with tox
       run: |
         pip install tox

test/helpers.py

@@ -1,4 +1,5 @@
 import os
+import pathlib
 import subprocess
 import tempfile
 
@@ -30,7 +31,7 @@ def _unidiff_output(expected, actual):
 
 
 def assert_equality(
-    plot, filename, assert_compilation=True, flavor="latex", **extra_get_tikz_code_args
+    plot, filename, assert_compilation=False, flavor="latex", **extra_get_tikz_code_args
 ):
     plot()
     code = tikzplotlib.get_tikz_code(
@@ -41,8 +42,8 @@ def assert_equality(
     )
     plt.close()
 
-    this_dir = os.path.dirname(os.path.abspath(__file__))
-    with open(os.path.join(this_dir, filename), encoding="utf-8") as f:
+    this_dir = pathlib.Path(__file__).resolve().parent
+    with open(this_dir / filename, encoding="utf-8") as f:
         reference = f.read()
     assert reference == code, filename + "\n" + _unidiff_output(reference, code)
 

test/refresh_reference_files.py

@@ -1,6 +1,6 @@
 import argparse
 import importlib.util
-import os
+import pathlib
 
 import matplotlib.pyplot as plt
 
@@ -11,16 +11,14 @@ def _main():
     parser = argparse.ArgumentParser(description="Refresh all reference TeX files.")
     parser.parse_args()
 
-    this_dir = os.path.dirname(os.path.abspath(__file__))
+    this_dir = pathlib.Path(__file__).resolve().parent
 
     test_files = [
         f
-        for f in os.listdir(this_dir)
-        if os.path.isfile(os.path.join(this_dir, f))
-        and f[:5] == "test_"
-        and f[-3:] == ".py"
+        for f in this_dir.iterdir()
+        if (this_dir / f).is_file() and f.name[:5] == "test_" and f.name[-3:] == ".py"
     ]
-    test_modules = [f[:-3] for f in test_files]
+    test_modules = [f.name[:-3] for f in test_files]
 
     # remove some edge cases
     test_modules.remove("test_rotated_labels")
@@ -36,7 +34,7 @@ def _main():
         plt.close()
 
         tex_filename = mod + "_reference.tex"
-        with open(os.path.join(this_dir, tex_filename), "w", encoding="utf8") as f:
+        with open(this_dir / tex_filename, "w", encoding="utf8") as f:
             f.write(code)
 
 

test/test_image_plot_lower.py

@@ -1,3 +1,5 @@
+import pathlib
+
 import matplotlib.pyplot as plt
 from helpers import assert_equality
 
@@ -6,13 +8,11 @@
 
 
 def plot():
-    import os
-
     import matplotlib.image as mpimg
     from matplotlib import rcParams
 
-    this_dir = os.path.dirname(os.path.realpath(__file__))
-    img = mpimg.imread(os.path.join(this_dir, "lena.png"))
+    this_dir = pathlib.Path(__file__).resolve().parent
+    img = mpimg.imread(this_dir / "lena.png")
 
     dpi = rcParams["figure.dpi"]
     figsize = img.shape[0] / dpi, img.shape[1] / dpi

test/test_image_plot_upper.py

@@ -1,17 +1,17 @@
+import pathlib
+
 import matplotlib.pyplot as plt
 
 # the picture 'lena.png' with origin='lower' is flipped upside-down.
 # So it has to be upside-down in the pdf-file as well.
 
 
 def plot():
-    import os
-
     import matplotlib.image as mpimg
     from matplotlib import rcParams
 
-    this_dir = os.path.dirname(os.path.realpath(__file__))
-    img = mpimg.imread(os.path.join(this_dir, "lena.png"))
+    this_dir = pathlib.Path(__file__).resolve().parent
+    img = mpimg.imread(this_dir / "lena.png")
 
     dpi = rcParams["figure.dpi"]
     figsize = img.shape[0] / dpi, img.shape[1] / dpi

test/test_text_overlay.py

@@ -1,12 +1,12 @@
 import matplotlib.pyplot as plt
-import numpy
+import numpy as np
 from helpers import assert_equality
 
 
 def plot():
     fig = plt.figure()
 
-    xxx = numpy.linspace(0, 5)
+    xxx = np.linspace(0, 5)
     yyy = xxx ** 2
     plt.text(
         1,

tikzplotlib/_axes.py

@@ -1,5 +1,5 @@
 import matplotlib as mpl
-import numpy
+import numpy as np
 from matplotlib.backends.backend_pgf import (
     common_texification as mpl_common_texification,
 )
@@ -731,7 +731,7 @@ def _handle_linear_segmented_color_map(cmap, data):
     # dimension errors or memory errors in latex)
     # 0-1000 is the internal granularity of PGFplots.
     # 16300 was the maximum value for pgfplots<=1.13
-    X = _scale_to_int(numpy.array(X), 1000)
+    X = _scale_to_int(np.array(X), 1000)
 
     color_changes = []
     ff = data["float format"]

tikzplotlib/_color.py

@@ -1,11 +1,11 @@
 import matplotlib as mpl
-import numpy
+import numpy as np
 
 
 def mpl_color2xcolor(data, matplotlib_color):
     """Translates a matplotlib color specification into a proper LaTeX xcolor."""
     # Convert it to RGBA.
-    my_col = numpy.array(mpl.colors.ColorConverter().to_rgba(matplotlib_color))
+    my_col = np.array(mpl.colors.ColorConverter().to_rgba(matplotlib_color))
 
     # If the alpha channel is exactly 0, then the color is really 'none'
     # regardless of the RGB channels.
@@ -18,22 +18,22 @@ def mpl_color2xcolor(data, matplotlib_color):
         # List white first such that for gray values, the combination
         # white!<x>!black is preferred over, e.g., gray!<y>!black. Note that
         # the order of the dictionary is respected from Python 3.6 on.
-        "white": numpy.array([1, 1, 1]),
-        "lightgray": numpy.array([0.75, 0.75, 0.75]),
-        "gray": numpy.array([0.5, 0.5, 0.5]),
-        "darkgray": numpy.array([0.25, 0.25, 0.25]),
-        "black": numpy.array([0, 0, 0]),
+        "white": np.array([1, 1, 1]),
+        "lightgray": np.array([0.75, 0.75, 0.75]),
+        "gray": np.array([0.5, 0.5, 0.5]),
+        "darkgray": np.array([0.25, 0.25, 0.25]),
+        "black": np.array([0, 0, 0]),
         #
-        "red": numpy.array([1, 0, 0]),
-        "green": numpy.array([0, 1, 0]),
-        "blue": numpy.array([0, 0, 1]),
-        "brown": numpy.array([0.75, 0.5, 0.25]),
-        "lime": numpy.array([0.75, 1, 0]),
-        "orange": numpy.array([1, 0.5, 0]),
-        "pink": numpy.array([1, 0.75, 0.75]),
-        "purple": numpy.array([0.75, 0, 0.25]),
-        "teal": numpy.array([0, 0.5, 0.5]),
-        "violet": numpy.array([0.5, 0, 0.5]),
+        "red": np.array([1, 0, 0]),
+        "green": np.array([0, 1, 0]),
+        "blue": np.array([0, 0, 1]),
+        "brown": np.array([0.75, 0.5, 0.25]),
+        "lime": np.array([0.75, 1, 0]),
+        "orange": np.array([1, 0.5, 0]),
+        "pink": np.array([1, 0.75, 0.75]),
+        "purple": np.array([0.75, 0, 0.25]),
+        "teal": np.array([0, 0.5, 0.5]),
+        "violet": np.array([0.5, 0, 0.5]),
         # The colors cyan, magenta, yellow, and olive are also
         # predefined by xcolor, but their RGB approximation of the
         # native CMYK values is not very good. Don't use them here.

tikzplotlib/_files.py

@@ -1,14 +1,13 @@
-import os
-import posixpath
+import pathlib
 
 
-def _gen_filename(data, nb_key, ext):
+def _gen_filepath(data, nb_key, ext):
     name = data["base name"] + f"-{data[nb_key]:03d}{ext}"
-    return os.path.join(data["output dir"], name), name
+    return pathlib.Path(data["output dir"]) / name
 
 
-def new_filename(data, file_kind, ext):
-    """Returns an available filename.
+def new_filepath(data, file_kind, ext):
+    """Returns an available filepath.
 
     :param file_kind: Name under which numbering is recorded, such as 'img' or
                       'table'.
@@ -17,7 +16,7 @@ def new_filename(data, file_kind, ext):
     :param ext: Filename extension.
     :type ext: str
 
-    :returns: (filename, rel_filepath) where filename is a path in the
+    :returns: (filepath, rel_filepath) where filepath is a path in the
               filesystem and rel_filepath is the path to be used in the tex
               code.
     """
@@ -26,20 +25,19 @@ def new_filename(data, file_kind, ext):
     if nb_key not in data.keys():
         data[nb_key] = -1
 
+    data[nb_key] = data[nb_key] + 1
+    filepath = _gen_filepath(data, nb_key, ext)
     if not data["override externals"]:
         # Make sure not to overwrite anything.
-        file_exists = True
+        file_exists = filepath.is_file()
         while file_exists:
             data[nb_key] = data[nb_key] + 1
-            filename, name = _gen_filename(data, nb_key, ext)
-            file_exists = os.path.isfile(filename)
-    else:
-        data[nb_key] = data[nb_key] + 1
-        filename, name = _gen_filename(data, nb_key, ext)
+            filepath = _gen_filepath(data, nb_key, ext)
+            file_exists = filepath.is_file()
 
     if data["rel data path"]:
-        rel_filepath = posixpath.join(data["rel data path"], name)
+        rel_filepath = pathlib.Path(data["rel data path"]) / filepath
     else:
-        rel_filepath = name
+        rel_filepath = filepath.name
 
-    return filename, rel_filepath
+    return filepath, rel_filepath

tikzplotlib/_image.py

@@ -1,5 +1,5 @@
-import matplotlib as mpl
-import numpy
+import matplotlib.pyplot as plt
+import numpy as np
 import PIL
 
 from . import _files
@@ -9,16 +9,16 @@ def draw_image(data, obj):
     """Returns the PGFPlots code for an image environment."""
     content = []
 
-    filename, rel_filepath = _files.new_filename(data, "img", ".png")
+    filepath, rel_filepath = _files.new_filepath(data, "img", ".png")
 
     # store the image as in a file
     img_array = obj.get_array()
 
     dims = img_array.shape
     if len(dims) == 2:  # the values are given as one real number: look at cmap
         clims = obj.get_clim()
-        mpl.pyplot.imsave(
-            fname=filename,
+        plt.imsave(
+            fname=filepath,
             arr=img_array,
             cmap=obj.get_cmap(),
             vmin=clims[0],
@@ -30,17 +30,17 @@ def draw_image(data, obj):
         assert len(dims) == 3 and dims[2] in [3, 4]
         # convert to PIL image
         if obj.origin == "lower":
-            img_array = numpy.flipud(img_array)
+            img_array = np.flipud(img_array)
 
         # Convert mpl image to PIL
-        if img_array.dtype != numpy.uint8:
-            img_array = numpy.uint8(img_array * 255)
+        if img_array.dtype != np.uint8:
+            img_array = np.uint8(img_array * 255)
         image = PIL.Image.fromarray(img_array)
 
         # If the input image is PIL:
         # image = PIL.Image.fromarray(img_array)
 
-        image.save(filename, origin=obj.origin)
+        image.save(filepath, origin=obj.origin)
 
     # write the corresponding information to the TikZ file
     extent = obj.get_extent()