plothist 1.3.2__tar.gz → 1.5.0__tar.gz

{plothist-1.3.2 → plothist-1.5.0}/.github/dependabot.yaml

@@ -4,7 +4,7 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     groups:
       actions:
         patterns:

{plothist-1.3.2 → plothist-1.5.0}/.github/workflows/cd.yaml

@@ -19,7 +19,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: "0.6.8"
       - name: Build distribution

{plothist-1.3.2 → plothist-1.5.0}/.github/workflows/ci.yaml

@@ -19,13 +19,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: "0.6.8"
           python-version: ${{ matrix.python-version }}
 
       - name: Install the project
-        run: uv sync --all-extras --dev
+        run: |
+          uv sync --group dev --group test
 
       - name: Run pre-commit
         run: |
@@ -33,4 +34,12 @@ jobs:
 
       - name: Test with pytest
         run: |
-          uv run python -m pytest
+          uv run python -m pytest -r sa --mpl --mpl-results-path=pytest_results -n auto
+
+      - name: Upload pytest test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: pytest_results-${{ matrix.python-version }}
+          retention-days: 3
+          path: pytest_results

plothist-1.5.0/.github/workflows/coverage.yaml

@@ -0,0 +1,32 @@
+name: Run tests and upload coverage
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    name: Run tests and collect coverage
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: "0.6.8"
+
+      - name: Install the project and the test dependencies
+        run: uv sync --group test
+
+      - name: Run tests
+        run: uv run pytest --cov=plothist --cov-report=xml
+
+      - name: Upload results to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

{plothist-1.3.2 → plothist-1.5.0}/.gitignore

@@ -4,8 +4,12 @@ variable_registry.yaml
 _build/
 test/
 metadata.yaml
+registry.yaml
+test.yaml
 temp_img/
 .venv
+.nox/
+.coverage
 
 # Ignore local readthedocs build
 html/
