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

plothist/__init__.py

@@ -1,6 +1,6 @@
 """Plot histograms in a scalable way and a beautiful style."""
 
-__version__ = "1.2.5"
+__version__ = "1.3.0"
 
 from .plotters import (
     create_comparison_figure,

plothist/scripts/install_latin_modern_fonts.py

@@ -3,70 +3,9 @@ import os
 import platform
 from pathlib import PosixPath
 import time
-import re
 import matplotlib
-
-
-def _get_wget_version():
-    """
-    Get the version of wget.
-
-    Returns
-    -------
-    tuple or str
-        The version of wget as a tuple of integers.
-
-    Raises
-    ------
-    RuntimeError
-        If the version of wget could not be determined.
-    """
-    version_string = subprocess.check_output(
-        ["wget", "--version"], universal_newlines=True
-    )
-    # Try to find the version number in the format "XX.XX.XX"
-    version_match = re.search(r"(\d+\.\d+\.\d+)", version_string)
-    if not version_match:
-        # Try to find the version number in the format "XX.XX"
-        version_match = re.search(r"(\d+\.\d+)", version_string)
-    if version_match:
-        version = version_match.group(1)
-        return tuple(map(int, version.split(".")))
-    else:
-        raise RuntimeError("Could not determine wget version.")
-
-
-def _get_install_command(url, font_directory):
-    """
-    Get the command to install a font.
-
-    Parameters
-    ----------
-    url : str
-        The URL of the font.
-    font_directory : PosixPath
-        The directory where the font should be installed.
-
-    Returns
-    -------
-    list
-        The command to run in a subprocess to install the font.
-    """
-    return [
-        "wget",
-        "--retry-connrefused",  # retry refused connections and similar fatal errors
-        *(
-            ["--retry-on-host-error"] if _get_wget_version() >= (1, 20, 0) else []
-        ),  # retry on host errors such as 404 "Not Found"
-        "--waitretry=1",  # wait 1 second before next retry
-        "--read-timeout=20",  # wait a maximum of 20 seconds in case no data is received and then try again
-        "--timeout=15",  # wait max 15 seconds before the initial connection times out
-        "-t",
-        "10",  # retry 10 times
-        "-P",
-        font_directory,
-        url,
-    ]
+import requests
+from zipfile import ZipFile
 
 
 def _download_font(url, font_directory, font_name):
@@ -91,20 +30,17 @@ def _download_font(url, font_directory, font_name):
     success = False
 
     while not success and attempt < max_attempt:
-        result = subprocess.run(
-            _get_install_command(url, font_directory),
-            capture_output=True,
-            text=True,
-        )
-        success = result.returncode == 0
-        if not success:
+        try:
+            r = requests.get(url)
+            with (font_directory / url.split("/")[-1]).open("wb") as f:
+                f.write(r.content)
+            success = True
+        except Exception as e:
             # Print the output to the terminal
-            print("Try", attempt + 1, "of", max_attempt)
-            print("STDOUT:", result.stdout)
-            print("STDERR:", result.stderr)
+            print(f"Error: {e}\nTry {attempt + 1} of {max_attempt}")
             # Increment attempt counter and wait before the next attempt
             attempt += 1
-            time.sleep(5)
+            time.sleep(attempt)
 
     if not success:
         raise RuntimeError(
@@ -167,26 +103,16 @@ def install_latin_modern_fonts():
             )
             print(f"Unzipping Latin Modern {lm}...")
 
-            result = subprocess.run(
-                [
-                    "unzip",
-                    "-o",
-                    (font_directory / f"latin-modern-{lm}.zip"),
-                    "-d",
-                    (font_directory / f"latin-modern-{lm}"),
-                ],
-                capture_output=True,
-                text=True,
-            )
-            success = result.returncode == 0
-            if not success:
+            try:
+                with ZipFile(font_directory / f"latin-modern-{lm}.zip", "r") as zip_ref:
+                    zip_ref.extractall(font_directory / f"latin-modern-{lm}")
+                    success = True
+            except Exception as e:
                 # Print the output to the terminal
-                print("Try", attempt + 1, "of", max_attempt)
-                print("STDOUT:", result.stdout)
-                print("STDERR:", result.stderr)
+                print(f"Error: {e}\nTry {attempt + 1} of {max_attempt}")
                 # Increment attempt counter and wait before the next attempt
                 attempt += 1
-                time.sleep(1)
+                time.sleep(attempt)
                 subprocess.run(
                     ["rm", "-f", (font_directory / f"latin-modern-{lm}.zip")]
                 )

plothist/scripts/make_examples.py

@@ -7,7 +7,7 @@ import warnings
 import sys
 
 
-_matplotlib_version = "3.9.0"
+_matplotlib_version = "3.10.0"
 _numpy_version = "2.0.0"
 
 
@@ -30,17 +30,11 @@ def make_examples(no_input=False, check_svg=False, print_code=False):
         If the example or img folder does not exist, the function will raise a FileNotFoundError.
     """
 
-    # If python version is lower than 3.9, return a warning
-    if sys.version_info < (3, 9):
-        warnings.warn(
-            "svg behavior is not consistent across python versions. Please run this script with python 3.9 or higher. Skipping.",
-            stacklevel=2,
-        )
-        return 1
-
     import matplotlib
 
-    if matplotlib.__version__ < _matplotlib_version:
+    if tuple(map(int, matplotlib.__version__.split("."))) < tuple(
+        map(int, _matplotlib_version.split("."))
+    ):
         warnings.warn(
             f"svg behavior is not consistent across matplotlib versions. Please run this script with matplotlib {_matplotlib_version} or higher. Skipping.",
             stacklevel=2,
@@ -49,7 +43,9 @@ def make_examples(no_input=False, check_svg=False, print_code=False):
 
     import numpy
 
-    if numpy.__version__ < _numpy_version:
+    if tuple(map(int, numpy.__version__.split("."))) < tuple(
+        map(int, _numpy_version.split("."))
+    ):
         warnings.warn(
             f"svg behavior is not consistent across numpy versions. Please run this script with numpy {_numpy_version} or higher. Skipping.",
             stacklevel=2,

plothist/variable_registry.py

@@ -178,7 +178,7 @@ def update_variable_registry(
     path : str, optional
         The path to the variable registry file (default is "./variable_registry.yaml").
     overwrite : bool, optional
-        If True, the keys will be overwrite by the provided value in the dictonnary (default is False).
+        If True, the keys will be overwrite by the provided value in the dictionary (default is False).
 
     Returns
     -------

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

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: plothist
-Version: 1.2.5
+Version: 1.3.0
 Summary: Plot histograms in a scalable way and a beautiful style.
 Author-email: Cyrille Praz <cyrraz.code@protonmail.com>, Tristan Fillinger <tristan.github@gmail.com>
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
@@ -13,11 +13,12 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering
-Requires-Dist: boost-histogram~=1.4.0
+Requires-Dist: boost-histogram>=1.4.0
 Requires-Dist: numpy>=1.14.5
 Requires-Dist: matplotlib>=3.0
 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

{plothist-1.2.5.dist-info → plothist-1.3.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-plothist/__init__.py,sha256=qux9MpCMgOHnNm_qbhmiDfY3-EtAA85ZnUZxiSD0IfY,3314
+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
@@ -6,12 +6,12 @@ plothist/get_dummy_data.py,sha256=7GrWea75f0vWGi1IQg1TRpq_NzaDsTQiXm7kQ7eZOdI,43
 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=yGbA0WjSHDD5kgs1uL_KgcJEHoKihbtzLDLyfGJty-8,10207
+plothist/variable_registry.py,sha256=_fJEhr_jfm6CwxmfFK5qcRUE1VAxUlecnZEzHeuinDs,10207
 plothist/scripts/__init__.py,sha256=FRe2fYlnv0lJYqn8wPxAmhDs1XME8pvEs3rQgJpjp3k,108
-plothist/scripts/install_latin_modern_fonts.py,sha256=up5oUr04M_TZheRb_Uw_Ckxe66Fg3vQxUp0A3Pz_lAI,7613
-plothist/scripts/make_examples.py,sha256=bMEVJc3MrxRFeIwaLqasTcCWDCQouKKtlrJc185PsIE,7533
-plothist-1.2.5.dist-info/entry_points.txt,sha256=8YWfI0-xVfDK4EmTWzQLfP4r0wJoUc4CTLk0lj2mKJY,185
-plothist-1.2.5.dist-info/LICENSE,sha256=zLdEtgFx6ObRPsz6Ofa0zJb5EuL0Z54FJP8egGX_unU,1523
-plothist-1.2.5.dist-info/WHEEL,sha256=rSgq_JpHF9fHR1lx53qwg_1-2LypZE_qmcuXbVUq948,81
-plothist-1.2.5.dist-info/METADATA,sha256=-bg_ett0pAymY6sW0CAw2J1EX_ixLaTz3d-GKfmj7Qg,3656
-plothist-1.2.5.dist-info/RECORD,,
+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.2.5.dist-info → plothist-1.3.0.dist-info}/WHEEL

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