plothist 1.4.0__tar.gz → 1.5.0__tar.gz

{plothist-1.4.0 → 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.4.0 → 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 --group dev --group test
+        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.4.0 → plothist-1.5.0}/.github/workflows/coverage.yaml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 2
 
       - 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"
 

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

@@ -8,6 +8,8 @@ registry.yaml
 test.yaml
 temp_img/
 .venv
+.nox/
+.coverage
 
 # Ignore local readthedocs build
 html/
@@ -16,6 +18,7 @@ docs/examples/*/*.svg
 example_gallery/
 .svg_metadata.yaml
 tests/*.yaml
+pytest_results/
 
 # Version file
 _version.py

{plothist-1.4.0 → plothist-1.5.0}/.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
         args: ["--pytest-test-first"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.2
+    rev: v0.12.2
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -44,13 +44,13 @@ repos:
           - tomli
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.31.3
+    rev: 0.33.2
     hooks:
       - id: check-github-workflows
         args: ["--verbose"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.1
     hooks:
       - id: mypy
         files: src
@@ -66,13 +66,13 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.32.1
+    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.02.24
+    rev: 2025.06.23
     hooks:
       - id: validate-pyproject

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plothist
-Version: 1.4.0
+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/

{plothist-1.4.0 → plothist-1.5.0}/docs/CONTRIBUTING.rst

@@ -60,6 +60,8 @@ You can also run specific nox sessions:
    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-1.4.0 → plothist-1.5.0}/docs/advanced/model_examples.rst

@@ -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.4.0 → plothist-1.5.0}/docs/advanced/other_advanced.rst

@@ -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.4.0 → plothist-1.5.0}/docs/basics/1d_func.rst

@@ -1,4 +1,4 @@
-.. _basics-1d_func-label:
+.. _basics-func_1d-label:
 
 ==============
 Plot functions
@@ -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
 

{plothist-1.4.0 → plothist-1.5.0}/docs/basics/1d_hist.rst

@@ -24,11 +24,11 @@ Simple 1D histogram
 
 To plot a simple 1D histogram, you first need to create a histogram object with the :func:`make_hist() <plothist.histogramming.make_hist>` function that you can then plot with the :func:`plot_hist() <plothist.plotters.plot_hist>` function:
 
-.. literalinclude:: ../examples/1d_hist/1d_hist_simple.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_hist_simple.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_hist_simple.svg
+.. image:: ../img/1d_hist_simple.png
    :alt: Simple hist
    :width: 500
 
@@ -39,22 +39,22 @@ To plot a simple 1D histogram, you first need to create a histogram object with
 
 To add multiple histograms to the same plot, you can just call the :func:`make_hist() <plothist.histogramming.make_hist>` and :func:`plot_hist() <plothist.plotters.plot_hist>` functions multiple times:
 
-.. literalinclude:: ../examples/1d_hist/1d_elt1.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_elt1.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_elt1.svg
+.. image:: ../img/1d_elt1.png
    :alt: Simple hist
    :width: 500
 
 
 To stack them, use the argument ``stacked=True`` in the :func:`plot_hist() <plothist.plotters.plot_hist>` function:
 
-.. literalinclude:: ../examples/1d_hist/1d_elt1_stacked.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_elt1_stacked.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_elt1_stacked.svg
+.. image:: ../img/1d_elt1_stacked.png
    :alt: Simple stacked hist
    :width: 500
 
@@ -64,11 +64,11 @@ Histogram with error bars
 
 To plot a simple histogram with error bars, use the :func:`plot_error_hist() <plothist.plotters.plot_error_hist>` function. The default error bars are the Poisson standard deviation derived from the variance stored in the histogram object.
 
-.. literalinclude:: ../examples/1d_hist/1d_elt2.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_elt2.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_elt2.svg
+.. image:: ../img/1d_elt2.png
    :alt: Simple error hist
    :width: 500
 
@@ -89,11 +89,11 @@ Ratio
 
 Ratio is the default comparison method:
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_ratio.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_ratio.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_ratio.svg
+.. image:: ../img/1d_comparison_ratio.png
    :alt: Simple ratio comparison
    :width: 500
 
@@ -103,11 +103,11 @@ Split ratio
 
 When the ``split_ratio`` option is used, both the h1 and h2 uncertainties are scaled down by the h2 bin contents. The h2 adjusted uncertainties are shown separately as a hatched area. In practice, the ``split_ratio`` comparison option is used when h1 is filled with measured data and h2 is a model, see :ref:`advanced-model_comparison-label` section for more details.
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_split_ratio.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_split_ratio.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_split_ratio.svg
+.. image:: ../img/1d_comparison_split_ratio.png
     :alt: Simple split ratio comparison
     :width: 500
 
@@ -117,11 +117,11 @@ Pull
 
 To perform a pull comparison between two histograms:
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_pull.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_pull.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_pull.svg
+.. image:: ../img/1d_comparison_pull.png
    :alt: Simple pull comparison
    :width: 500
 
@@ -131,11 +131,11 @@ Difference
 
 To plot the difference between two histograms:
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_difference.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_difference.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_difference.svg
+.. image:: ../img/1d_comparison_difference.png
    :alt: Simple difference comparison
    :width: 500
 
@@ -145,11 +145,11 @@ Relative difference
 
 To plot the relative difference between two histograms:
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_relative_difference.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_relative_difference.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_relative_difference.svg
+.. image:: ../img/1d_comparison_relative_difference.png
    :alt: Simple difference comparison
    :width: 500
 
@@ -159,11 +159,11 @@ Asymmetry
 
 To plot the asymmetry between two histograms:
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_asymmetry.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_asymmetry.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_asymmetry.svg
+.. image:: ../img/1d_comparison_asymmetry.png
    :alt: Simple asymmetry comparison
    :width: 500
 
@@ -173,11 +173,11 @@ Efficiency
 
 This example shows how to plot the ratio between two histograms h1 and h2 when the entries of h1 are a subset of the entries of h2. The variances are calculated according to the formula given in :ref:`documentation-statistics-label`.
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_efficiency.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_efficiency.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_efficiency.svg
+.. image:: ../img/1d_comparison_efficiency.png
    :alt: Simple efficiency comparison
    :width: 500
 
@@ -187,11 +187,11 @@ To only plot the comparison
 
 With any of the comparison shown above, you can use the :func:`plot_comparison() <plothist.plotters.plot_comparison>` function to only plot the comparison. Here is an example with the efficiency comparison of two histograms:
 
-.. literalinclude:: ../examples/1d_hist/1d_comparison_only_efficiency.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_comparison_only_efficiency.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_comparison_only_efficiency.svg
+.. image:: ../img/1d_comparison_only_efficiency.png
     :alt: Simple efficiency comparison, only the comparison
     :width: 500
 
@@ -220,11 +220,11 @@ In this example, the data points and the error bars are the average value and th
 Note that most functions in ``plothist`` work only with counting histograms and will raise an error if you try to use them with a mean histogram.
 
 
-.. literalinclude:: ../examples/1d_hist/1d_profile.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_profile.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_profile.svg
+.. image:: ../img/1d_profile.png
     :alt: Profile plot
     :width: 500
 
@@ -239,11 +239,11 @@ The examples below show how to create a histogram with a category axis in ``boos
 Integer category
 ----------------
 
-.. literalinclude:: ../examples/1d_hist/1d_int_category.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_int_category.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_int_category.svg
+.. image:: ../img/1d_int_category.png
     :alt: Integer category plot
     :width: 500
 
@@ -256,11 +256,11 @@ Integer category
 String category
 ---------------
 
-.. literalinclude:: ../examples/1d_hist/1d_str_category.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_str_category.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/1d_str_category.svg
+.. image:: ../img/1d_str_category.png
     :alt: String category plot
     :width: 500
 
@@ -271,10 +271,10 @@ Using multiple histograms
 
 With multiple histograms, the :func:`plot_hist() <plothist.plotters.plot_hist>` function will correctly put them side by side, because it is a wrapper around the ``hist()`` function from ``matplotlib`` that provides this functionality.
 
-.. image:: ../img/1d_side_by_side.svg
+.. image:: ../img/1d_side_by_side.png
     :alt: Side by side histograms
     :width: 500
 
-.. literalinclude:: ../examples/1d_hist/1d_side_by_side.py
+.. literalinclude:: ../../src/plothist/examples/1d_hist/1d_side_by_side.py
     :language: python
     :start-after: ###

{plothist-1.4.0 → plothist-1.5.0}/docs/basics/2d_hist.rst

@@ -22,11 +22,11 @@ Simple plot
 
 Plotting a simple 2D histogram is very similar to plotting a 1D histogram. The function :func:`make_2d_hist() <plothist.histogramming.make_2d_hist>` is used to create the 2D histogram, and the function :func:`plot_2d_hist() <plothist.plotters.plot_2d_hist>` is used to plot it.
 
-.. literalinclude:: ../examples/2d_hist/2d_hist_simple.py
+.. literalinclude:: ../../src/plothist/examples/2d_hist/2d_hist_simple.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/2d_hist_simple.svg
+.. image:: ../img/2d_hist_simple.png
    :alt: Simple 2d hist
    :width: 500
 
@@ -38,11 +38,11 @@ The argument ``cmap`` in ``pcolormesh_kwargs`` can be used to change the colorma
 
 Here is a more complex example on how to get a discrete colormap:
 
-.. literalinclude:: ../examples/2d_hist/2d_hist_simple_discrete_colormap.py
+.. literalinclude:: ../../src/plothist/examples/2d_hist/2d_hist_simple_discrete_colormap.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/2d_hist_simple_discrete_colormap.svg
+.. image:: ../img/2d_hist_simple_discrete_colormap.png
    :alt: Simple 2d hist with discrete colormap
    :width: 500
 
@@ -53,22 +53,22 @@ Correlations with variable registry
 
 The variable registry is a really useful tool to manage and plot the correlation between multiple variables (see :ref:`basics-variable_registry-label` on how to use it.)
 
-.. literalinclude:: ../examples/2d_hist/2d_hist_correlations.py
+.. literalinclude:: ../../src/plothist/examples/2d_hist/2d_hist_correlations.py
     :language: python
     :start-after: ###
 
 
 |img1| |img2| |img3|
 
-.. |img1| image:: ../img/2d_hist_correlations_0.svg
+.. |img1| image:: ../img/2d_hist_correlations_0.png
    :alt: 2d correlation plot
    :width: 210
 
-.. |img2| image:: ../img/2d_hist_correlations_1.svg
+.. |img2| image:: ../img/2d_hist_correlations_1.png
    :alt: 2d correlation plot
    :width: 210
 
-.. |img3| image:: ../img/2d_hist_correlations_2.svg
+.. |img3| image:: ../img/2d_hist_correlations_2.png
    :alt: 2d correlation plot
    :width: 210
 
@@ -78,11 +78,11 @@ Uneven binning
 
 Instead of inputing a number of bins and a range in :func:`make_2d_hist() <plothist.histogramming.make_2d_hist>`, the bins parameter can be a list of all the edges:
 
-.. literalinclude:: ../examples/2d_hist/2d_hist_uneven.py
+.. literalinclude:: ../../src/plothist/examples/2d_hist/2d_hist_uneven.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/2d_hist_uneven.svg
+.. image:: ../img/2d_hist_uneven.png
    :alt: 2d hist with uneven binning
    :width: 500
 
@@ -93,10 +93,10 @@ Display 1D distributions
 
 To plot a 2d histogram with x and y projections, the function :func:`plot_2d_hist_with_projections() <plothist.plotters.plot_2d_hist_with_projections>` can be used. The corresponding projections are displayed on the top and right of the 2D histogram, and the colorbar is clearly displayed and labeled.
 
-.. literalinclude:: ../examples/2d_hist/2d_hist_with_projections.py
+.. literalinclude:: ../../src/plothist/examples/2d_hist/2d_hist_with_projections.py
     :language: python
     :start-after: ###
 
-.. image:: ../img/2d_hist_with_projections.svg
+.. image:: ../img/2d_hist_with_projections.png
    :alt: 2d hist with x and y projections
    :width: 500