@@ -14,3 +18,7 @@ docs/examples/*/*.svg
 example_gallery/
 .svg_metadata.yaml
 tests/*.yaml
+pytest_results/
+
+# Version file
+_version.py

plothist-1.5.0/.pre-commit-config.yaml

@@ -0,0 +1,78 @@
+ci:
+  autoupdate_commit_msg: "chore: update pre-commit hooks"
+  autofix_commit_msg: "style: pre-commit fixes"
+  autoupdate_schedule: monthly
+
+repos:
+  - repo: https://github.com/adamchainz/blacken-docs
+    rev: "1.19.1"
+    hooks:
+      - id: blacken-docs
+        args: ["--line-length", "120"]
+        additional_dependencies:
+          - black==24.2.0
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+        exclude: '.*\.svg$'
+      - id: name-tests-test
+        args: ["--pytest-test-first"]
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.12.2
+    hooks:
+      - id: ruff
+        args: ["--fix", "--show-fixes"]
+      - id: ruff-format
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.4.1
+    hooks:
+      - id: codespell
+        additional_dependencies:
+          - tomli
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.33.2
+    hooks:
+      - id: check-github-workflows
+        args: ["--verbose"]
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.16.1
+    hooks:
+      - id: mypy
+        files: src
+        additional_dependencies:
+          - types-requests
+          - types-pyyaml
+
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.10.0
+    hooks:
+      - id: rst-backticks
+      - id: rst-directive-colons
+      - id: rst-inline-touching-normal
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.33.2
+    hooks:
+      - id: check-readthedocs
+      - id: check-dependabot
+      - id: check-github-workflows
+
+  - repo: https://github.com/henryiii/validate-pyproject-schema-store
+    rev: 2025.06.23
+    hooks:
+      - id: validate-pyproject

plothist-1.5.0/.readthedocs.yaml

@@ -0,0 +1,16 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.12"
+  commands:
+    - asdf plugin add uv
+    - asdf install uv latest
+    - asdf global uv latest
+    - uv sync --group docs
+    - .venv/bin/sphinx-build -n -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html

{plothist-1.3.2 → plothist-1.5.0}/LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2023-2024, Cyrille Praz, Tristan Fillinger
+Copyright (c) 2023-2025, Cyrille Praz, Tristan Fillinger
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

{plothist-1.3.2 → plothist-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plothist
-Version: 1.3.2
+Version: 1.5.0
 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/
@@ -19,13 +19,10 @@ Requires-Python: >=3.9
 Requires-Dist: boost-histogram>=1.4.0
 Requires-Dist: matplotlib>=3.0
 Requires-Dist: numpy>=1.14.5
+Requires-Dist: plothist-utils>=0.0.1
 Requires-Dist: pyyaml>=5.3.1
 Requires-Dist: requests>=2.25.0
 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
 
 
@@ -49,8 +46,11 @@ plothist
    :width: 320
 
 
-|GitHub Project| |PyPI version| |Docs from main| |Discussion| |DOI| |Code style: black|
+|GitHub Project| |PyPI version| |Docs from main| |Discussion| |DOI| |Linter|
 
+|GitHub Actions Status: CI| |GitHub Actions Status: CD| |pre-commit.ci Status| |Code Coverage|
+
+This package is a wrapper around `matplotlib <https://matplotlib.org/>`_.
 
 **Advantages of the package**: scalability, style and user-friendly way of managing variables and a stunning `example gallery <https://plothist.readthedocs.io/en/latest/example_gallery/>`_.
 
@@ -73,13 +73,21 @@ plothist
 
 .. |GitHub Project| image:: https://img.shields.io/badge/GitHub--blue?style=social&logo=GitHub
    :target: https://github.com/cyrraz/plothist
-.. |PyPI version| image:: https://badge.fury.io/py/plothist.svg
+.. |PyPI version| image:: https://badge.fury.io/py/plothist.svg?style=flat-square
    :target: https://badge.fury.io/py/plothist
-.. |Docs from main| image:: https://img.shields.io/badge/docs-main-blue.svg
+.. |Docs from main| image:: https://img.shields.io/badge/docs-main-blue.svg?style=platic
    :target: https://plothist.readthedocs.io/en/main/
-.. |Discussion| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
+.. |Discussion| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github?style=flat-square
    :target: https://github.com/cyrraz/plothist/discussions
-.. |DOI| image:: https://zenodo.org/badge/647069945.svg
+.. |DOI| image:: https://zenodo.org/badge/647069945.svg?style=flat-square
    :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
+.. |Linter| image:: https://img.shields.io/badge/Linter-Ruff-brightgreen?style=platic
+   :target: https://github.com/charliermarsh/ruff
+.. |GitHub Actions Status: CI| image:: https://github.com/cyrraz/plothist/actions/workflows/ci.yaml/badge.svg?style=flat-square
+   :target: https://github.com/cyrraz/plothist/actions/workflows/ci.yaml?query=branch%3Amain
+.. |GitHub Actions Status: CD| image:: https://github.com/cyrraz/plothist/actions/workflows/cd.yaml/badge.svg?style=flat-square
+   :target: https://github.com/cyrraz/plothist/actions/workflows/cd.yaml?query=branch%3Amain
+.. |pre-commit.ci Status| image:: https://results.pre-commit.ci/badge/github/cyrraz/plothist/main.svg?style=flat-square
+   :target: https://results.pre-commit.ci/latest/github/cyrraz/plothist/main
+.. |Code Coverage| image:: https://codecov.io/gh/cyrraz/plothist/branch/main/graph/badge.svg?style=flat-square
+    :target: https://codecov.io/gh/cyrraz/plothist

{plothist-1.3.2 → plothist-1.5.0}/README.rst

@@ -19,8 +19,11 @@ plothist
    :width: 320
 
 
-|GitHub Project| |PyPI version| |Docs from main| |Discussion| |DOI| |Code style: black|
+|GitHub Project| |PyPI version| |Docs from main| |Discussion| |DOI| |Linter|
 
+|GitHub Actions Status: CI| |GitHub Actions Status: CD| |pre-commit.ci Status| |Code Coverage|
+
+This package is a wrapper around `matplotlib <https://matplotlib.org/>`_.
 
 **Advantages of the package**: scalability, style and user-friendly way of managing variables and a stunning `example gallery <https://plothist.readthedocs.io/en/latest/example_gallery/>`_.
 
@@ -43,13 +46,21 @@ plothist
 
 .. |GitHub Project| image:: https://img.shields.io/badge/GitHub--blue?style=social&logo=GitHub
    :target: https://github.com/cyrraz/plothist
-.. |PyPI version| image:: https://badge.fury.io/py/plothist.svg
+.. |PyPI version| image:: https://badge.fury.io/py/plothist.svg?style=flat-square
    :target: https://badge.fury.io/py/plothist
-.. |Docs from main| image:: https://img.shields.io/badge/docs-main-blue.svg
+.. |Docs from main| image:: https://img.shields.io/badge/docs-main-blue.svg?style=platic
    :target: https://plothist.readthedocs.io/en/main/
-.. |Discussion| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
+.. |Discussion| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github?style=flat-square
    :target: https://github.com/cyrraz/plothist/discussions
-.. |DOI| image:: https://zenodo.org/badge/647069945.svg
+.. |DOI| image:: https://zenodo.org/badge/647069945.svg?style=flat-square
    :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
+.. |Linter| image:: https://img.shields.io/badge/Linter-Ruff-brightgreen?style=platic
+   :target: https://github.com/charliermarsh/ruff
+.. |GitHub Actions Status: CI| image:: https://github.com/cyrraz/plothist/actions/workflows/ci.yaml/badge.svg?style=flat-square
+   :target: https://github.com/cyrraz/plothist/actions/workflows/ci.yaml?query=branch%3Amain
+.. |GitHub Actions Status: CD| image:: https://github.com/cyrraz/plothist/actions/workflows/cd.yaml/badge.svg?style=flat-square
+   :target: https://github.com/cyrraz/plothist/actions/workflows/cd.yaml?query=branch%3Amain
+.. |pre-commit.ci Status| image:: https://results.pre-commit.ci/badge/github/cyrraz/plothist/main.svg?style=flat-square
+   :target: https://results.pre-commit.ci/latest/github/cyrraz/plothist/main
+.. |Code Coverage| image:: https://codecov.io/gh/cyrraz/plothist/branch/main/graph/badge.svg?style=flat-square
+    :target: https://codecov.io/gh/cyrraz/plothist

plothist-1.5.0/codecov.yml

@@ -0,0 +1,6 @@
+comment: false
+
+github_checks: false
+
+ignore:
+  - "src/plothist/scripts"

plothist-1.5.0/docs/CONTRIBUTING.rst

@@ -0,0 +1,79 @@
+.. _contributing:
+
+============
+Contributing
+============
+
+Welcome to the ``plothist`` project! We appreciate your interest in contributing to our codebase. This document outlines the steps to get started with development, including setting up your environment and running tests.
+If you have any questions or need assistance, feel free to reach out to the maintainers.
+We welcome contributions of all kinds, including bug fixes, new features, and documentation improvements.
+
+Building from source
+====================
+
+Follow the instructions in :ref:`install-dev-version` to install the development version of ``plothist``.
+
+Setting up a development environment
+====================================
+
+Nox
+---
+
+The fastest way to start with development is to use ``nox``.
+
+``Nox`` is an automation tool that helps manage and run development tasks such as testing and linting.
+It is especially useful for ensuring your code works across different Python versions and adheres to the project's quality standards.
+``Nox`` handles everything for you, including setting up a temporary virtual environment for each run.
+
+To set up ``nox``:
+
+1. If you don't have it already, install ``pipx`` by following the instructions on their `website <https://pipx.pypa.io/stable/>`_.
+2. Install ``nox`` using ``pipx``:
+
+   .. code-block:: console
+
+      pipx install nox
+
+To use ``nox``, simply run:
+
+.. code-block:: console
+
+   nox
+
+This will lint and test the project using multiple Python versions.
+
+You can also run specific nox sessions:
+
+.. code-block:: console
+
+   # List all the defined sessions
+   nox -l
+   # Run the linter only
+   nox -s lint
+   # Run the tests only
+   nox -s tests
+   # Build the documentation and serve it locally (display the documentation in a web browser with live-reloading)
+   nox -s docs
+   # Build the documentation without serving it
+   nox -s docs --non-interactive
+   # Check for broken links in the documentation
+   nox -s docs -- -b linkcheck
+   # Run the tests with coverage (takes a while)
+   nox -s coverage
+   # Generate the example figures. Needed if you update any of the example scripts.
+   nox -s generate_examples_figures -- tests/test_examples_*.py
+
+Linters and Formatters
+----------------------
+
+``plothist`` uses `pre-commit <https://pre-commit.com/>`_ to manage linters and formatters.
+
+The tools are listed in ``.pre-commit-config.yaml``. Key among them is ``Ruff`` is used for linting and formatting, with its configuration in ``pyproject.toml``.
+
+Use ``nox -s lint`` to run the linters and formatters.
+
+To install the pre-commit hooks, run the following command (assuming you have installed  ``plothist`` via ``uv`` following the instructions in :ref:`install-dev-version`):
+
+.. code-block:: console
+
+   uv run pre-commit install

{plothist-1.3.2 → plothist-1.5.0}/docs/advanced/model_examples.rst

@@ -8,7 +8,7 @@ The examples below make use of a numpy ndarray ``df`` containing dummy data (you
 
 .. code-block:: python
 
-    from plothist import get_dummy_data
+    from plothist_utils import get_dummy_data
 
     df = get_dummy_data()
 
@@ -31,7 +31,7 @@ We also show an example of how to scale the model to the data. We take advantage
     from plothist import make_hist, get_color_palette
 
     key = "variable_1"
-    range = [-9, 12]
+    range = (-9, 12)
     category = "category"
 
     # Define some masks to separate the dataset in signal (1 category), background (3 categories) and data (1 category)
@@ -88,11 +88,11 @@ Histograms
 
 Here is an example with a model made of 3 stacked and 1 unstacked histograms. The calculated sum is the sum of all 4 histograms.
 
-.. literalinclude:: ../examples/model_ex/model_with_stacked_and_unstacked_histograms_components.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_with_stacked_and_unstacked_histograms_components.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_with_stacked_and_unstacked_histograms_components.svg
+.. image:: ../img/model_with_stacked_and_unstacked_histograms_components.png
    :alt: Plot of a model with stacked and unstacked histograms components
    :width: 500
 
@@ -104,11 +104,11 @@ Functions
 
 Here is an example with a model made of 2 stacked and 1 unstacked functions:
 
-.. literalinclude:: ../examples/model_ex/model_with_stacked_and_unstacked_function_components.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_with_stacked_and_unstacked_function_components.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_with_stacked_and_unstacked_function_components.svg
+.. image:: ../img/model_with_stacked_and_unstacked_function_components.png
    :alt: Plot of a model with stacked and unstacked function components
    :width: 500
 
@@ -128,11 +128,11 @@ Stacked histograms
 
 A comparison between data and a model composed of 3 stacked histograms. A signal histogram is also plotted, but it doesn't belong to the model, so it is not taken into account in the comparison.
 
-.. literalinclude:: ../examples/model_ex/model_examples_stacked.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_examples_stacked.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_examples_stacked.svg
+.. image:: ../img/model_examples_stacked.png
    :alt: Data/model comparison, stacked plot
    :width: 500
 
@@ -148,11 +148,11 @@ Unstacked histograms
 
 The same comparison as above, but we represent the model with unstacked histograms:
 
-.. literalinclude:: ../examples/model_ex/model_examples_unstacked.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_examples_unstacked.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_examples_unstacked.svg
+.. image:: ../img/model_examples_unstacked.png
    :alt: Data/model comparison, stacked plot
    :width: 500
 
@@ -162,11 +162,11 @@ Stacked and unstacked histograms
 
 Stacked and unstacked histograms can be combined. The sum of the model components is always the sum of all the components, stacked and unstacked. Below is the same comparison as above, but the model is now composed of 2 stacked and 1 unstacked histograms:
 
-.. literalinclude:: ../examples/model_ex/model_examples_stacked_unstacked.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_examples_stacked_unstacked.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_examples_stacked_unstacked.svg
+.. image:: ../img/model_examples_stacked_unstacked.png
    :alt: Data/model comparison, stacked and unstacked plot with histograms
    :width: 500
 
@@ -176,11 +176,11 @@ Models made of functions
 
 The function :func:`plot_data_model_comparison() <plothist.plotters.plot_data_model_comparison>` can also be used to compare data and a model made of functions. The model below is composed of 2 stacked and 1 unstacked functions. All the functions contribute to the model. The sum of the model components is the sum of all the components, stacked and unstacked:
 
-.. literalinclude:: ../examples/model_ex/ratio_data_vs_model_with_stacked_and_unstacked_function_components.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/ratio_data_vs_model_with_stacked_and_unstacked_function_components.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/ratio_data_vs_model_with_stacked_and_unstacked_function_components.svg
+.. image:: ../img/ratio_data_vs_model_with_stacked_and_unstacked_function_components.png
    :alt: Data/Model comparison, model with stacked and unstacked function components
    :width: 500
 
@@ -193,22 +193,22 @@ Model uncertainty
 
 As said earlier, the comparison function can take any comparison method available in :func:`plot_comparison() <plothist.plotters.plot_comparison>`. To use pulls instead of the ratio to compare the histograms:
 
-.. literalinclude:: ../examples/model_ex/model_examples_pull.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_examples_pull.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_examples_pull.svg
+.. image:: ../img/model_examples_pull.png
    :alt: Data/model comparison with pull, stacked plot
    :width: 500
 
 
 Now, if you do not want to show nor take into account the model uncertainties, setting ``model_uncertainty`` to ``False`` removes them and updates the definition of the pulls:
 
-.. literalinclude:: ../examples/model_ex/model_examples_pull_no_model_unc.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_examples_pull_no_model_unc.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_examples_pull_no_model_unc.svg
+.. image:: ../img/model_examples_pull_no_model_unc.png
    :alt: Data/model comparison with pull, no model stat. unc., stacked plot
    :width: 500
 
@@ -228,11 +228,11 @@ All the different comparisons
 
 Below is shown how to make a plot with all the possible comparisons between data and model. The idea is to use :func:`plot_data_model_comparison() <plothist.plotters.plot_data_model_comparison>` to make the plot with the ratio comparison, and then use :func:`plot_comparison() <plothist.plotters.plot_comparison>` to add the other comparisons. The :func:`plot_comparison() <plothist.plotters.plot_comparison>` function can take a ``fig`` and ``ax`` argument to add the comparison to an existing figure. The :func:`plot_data_model_comparison() <plothist.plotters.plot_data_model_comparison>` function returns the figure and axes used to make the plot, so we can use them to add the other comparisons.
 
-.. literalinclude:: ../examples/model_ex/model_all_comparisons.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_all_comparisons.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_all_comparisons.svg
+.. image:: ../img/model_all_comparisons.png
    :alt: Data/model comparison with all comparisons, stacked plot
    :width: 500
 
@@ -243,10 +243,10 @@ No model uncertainties
 
 Same example as above, but we remove the statistical uncertainties of the model by adding ``model_uncertainty=False`` in :func:`plot_data_model_comparison() <plothist.plotters.plot_data_model_comparison>` and pass a model histogram without uncertainties to :func:`plot_comparison() <plothist.plotters.plot_comparison>`:
 
-.. literalinclude:: ../examples/model_ex/model_all_comparisons_no_model_unc.py
+.. literalinclude:: ../../src/plothist/examples/model_ex/model_all_comparisons_no_model_unc.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/model_all_comparisons_no_model_unc.svg
+.. image:: ../img/model_all_comparisons_no_model_unc.png
    :alt: Data/model comparison with all comparisons, no model uncertainties, stacked plot
    :width: 500

{plothist-1.3.2 → plothist-1.5.0}/docs/advanced/other_advanced.rst

@@ -10,7 +10,7 @@ The examples use of a numpy ndarray ``df`` containing dummy data (you may also u
 
 .. code-block:: python
 
-    from plothist import get_dummy_data
+    from plothist_utils import get_dummy_data
 
     df = get_dummy_data()
 
@@ -19,11 +19,11 @@ Advanced example comparing two histograms
 
 In this example, we will compare two tuples of histograms and use pull and ratio comparisons. First, we make the histograms and scale them. Then, we plot the histograms and the comparison plots on different axes:
 
-.. image:: ../img/1d_comparison_advanced.svg
+.. image:: ../img/1d_comparison_advanced.png
    :alt: Advanced hist comparison
    :width: 500
 
-.. literalinclude:: ../examples/advanced/1d_comparison_advanced.py
+.. literalinclude:: ../../src/plothist/examples/advanced/1d_comparison_advanced.py
    :language: python
    :start-after: ###
 
@@ -34,11 +34,11 @@ Advanced example using asymmetry comparison
 
 This example shows how to plot an asymmetry plot between two histograms and two functions. Information on how to convert a function from an external fitting package to an object that can be used by ``plothist`` can be found in :ref:`plot-fit-result-label`.
 
-.. image:: ../img/asymmetry_comparison_advanced.svg
+.. image:: ../img/asymmetry_comparison_advanced.png
    :alt: Advanced asymmetry comparison
    :width: 500
 
-.. literalinclude:: ../examples/advanced/asymmetry_comparison_advanced.py
+.. literalinclude:: ../../src/plothist/examples/advanced/asymmetry_comparison_advanced.py
    :language: python
    :start-after: ###
 
@@ -47,11 +47,11 @@ Flatten 2D variable
 
 Compare data and stacked histogram for a flatten 2D variable:
 
-.. image:: ../img/model_examples_flatten2D.svg
+.. image:: ../img/model_examples_flatten2D.png
    :alt: Data/model comparison, flatten variable
    :width: 500
 
-.. literalinclude:: ../examples/advanced/model_examples_flatten2D.py
+.. literalinclude:: ../../src/plothist/examples/advanced/model_examples_flatten2D.py
     :language: python
     :start-after: ###
 
@@ -61,10 +61,10 @@ Multiple histograms, side by side, with numbers on top
 
 This example shows how to plot multiple 1D histograms side by side, with numbers on top of each bars. The code is similar to the one used in the :ref:`basics-1d_hist_side_by_side-label` section.
 
-.. image:: ../img/1d_side_by_side_with_numbers.svg
+.. image:: ../img/1d_side_by_side_with_numbers.png
    :alt: Multiple histograms side by side
    :width: 500
 
-.. literalinclude:: ../examples/advanced/1d_side_by_side_with_numbers.py
+.. literalinclude:: ../../src/plothist/examples/advanced/1d_side_by_side_with_numbers.py
    :language: python
    :start-after: ###

{plothist-1.3.2 → plothist-1.5.0}/docs/basics/1d_func.rst

@@ -1,4 +1,4 @@
-.. _basics-1d_func-label:
+.. _basics-func_1d-label:
 
 ==============
 Plot functions
@@ -8,7 +8,7 @@ The examples below make use of a numpy ndarray ``df`` containing dummy data (you
 
 .. code-block:: python
 
-    from plothist import get_dummy_data
+    from plothist_utils import get_dummy_data
 
     df = get_dummy_data()
 
@@ -25,21 +25,21 @@ Simple function
 
 Plothist supports plotting of functions using the :func:`plot_function() <plothist.plotters.plot_function>` function:
 
-.. literalinclude:: ../examples/1d_func/1d_fct.py
+.. literalinclude:: ../../src/plothist/examples/func_1d/fct_1d.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_fct.svg
+.. image:: ../img/fct_1d.png
     :alt: Simple function
     :width: 500
 
 In particular, you can stack functions using the ``stacked=True`` argument:
 
-.. literalinclude:: ../examples/1d_func/1d_fct_stacked.py
+.. literalinclude:: ../../src/plothist/examples/func_1d/fct_1d_stacked.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_fct_stacked.svg
+.. image:: ../img/fct_1d_stacked.png
     :alt: Simple stacked function
     :width: 500