plothist 1.3.0__py3-none-any.whl → 1.3.2__py3-none-any.whl

plothist/__init__.py

@@ -1,7 +1,3 @@
-"""Plot histograms in a scalable way and a beautiful style."""
-
-__version__ = "1.3.0"
-
 from .plotters import (
     create_comparison_figure,
     plot_hist,
@@ -95,13 +91,11 @@ __all__ = [
 
 
 # Get style file and use it
-# Deprecated since 3.11 function to access style file, to be updated
-# https://docs.python.org/3/library/importlib.resources.html
 import matplotlib.pyplot as plt
-from importlib.resources import path as resources_path
+from importlib.resources import files
 
-with resources_path("plothist", "default_style.mplstyle") as style_file:
-    plt.style.use(style_file.as_posix())
+style_file = files("plothist").joinpath("default_style.mplstyle")
+plt.style.use(style_file)
 
 # Check the fonts
 from matplotlib.font_manager import findfont

plothist/get_dummy_data.py

@@ -1,4 +1,4 @@
-from importlib.resources import path as resources_path
+from importlib.resources import files
 import numpy as np
 
 
@@ -11,7 +11,7 @@ def get_dummy_data():
     data : numpy ndarray
         Dummy data.
     """
-    with resources_path("plothist", "dummy_data.csv") as dummy_data:
-        with open(dummy_data, "r") as f:
-            data = np.genfromtxt(f, delimiter=",", names=True)
+    dummy_data_file = files("plothist").joinpath("dummy_data.csv")
+    with open(dummy_data_file, "r") as f:
+        data = np.genfromtxt(f, delimiter=",", names=True)
     return data

plothist/plothist_style.py

@@ -1,11 +1,7 @@
-# Set style
-# Deprecated since 3.11 function to access style file, to be updated
-# https://docs.python.org/3/library/importlib.resources.html
 import matplotlib.pyplot as plt
 import numpy as np
 import matplotlib as mpl
-import matplotlib.colors as mcolors
-from importlib.resources import path as resources_path
+from importlib.resources import files
 
 
 def set_style(style="default"):
@@ -33,8 +29,8 @@ def set_style(style="default"):
     available_styles = ["default"]
 
     if style in available_styles:
-        with resources_path("plothist", f"{style}_style.mplstyle") as style_file:
-            plt.style.use(style_file.as_posix())
+        style_file = files("plothist").joinpath(f"{style}_style.mplstyle")
+        plt.style.use(style_file)
     else:
         raise ValueError(f"{style} not in the available styles: {available_styles}")
 
@@ -127,7 +123,7 @@ def get_color_palette(cmap, N):
     Parameters
     ----------
     cmap : str
-        The name of the colormap to use. Use "ggplot" get the cycle of the default style. Use "cubehelix" to get the cubehelix palette with default settings. Can also be any colormap from matplotlib (we recommend "viridis", "coolwarm" or "YlGnBu_r").
+        The name of the colormap to use. Use "ggplot" get the cycle of the plothist style. Use "cubehelix" to get the cubehelix palette with default settings. Can also be any colormap from matplotlib (we recommend "viridis", "coolwarm" or "YlGnBu_r").
     N : int
         The number of colors to sample.
 
@@ -151,10 +147,17 @@ def get_color_palette(cmap, N):
     if cmap == "ggplot":
         if N > 7:
             raise ValueError(
-                f"Only 7 colors are available in the default style cycle ({N} asked).",
+                f"Only 7 colors are available in the ggplot style cycle ({N} asked).",
             )
-        prop_cycle = plt.rcParams["axes.prop_cycle"]
-        return [mcolors.hex2color(prop["color"]) for prop in prop_cycle][:N]
+        return [
+            "#348ABD",
+            "#E24A33",
+            "#988ED5",
+            "#777777",
+            "#FBC15E",
+            "#8EBA42",
+            "#FFB5B8",
+        ][0:N]
 
     elif cmap == "cubehelix":
         return cubehelix_palette(N)
@@ -352,7 +355,7 @@ def add_luminosity(
 
     text = (
         r"$\mathrm{\mathbf{"
-        + collaboration.replace(" ", "\,\,")
+        + collaboration.replace(" ", r"\,\,")
         + "}"
         + (r"\,\,preliminary}$" if preliminary else "}$")
     )

plothist/scripts/make_examples.py

@@ -58,15 +58,15 @@ def make_examples(no_input=False, check_svg=False, print_code=False):
         else os.environ.get("PLOTHIST_PATH")
     )
 
-    example_folder = plothist_folder + "/docs/examples"
-    img_folder = plothist_folder + "/docs/img"
+    example_folder = plothist_folder + "/../../docs/examples"
+    img_folder = plothist_folder + "/../../docs/img"
 
     if not os.path.exists(example_folder) or not os.path.exists(img_folder):
         raise FileNotFoundError(
-            f"Could not find the example or img folder for the documentation.\nIf you installed plothist from source using flit, please run `export PLOTHIST_PATH=path/to/plothist` before launching the script."
+            f"Could not find the example {example_folder} or img {img_folder} folder for the documentation.\nTry to run `export PLOTHIST_PATH=path/to/plothist` before launching the script."
         )
 
-    temp_img_folder = plothist_folder + "/docs/temp_img"
+    temp_img_folder = plothist_folder + "/../../docs/temp_img"
 
     # Get all python files in the example folder
     python_files = [
@@ -171,6 +171,8 @@ def make_examples(no_input=False, check_svg=False, print_code=False):
             )
             if result.returncode != 0 and check_svg:
                 fail(f"Error while redoing {file}:\n{result.stderr}\n{result.stdout}")
+            elif result.returncode != 0:
+                print(f"Error while redoing {file}:\n{result.stderr}\n{result.stdout}")
 
     # Move the svg files to the img folder
     for file in os.listdir(temp_img_folder):

{plothist-1.3.0.dist-info → plothist-1.3.2.dist-info}/METADATA

@@ -1,27 +1,32 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: plothist
-Version: 1.3.0
+Version: 1.3.2
 Summary: Plot histograms in a scalable way and a beautiful style.
+Project-URL: Homepage, https://github.com/cyrraz/plothist
+Project-URL: Documentation, https://plothist.readthedocs.io/
+Project-URL: Bug Tracker, https://github.com/cyrraz/plothist/issues
 Author-email: Cyrille Praz <cyrraz.code@protonmail.com>, Tristan Fillinger <tristan.github@gmail.com>
-Requires-Python: >=3.9
-Description-Content-Type: text/x-rst
+License-File: AUTHORS.md
+License-File: LICENSE
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=3.9
 Requires-Dist: boost-histogram>=1.4.0
-Requires-Dist: numpy>=1.14.5
 Requires-Dist: matplotlib>=3.0
+Requires-Dist: numpy>=1.14.5
 Requires-Dist: pyyaml>=5.3.1
-Requires-Dist: scipy>=1.6.0
 Requires-Dist: requests>=2.25.0
-Project-URL: Bug Tracker, https://github.com/cyrraz/plothist/issues
-Project-URL: Documentation, https://plothist.readthedocs.io/
-Project-URL: Homepage, https://github.com/cyrraz/plothist
+Requires-Dist: scipy>=1.6.0
+Provides-Extra: dev
+Requires-Dist: pre-commit>=4.1.0; extra == 'dev'
+Provides-Extra: test
+Requires-Dist: pytest>=8.3.5; extra == 'test'
+Description-Content-Type: text/x-rst
 
 
 ========
@@ -78,4 +83,3 @@ plothist
    :target: https://zenodo.org/doi/10.5281/zenodo.10995667
 .. |Code style: black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :target: https://github.com/psf/black
-

plothist-1.3.2.dist-info/RECORD

@@ -0,0 +1,18 @@
+plothist/__init__.py,sha256=diRwBlD_Ly-EB-wJqO6IDZ5TCvg3BWRR95lEQWybE7A,3058
+plothist/comparison.py,sha256=qrQHQ0vv-0rBWaSAvkeZLeZyJb-I4rhsEQtLWQxO3jc,17431
+plothist/default_style.mplstyle,sha256=7MmB2uiXmD_DSqFHeH1xxC-lTctBD_EASxMdSOsPep0,1574
+plothist/dummy_data.csv,sha256=sb4LCjYW4ZO2bLCJvrunrIses-0CHe7CNwd5-BgCme8,5936219
+plothist/get_dummy_data.py,sha256=jfSCdeNlfXSJ4ODn0vEXrnBOSHYt6uJnbU3Aadeedxk,412
+plothist/histogramming.py,sha256=A9tGRqhJ1-M85IuCSsgs5OVLZWxWoRtNnr1kXhJXQdU,10201
+plothist/plothist_style.py,sha256=9Ucp40-wsHyjizUlnJFsBeWJaw56nj8FwK2cFX-pV9c,12755
+plothist/plotters.py,sha256=n9XBamhdWRvbfuYWLQjRLT3MiphtAqfh5sUgWRoo_yc,42479
+plothist/variable_registry.py,sha256=_fJEhr_jfm6CwxmfFK5qcRUE1VAxUlecnZEzHeuinDs,10207
+plothist/scripts/__init__.py,sha256=FRe2fYlnv0lJYqn8wPxAmhDs1XME8pvEs3rQgJpjp3k,108
+plothist/scripts/install_latin_modern_fonts.py,sha256=e4el7nYf8vXX1bXw535Lu6fLatXud8ZSaJNGYSx2ejo,5485
+plothist/scripts/make_examples.py,sha256=ZGvtxpx287kLk4ldeLcZZb2ArkKSvjw4iIuRK8XZKp8,7500
+plothist-1.3.2.dist-info/METADATA,sha256=lbWNRW2womMcFQhdoyN7JoEFCaL3mJvFGH3cWT600EE,3804
+plothist-1.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plothist-1.3.2.dist-info/entry_points.txt,sha256=JfZzqUK75dTTwdqP26s5hcAFms0-IACyuc2p8kPxqCI,188
+plothist-1.3.2.dist-info/licenses/AUTHORS.md,sha256=02x3_8PNyTsXcRs0IlJeCTOmpGNRqymcJ71-2QtR37E,111
+plothist-1.3.2.dist-info/licenses/LICENSE,sha256=zLdEtgFx6ObRPsz6Ofa0zJb5EuL0Z54FJP8egGX_unU,1523
+plothist-1.3.2.dist-info/RECORD,,

{plothist-1.3.0.dist-info → plothist-1.3.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.10.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

plothist-1.3.2.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+install_latin_modern_fonts = plothist.scripts.install_latin_modern_fonts:install_latin_modern_fonts
+plothist_make_examples = plothist.scripts.make_examples:make_examples

plothist-1.3.2.dist-info/licenses/AUTHORS.md

@@ -0,0 +1,2 @@
+Cyrille Praz ([@cyrraz](https://github.com/cyrraz))
+Tristan Fillinger ([@0ctagon](https://github.com/0ctagon))

plothist-1.3.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-plothist/__init__.py,sha256=6oSa6gAt-3ta4LwyMh7PCtHsX7a2fwFrVxePSb3qCes,3314
-plothist/comparison.py,sha256=qrQHQ0vv-0rBWaSAvkeZLeZyJb-I4rhsEQtLWQxO3jc,17431
-plothist/default_style.mplstyle,sha256=7MmB2uiXmD_DSqFHeH1xxC-lTctBD_EASxMdSOsPep0,1574
-plothist/dummy_data.csv,sha256=sb4LCjYW4ZO2bLCJvrunrIses-0CHe7CNwd5-BgCme8,5936219
-plothist/get_dummy_data.py,sha256=7GrWea75f0vWGi1IQg1TRpq_NzaDsTQiXm7kQ7eZOdI,434
-plothist/histogramming.py,sha256=A9tGRqhJ1-M85IuCSsgs5OVLZWxWoRtNnr1kXhJXQdU,10201
-plothist/plothist_style.py,sha256=JEAez2o7i5o_OGAdl_-77zx0OXStRB6QLh6nA561jks,12908
-plothist/plotters.py,sha256=n9XBamhdWRvbfuYWLQjRLT3MiphtAqfh5sUgWRoo_yc,42479
-plothist/variable_registry.py,sha256=_fJEhr_jfm6CwxmfFK5qcRUE1VAxUlecnZEzHeuinDs,10207
-plothist/scripts/__init__.py,sha256=FRe2fYlnv0lJYqn8wPxAmhDs1XME8pvEs3rQgJpjp3k,108
-plothist/scripts/install_latin_modern_fonts.py,sha256=e4el7nYf8vXX1bXw535Lu6fLatXud8ZSaJNGYSx2ejo,5485
-plothist/scripts/make_examples.py,sha256=b6QHG_a4G2KnAl0yjL7tL0n_Kovo5d84h7xODqBaAts,7373
-plothist-1.3.0.dist-info/entry_points.txt,sha256=8YWfI0-xVfDK4EmTWzQLfP4r0wJoUc4CTLk0lj2mKJY,185
-plothist-1.3.0.dist-info/LICENSE,sha256=zLdEtgFx6ObRPsz6Ofa0zJb5EuL0Z54FJP8egGX_unU,1523
-plothist-1.3.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-plothist-1.3.0.dist-info/METADATA,sha256=Tn05Jj-tG9OBXfVet8Ux2qRPLCzJmJ7158iDG2tYRrQ,3688
-plothist-1.3.0.dist-info/RECORD,,

plothist-1.3.0.dist-info/entry_points.txt

@@ -1,4 +0,0 @@
-[console_scripts]
-install_latin_modern_fonts=plothist.scripts.install_latin_modern_fonts:install_latin_modern_fonts
-plothist_make_examples=plothist.scripts.make_examples:make_examples
-