Merge branch 'v1-file-format'

.github/codecov.yml

@@ -1,6 +1,2 @@
-flag_management:
-  default_rules:
-    carryforward: true
-
 github_checks:
   annotations: false

.github/workflows/msrv.yml

@@ -18,6 +18,8 @@ jobs:
 
       - name: Run check
         run: |
+          # extract the MSRV
+          MSRV=$(grep '^rust-version ' Cargo.toml | cut -d= -f2- | tr -d ' "')
           # enable the MSRV
-          rustup default 1.70.0
+          rustup default "${MSRV}"
           cargo check --all-features --all-targets

.github/workflows/python.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -117,6 +117,7 @@ jobs:
             3.9
             3.11
             3.12
+            3.13
             3.10
       - name: Install dependencies
         run: |
@@ -379,6 +380,7 @@ jobs:
             3.9
             3.11
             3.12
+            3.13
             3.10
       - name: Build wheels
         uses: PyO3/maturin-action@v1
@@ -429,6 +431,7 @@ jobs:
             3.9
             3.11
             3.12
+            3.13
             3.10
           architecture: ${{ matrix.target }}
       - name: Build wheels

.github/workflows/rust.yml

@@ -25,40 +25,12 @@ jobs:
         uses: actions/cache@v4
         with:
           path: test-data
-          key: test-data-v14
+          key: test-data-v17
       - name: Download test data
         if: steps.cache-test-data.outputs.cache-hit != 'true'
         run: |
-          test -d test-data || mkdir test-data
-          cd test-data
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/ATLASWPT11-Wplus_tot.appl'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/CMS_TTB_8TEV_2D_TTM_TRAP_TOT-opt.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/CMS_TTB_8TEV_2D_TTM_TRAP_TOT.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/E906nlo_bin_00.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/E906nlo_bin_00.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/FK_ATLASTTBARTOT13TEV.dat'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/FK_POSXDQ.dat'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHC8-Mtt-HT4-173_3-bin1.tab.gz'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCBWZMU7TEV_PI_part1.appl'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_DY_8TEV.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_DY_8TEV.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_old.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_opt.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_v2.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_v2_xif_2.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/NJetEvents_0-0-2.tab.gz'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/NUTEV_CC_NU_FE_SIGMARED.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/NUTEV_CC_NU_FE_SIGMARED.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/dy_high_mass/CMS_DY_14TEV_MLL_6000_COSTH.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/dy_high_mass/NNPDF_DY_14TEV_BSM_AFB.pineappl.lz4'
-          curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-atlas-dijets-fnlo-arxiv-1312.3524/grids/applfast-atlas-dijets-fnlo-arxiv-1312.3524-xsec000.tab.gz'
-          curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-h1-dijets-appl-arxiv-0010054/grids/applfast-h1-dijets-appl-arxiv-0010054-xsec000.appl'
-          curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-h1-incjets-fnlo-arxiv-0706.3722/grids/applfast-h1-incjets-fnlo-arxiv-0706.3722-xsec000.tab.gz'
-          curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/atlas/atlas-atlas-wpm-arxiv-1109.5141/grids/atlas-atlas-wpm-arxiv-1109.5141-xsec001.appl'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL.pineappl.lz4'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL_PolPDF.tar'
-          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL_UnpolPDF.tar'
+          cd maintainer
+          ./download-test-data.sh
 
       - name: Set RUSTDOCFLAGS
         run: |

.readthedocs.yml

@@ -8,7 +8,10 @@ build:
   os: ubuntu-22.04
   tools:
     python: "3.10"
-    rust: "1.70"
+  commands:
+    - export RUST_WITHOUT=rust-docs,rustfmt
+    - asdf install rust latest
+    - asdf global rust latest
 
 python:
   install:

CHANGELOG.md

@@ -7,16 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+PineAPPL 1.0 is a major rewrite from the previous version, allowing grids to
+have an arbitrary number of convolutions in the initial (PDFs with a
+factorization scale) and in the final (FFs with a fragmentation scale) state.
+This required a change in the file format that is used to write out grids, but
+the old file format can still be read with this new version.
+
 ### Added
 
 - added new method `Grid::delete_orders` and the corresponding switch
   `--delete-orders` in the subcommand `write` of the CLI
 - added the switches `--xir` and `--xif`, which allow varying the
   renormalization and factorization scales with a custom factor in the
-  subcommand `convolve`.
+  subcommand `convolve`
+- the CLI now allows the user to mark convolution functions as polarized
+  by adding `+p` to its LHAPDF name, as a fragmentation function by adding
+  `+f` and both by adding `+pf` or `+fp`
 
 ### Changed
 
+- the macro `channel!` now accepts a channel specification that is of the
+  format `factor * (pid, ..) + ...`
 - Python API: dropped top-level Python interface layer
 - Python API: renamed `lumi` to `channel` in PyO3 Python interface. This
   concerns 1) the argument names of `convolute_with_one` and similar functions;
@@ -33,12 +44,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - by default `pineappl plot` no longer shows a channel breakdown in the panel
   with absolute PDF predictions. However, this feature can be enabled with via
   a new array added at the start of the script
+- raised MSRV to 1.80.1
+- changed the order of elements in `Grid::fill` of the parameter `ntuple` to
+  reflect the ordering of `kinematics` given to `Grid::new`
+- renamed the following switches of `pineappl write`: `--remap` to
+  `--set-bins`, `--remap-norm-ignore` to `--div-bin-norm-dims` and
+  `--remap-norm` to `--mul-bin-norm`. These names should reflect the
+  corresponding operations
 
 ### Removed
 
 - Python API: removed `pineappl.grid.Grid.create()` and
   `pineappl.fk_table.FkTable.from_grid()` methods; use the constructors
   of the respective class instead
+- removed the constructor `Grid::with_subgrid_type`
+
+## [0.8.7] - 22/01/2025
+
+### Added
+
+- added support for Python 3.13 to the Python interface
 
 ## [0.8.6] - 18/10/2024
 
@@ -106,8 +131,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - added `PidBasis::charge_conjugate` and `PidBasis::guess`
 - added `Grid::set_pid_basis` method
 - added `Grid::subgrids` and `Grid::subgrids_mut` methods
-- added new switch `conv_fun_uncert_from` to subcommand `plot` to allow
-  choosing with convolution function uncertainty should be plotted
+- added new switch `--conv-fun-uncert-from` to subcommand `plot` to allow
+  choosing which convolution function uncertainty should be plotted
 
 ### Changed
 
@@ -711,6 +736,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - first release
 
 [Unreleased]: https://github.com/NNPDF/pineappl/compare/v0.8.2...HEAD
+[0.8.7]: https://github.com/NNPDF/pineappl/compare/v0.8.6...v0.8.7
 [0.8.6]: https://github.com/NNPDF/pineappl/compare/v0.8.5...v0.8.6
 [0.8.5]: https://github.com/NNPDF/pineappl/compare/v0.8.4...v0.8.5
 [0.8.4]: https://github.com/NNPDF/pineappl/compare/v0.8.3...v0.8.4