From e91b2cd64facec7fe0c1f64d308f4f1027a14a83 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 11:03:25 +0200 Subject: [PATCH 01/66] init adjust write opcard --- src/pineko/evolve.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 0e4ce191..ca19af44 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -155,8 +155,15 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): # switch on polarization ? kv = pineappl_grid.key_values() - if "polarized" in kv: - operators_card["configs"]["polarized"] = kv["polarized"] == "True" + if "convolution_type_1" in kv: + eko1 = kv["convolution_type_1"] + # TODO: this case is now deprecated and should be remved from yadism and pinefarm + elif "polarized" in kv: + eko1 = "polPDF" + else: + eko1 = "PDF" + + eko2 = kv.get("convolution_type_2", "PDF") # fragmentation function grid? if "timelike" in kv: @@ -172,9 +179,24 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): "are you sure that's what you want?" ) - with open(card_path, "w", encoding="UTF-8") as f: - yaml.safe_dump(operators_card, f) - f.write(f"# {pineko_version=}") + # For hardonic obs we might need to dump 2 eko cards + if eko1 == eko2: + with open(card_path, "w", encoding="UTF-8") as f: + yaml.safe_dump(operators_card, f) + f.write(f"# {pineko_version=}") + else: + # dump eko1 + operators_card["configs"]["polarized"] = eko1 == "polPDF" + card_name = f"{card_path.stem}_eko1.yaml" + with open(card_path.parent / card_name, "w", encoding="UTF-8") as f: + yaml.safe_dump(operators_card, f) + f.write(f"# {pineko_version=}") + # dump eko2 + operators_card["configs"]["polarized"] = eko2 == "polPDF" + card_name = f"{card_path.stem}_eko2.yaml" + with open(card_path.parent / card_name, "w", encoding="UTF-8") as f: + yaml.safe_dump(operators_card, f) + f.write(f"# {pineko_version=}") return operators_card["xgrid"], q2_grid From 57dff37c9089a5a58c3e4bf3975e97dd739a486f Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 12:01:36 +0200 Subject: [PATCH 02/66] allow convolution with 2 ekos --- src/pineko/evolve.py | 59 ++++++++++++++++++---------- src/pineko/theory.py | 92 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 110 insertions(+), 41 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index ca19af44..d4103fa6 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -180,13 +180,13 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): ) # For hardonic obs we might need to dump 2 eko cards + operators_card["configs"]["polarized"] = eko1 == "polPDF" if eko1 == eko2: with open(card_path, "w", encoding="UTF-8") as f: yaml.safe_dump(operators_card, f) f.write(f"# {pineko_version=}") else: # dump eko1 - operators_card["configs"]["polarized"] = eko1 == "polPDF" card_name = f"{card_path.stem}_eko1.yaml" with open(card_path.parent / card_name, "w", encoding="UTF-8") as f: yaml.safe_dump(operators_card, f) @@ -203,12 +203,13 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): def evolve_grid( grid, - operators, + operators_a, fktable_path, max_as, max_al, xir, xif, + operators_b=None, assumptions="Nf6Ind", comparison_pdf=None, meta_data=None, @@ -220,7 +221,7 @@ def evolve_grid( ---------- grid : pineappl.grid.Grid unconvoluted grid - operators : eko.EKO + operators_a : eko.EKO evolution operator fktable_path : str target path for convoluted grid @@ -232,6 +233,8 @@ def evolve_grid( renormalization scale variation xif : float factorization scale variation + operators_b: eko.EKO + additonal evolution operator if different from operators_a assumptions : str assumptions on the flavor dimension comparison_pdf : None or str @@ -253,22 +256,29 @@ def evolve_grid( evol_info = grid.evolve_info(order_mask) x_grid = evol_info.x1 mur2_grid = evol_info.ren1 - xif = 1.0 if operators.operator_card.configs.scvar_method is not None else xif - tcard = operators.theory_card - opcard = operators.operator_card + xif = 1.0 if operators_a.operator_card.configs.scvar_method is not None else xif + tcard = operators_a.theory_card + opcard = operators_a.operator_card # rotate the targetgrid if "integrability_version" in grid.key_values(): x_grid = np.append(x_grid, 1.0) - eko.io.manipulate.xgrid_reshape( - operators, targetgrid=eko.interpolation.XGrid(x_grid) - ) - check.check_grid_and_eko_compatible(grid, operators, xif, max_as, max_al) - # rotate to evolution (if doable and necessary) - if np.allclose(operators.bases.inputpids, br.flavor_basis_pids): - eko.io.manipulate.to_evol(operators) - # Here we are checking if the EKO contains the rotation matrix (flavor to evol) - elif not np.allclose(operators.bases.inputpids, br.rotate_flavor_to_evolution): - raise ValueError("The EKO is neither in flavor nor in evolution basis.") + + def xgrid_reshape(operators): + eko.io.manipulate.xgrid_reshape( + operators, targetgrid=eko.interpolation.XGrid(x_grid) + ) + check.check_grid_and_eko_compatible(grid, operators, xif, max_as, max_al) + # rotate to evolution (if doable and necessary) + if np.allclose(operators.bases.inputpids, br.flavor_basis_pids): + eko.io.manipulate.to_evol(operators) + # Here we are checking if the EKO contains the rotation matrix (flavor to evol) + elif not np.allclose(operators.bases.inputpids, br.rotate_flavor_to_evolution): + raise ValueError("The EKO is neither in flavor nor in evolution basis.") + + xgrid_reshape(operators_a) + if operators_b is not None: + xgrid_reshape(operators_b) + # PineAPPL wants alpha_s = 4*pi*a_s # remember that we already accounted for xif in the opcard generation evmod = eko.couplings.couplings_mod_ev(opcard.configs.evolution_method) @@ -296,18 +306,27 @@ def evolve_grid( ] # We need to use ekompatibility in order to pass a dictionary to pineappl fktable = grid.evolve( - ekompatibility.pineappl_layout(operators), + ekompatibility.pineappl_layout(operators_a), xir * xir * mur2_grid, alphas_values, "evol", + operators_b=ekompatibility.pineappl_layout(operators_b), order_mask=order_mask, xi=(xir, xif), ) rich.print(f"Optimizing for {assumptions}") fktable.optimize(assumptions) - fktable.set_key_value("eko_version", operators.metadata.version) - fktable.set_key_value("eko_theory_card", json.dumps(operators.theory_card.raw)) - fktable.set_key_value("eko_operator_card", json.dumps(operators.operator_card.raw)) + fktable.set_key_value("eko_version", operators_a.metadata.version) + fktable.set_key_value("eko_theory_card", json.dumps(operators_a.theory_card.raw)) + + fktable.set_key_value( + "eko_operator_card", json.dumps(operators_a.operator_card.raw) + ) + if operators_b is not None: + fktable.set_key_value( + "eko_operator_card_b", json.dumps(operators_b.operator_card.raw) + ) + fktable.set_key_value("pineko_version", version.__version__) if meta_data is not None: for k, v in meta_data.items(): diff --git a/src/pineko/theory.py b/src/pineko/theory.py index f8d80d46..5b322d1f 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -398,8 +398,27 @@ def fk(self, name, grid_path, tcard, pdf): grid = pineappl.grid.Grid.read(grid_path) # remove zero subgrid grid.optimize() + + # Do you need one or multiple ekos? + kv = grid.key_values() + if "convolution_type_1" in kv: + eko1 = kv["convolution_type_1"] + # TODO: this case is now deprecated and should be remved from yadism and pinefarm + elif "polarized" in kv: + eko1 = "polPDF" + else: + eko1 = "PDF" + eko2 = kv.get("convolution_type_2", "PDF") + # setup data - eko_filename = self.ekos_path() / f"{name}.tar" + if eko1 == eko2: + eko_filename = [self.ekos_path() / f"{name}.tar"] + else: + eko_filename = [ + self.ekos_path() / f"{name}_eko1.tar", + self.ekos_path() / f"{name}_eko2.tar", + ] + fk_filename = self.fks_path / f"{name}.{parser.EXT}" if fk_filename.exists(): if not self.overwrite: @@ -434,16 +453,28 @@ def fk(self, name, grid_path, tcard, pdf): if not np.isclose(xif, 1.0): check_scvar_evolve(grid, max_as, max_al, check.Scale.FACT) # loading ekos to produce a tmp copy - with eko.EKO.read(eko_filename) as operators: + n_ekos = len(eko_filename) + with eko.EKO.read(eko_filename[0]) as operators_a: + # Skip the computation of the fktable if the eko is empty - if len(operators.mu2grid) == 0 and check.is_num_fonll(tcard["FNS"]): + if len(operators_a.mu2grid) == 0 and check.is_num_fonll(tcard["FNS"]): rich.print("[green] Skipping empty eko for nFONLL.") return - eko_tmp_path = ( - operators.paths.root.parent / f"eko-tmp-{name}-{np.random.rand()}.tar" + + eko_tmp_path_a = ( + operators_a.paths.root.parent / f"eko-tmp-{name}-{np.random.rand()}.tar" ) - operators.deepcopy(eko_tmp_path) - with eko.EKO.edit(eko_tmp_path) as operators: + operators_a.deepcopy(eko_tmp_path_a) + + if n_ekos > 1: + with eko.EKO.read(eko_filename[1]) as operators_b: + eko_tmp_path_b = ( + operators_a.paths.root.parent + / f"eko-tmp-{name}-{np.random.rand()}.tar" + ) + operators_b.deepcopy(eko_tmp_path_b) + + with eko.EKO.edit(eko_tmp_path_a) as operators_a: # Obtain the assumptions hash assumptions = theory_card.construct_assumptions(tcard) # do it! @@ -456,7 +487,6 @@ def fk(self, name, grid_path, tcard, pdf): xif, ) start_time = time.perf_counter() - rich.print( rich.panel.Panel.fit( "Computing ...", style="magenta", box=rich.box.SQUARE @@ -466,20 +496,40 @@ def fk(self, name, grid_path, tcard, pdf): f"= {fk_filename}\n", f"with max_as={max_as}, max_al={max_al}, xir={xir}, xif={xif}", ) - _grid, _fk, comparison = evolve.evolve_grid( - grid, - operators, - fk_filename, - max_as, - max_al, - xir=xir, - xif=xif, - assumptions=assumptions, - comparison_pdf=pdf, - meta_data={"theory_card": json.dumps(tcard)}, - ) + + if n_ekos == 1: + _grid, _fk, comparison = evolve.evolve_grid( + grid, + operators_a, + fk_filename, + max_as, + max_al, + xir=xir, + xif=xif, + assumptions=assumptions, + comparison_pdf=pdf, + meta_data={"theory_card": json.dumps(tcard)}, + ) + else: + with eko.EKO.edit(eko_tmp_path_b) as operators_b: + _grid, _fk, comparison = evolve.evolve_grid( + grid, + operators_a, + fk_filename, + max_as, + max_al, + xir=xir, + xif=xif, + assumptions=assumptions, + operators_b=operators_b, + comparison_pdf=pdf, + meta_data={"theory_card": json.dumps(tcard)}, + ) + # Remove tmp ekos + eko_tmp_path_b.unlink() + # Remove tmp ekos - eko_tmp_path.unlink() + eko_tmp_path_a.unlink() logger.info( "Finished computation of %s - took %f s", From 6091b7eb37f4d0a95257ab72ad23f6e613872573 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 12:06:57 +0200 Subject: [PATCH 03/66] small cleaning --- src/pineko/evolve.py | 29 ++++++++++++++++++++--------- src/pineko/theory.py | 9 +-------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index d4103fa6..7f40fcd8 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -46,6 +46,25 @@ def sv_scheme(tcard): return modsv +def get_ekos_convolution_type_2(kv): + """Temporary finction to retrive the ekos convolution type. + + Parameters + ---------- + kv: dict + pineappl grid metadata + """ + if "convolution_type_1" in kv: + eko1 = kv["convolution_type_1"] + # TODO: this case is now deprecated and should be remved from yadism and pinefarm + elif "polarized" in kv: + eko1 = "polPDF" + else: + eko1 = "PDF" + eko2 = kv.get("convolution_type_2", "PDF") + return eko1, eko2 + + def write_operator_card_from_file( pineappl_path: os.PathLike, default_card_path: os.PathLike, @@ -155,15 +174,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): # switch on polarization ? kv = pineappl_grid.key_values() - if "convolution_type_1" in kv: - eko1 = kv["convolution_type_1"] - # TODO: this case is now deprecated and should be remved from yadism and pinefarm - elif "polarized" in kv: - eko1 = "polPDF" - else: - eko1 = "PDF" - - eko2 = kv.get("convolution_type_2", "PDF") + eko1, eko2 = get_ekos_convolution_type_2(kv) # fragmentation function grid? if "timelike" in kv: diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 5b322d1f..74aac18d 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -401,14 +401,7 @@ def fk(self, name, grid_path, tcard, pdf): # Do you need one or multiple ekos? kv = grid.key_values() - if "convolution_type_1" in kv: - eko1 = kv["convolution_type_1"] - # TODO: this case is now deprecated and should be remved from yadism and pinefarm - elif "polarized" in kv: - eko1 = "polPDF" - else: - eko1 = "PDF" - eko2 = kv.get("convolution_type_2", "PDF") + eko1, eko2 = evolve.get_ekos_convolution_type_2(kv) # setup data if eko1 == eko2: From 443794e94629cb87424f05388339771d83d0ab5b Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 13:08:23 +0200 Subject: [PATCH 04/66] small refactor --- src/pineko/evolve.py | 28 ++++++++++++++-------------- src/pineko/theory.py | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 7f40fcd8..234e7738 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -46,7 +46,7 @@ def sv_scheme(tcard): return modsv -def get_ekos_convolution_type_2(kv): +def get_ekos_convolution_type(kv): """Temporary finction to retrive the ekos convolution type. Parameters @@ -174,7 +174,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): # switch on polarization ? kv = pineappl_grid.key_values() - eko1, eko2 = get_ekos_convolution_type_2(kv) + conv_type_a, conv_type_b = get_ekos_convolution_type(kv) # fragmentation function grid? if "timelike" in kv: @@ -190,24 +190,24 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): "are you sure that's what you want?" ) - # For hardonic obs we might need to dump 2 eko cards - operators_card["configs"]["polarized"] = eko1 == "polPDF" - if eko1 == eko2: + def dump_card(card_path, operators_card, conv_type): + operators_card["configs"]["polarized"] = conv_type == "polPDF" with open(card_path, "w", encoding="UTF-8") as f: yaml.safe_dump(operators_card, f) f.write(f"# {pineko_version=}") + + # For hardonic obs we might need to dump 2 eko cards + + if conv_type_a == conv_type_b: + dump_card(card_path, operators_card, conv_type_a) else: # dump eko1 - card_name = f"{card_path.stem}_eko1.yaml" - with open(card_path.parent / card_name, "w", encoding="UTF-8") as f: - yaml.safe_dump(operators_card, f) - f.write(f"# {pineko_version=}") + card_name = f"{card_path.stem}_{conv_type_a}.yaml" + dump_card(card_path.parent / card_name, operators_card) + # dump eko2 - operators_card["configs"]["polarized"] = eko2 == "polPDF" - card_name = f"{card_path.stem}_eko2.yaml" - with open(card_path.parent / card_name, "w", encoding="UTF-8") as f: - yaml.safe_dump(operators_card, f) - f.write(f"# {pineko_version=}") + card_name = f"{card_path.stem}_{conv_type_b}.yaml" + dump_card(card_path.parent / card_name, operators_card) return operators_card["xgrid"], q2_grid diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 74aac18d..1a42f7bf 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -401,15 +401,15 @@ def fk(self, name, grid_path, tcard, pdf): # Do you need one or multiple ekos? kv = grid.key_values() - eko1, eko2 = evolve.get_ekos_convolution_type_2(kv) + conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(kv) # setup data - if eko1 == eko2: + if conv_type_a == conv_type_b: eko_filename = [self.ekos_path() / f"{name}.tar"] else: eko_filename = [ - self.ekos_path() / f"{name}_eko1.tar", - self.ekos_path() / f"{name}_eko2.tar", + self.ekos_path() / f"{name}_{conv_type_a}.tar", + self.ekos_path() / f"{name}_{conv_type_b}.tar", ] fk_filename = self.fks_path / f"{name}.{parser.EXT}" From a759bfc066b0e1aeeab8db0d5facd6b8e6c11c0c Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 13:58:14 +0200 Subject: [PATCH 05/66] fix call to pineappl_layout --- src/pineko/evolve.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 234e7738..51530776 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -321,7 +321,11 @@ def xgrid_reshape(operators): xir * xir * mur2_grid, alphas_values, "evol", - operators_b=ekompatibility.pineappl_layout(operators_b), + operators_b=( + ekompatibility.pineappl_layout(operators_b) + if operators_b is not None + else None + ), order_mask=order_mask, xi=(xir, xif), ) From 0d3076e2efc1b8edf57373d137fef430fe3faf51 Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Mon, 3 Jun 2024 17:46:23 +0200 Subject: [PATCH 06/66] Update src/pineko/evolve.py Co-authored-by: Felix Hekhorn --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 51530776..8e0a2187 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -201,7 +201,7 @@ def dump_card(card_path, operators_card, conv_type): if conv_type_a == conv_type_b: dump_card(card_path, operators_card, conv_type_a) else: - # dump eko1 + # dump card 1 card_name = f"{card_path.stem}_{conv_type_a}.yaml" dump_card(card_path.parent / card_name, operators_card) From 3c107ee97fced512b8e79f094e29aa8f96240d47 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 17:55:31 +0200 Subject: [PATCH 07/66] some improvements --- src/pineko/evolve.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 8e0a2187..d8908c73 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -57,7 +57,7 @@ def get_ekos_convolution_type(kv): if "convolution_type_1" in kv: eko1 = kv["convolution_type_1"] # TODO: this case is now deprecated and should be remved from yadism and pinefarm - elif "polarized" in kv: + elif "polarized" in kv and kv["polarized"]: eko1 = "polPDF" else: eko1 = "PDF" @@ -190,8 +190,11 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): "are you sure that's what you want?" ) - def dump_card(card_path, operators_card, conv_type): + def dump_card(card_path, operators_card, conv_type, suffix=False): operators_card["configs"]["polarized"] = conv_type == "polPDF" + + if suffix: + card_path = card_path.parent / f"{card_path.stem}_{conv_type_a}.yaml" with open(card_path, "w", encoding="UTF-8") as f: yaml.safe_dump(operators_card, f) f.write(f"# {pineko_version=}") @@ -201,13 +204,10 @@ def dump_card(card_path, operators_card, conv_type): if conv_type_a == conv_type_b: dump_card(card_path, operators_card, conv_type_a) else: - # dump card 1 - card_name = f"{card_path.stem}_{conv_type_a}.yaml" - dump_card(card_path.parent / card_name, operators_card) - - # dump eko2 - card_name = f"{card_path.stem}_{conv_type_b}.yaml" - dump_card(card_path.parent / card_name, operators_card) + # dump card_a + dump_card(card_path, operators_card, conv_type_a, suffix=True) + # dump card_b + dump_card(card_path, operators_card, conv_type_b, suffix=True) return operators_card["xgrid"], q2_grid From 31f988669c8c7ef031229872673c4b54abcb180c Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 3 Jun 2024 17:59:28 +0200 Subject: [PATCH 08/66] some improvements 2 --- src/pineko/evolve.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index d8908c73..3829c661 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -191,12 +191,13 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): ) def dump_card(card_path, operators_card, conv_type, suffix=False): - operators_card["configs"]["polarized"] = conv_type == "polPDF" + op_to_dump = copy.deepcopy(operators_card) + op_to_dump["configs"]["polarized"] = conv_type == "polPDF" if suffix: card_path = card_path.parent / f"{card_path.stem}_{conv_type_a}.yaml" with open(card_path, "w", encoding="UTF-8") as f: - yaml.safe_dump(operators_card, f) + yaml.safe_dump(op_to_dump, f) f.write(f"# {pineko_version=}") # For hardonic obs we might need to dump 2 eko cards From 6de0497057e1e88181b1c226d87ee30c2c539b6e Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:20:11 +0200 Subject: [PATCH 09/66] Update src/pineko/evolve.py Co-authored-by: Tanjona Rabemananjara --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 3829c661..9c8807ad 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -321,12 +321,12 @@ def xgrid_reshape(operators): ekompatibility.pineappl_layout(operators_a), xir * xir * mur2_grid, alphas_values, - "evol", operators_b=( ekompatibility.pineappl_layout(operators_b) if operators_b is not None else None ), + lumi_id_types="evol", order_mask=order_mask, xi=(xir, xif), ) From f6a1c0f9ee86f2785e1ac3e02955ae9763ff1330 Mon Sep 17 00:00:00 2001 From: Tanjona Rabemananjara Date: Tue, 4 Jun 2024 00:38:25 +0200 Subject: [PATCH 10/66] use develop branch of pineappl --- poetry.lock | 715 ++++++++++++++++++++++--------------------------- pyproject.toml | 2 +- 2 files changed, 324 insertions(+), 393 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3f49f9d1..a95de5d4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. [[package]] name = "absl-py" @@ -35,13 +35,13 @@ files = [ [[package]] name = "astroid" -version = "3.1.0" +version = "3.2.2" description = "An abstract syntax tree for Python with inference support." optional = false python-versions = ">=3.8.0" files = [ - {file = "astroid-3.1.0-py3-none-any.whl", hash = "sha256:951798f922990137ac090c53af473db7ab4e70c770e6d7fae0cec59f74411819"}, - {file = "astroid-3.1.0.tar.gz", hash = "sha256:ac248253bfa4bd924a0de213707e7ebeeb3138abeb48d798784ead1e56d419d4"}, + {file = "astroid-3.2.2-py3-none-any.whl", hash = "sha256:e8a0083b4bb28fcffb6207a3bfc9e5d0a68be951dd7e336d5dcf639c682388c0"}, + {file = "astroid-3.2.2.tar.gz", hash = "sha256:8ead48e31b92b2e217b6c9733a21afafe479d52d6e164dd25fb1a770c7c3cf94"}, ] [package.dependencies] @@ -101,13 +101,13 @@ tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "p [[package]] name = "babel" -version = "2.14.0" +version = "2.15.0" description = "Internationalization utilities" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"}, - {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, + {file = "Babel-2.15.0-py3-none-any.whl", hash = "sha256:08706bdad8d0a3413266ab61bd6c34d0c28d6e1e7badf40a2cebe67644e2e1fb"}, + {file = "babel-2.15.0.tar.gz", hash = "sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413"}, ] [package.extras] @@ -153,13 +153,13 @@ six = "*" [[package]] name = "certifi" -version = "2024.2.2" +version = "2024.6.2" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, - {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, + {file = "certifi-2024.6.2-py3-none-any.whl", hash = "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"}, + {file = "certifi-2024.6.2.tar.gz", hash = "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516"}, ] [[package]] @@ -376,63 +376,63 @@ test-no-images = ["pytest", "pytest-cov", "pytest-xdist", "wurlitzer"] [[package]] name = "coverage" -version = "7.4.4" +version = "7.5.3" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0be5efd5127542ef31f165de269f77560d6cdef525fffa446de6f7e9186cfb2"}, - {file = "coverage-7.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ccd341521be3d1b3daeb41960ae94a5e87abe2f46f17224ba5d6f2b8398016cf"}, - {file = "coverage-7.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09fa497a8ab37784fbb20ab699c246053ac294d13fc7eb40ec007a5043ec91f8"}, - {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1a93009cb80730c9bca5d6d4665494b725b6e8e157c1cb7f2db5b4b122ea562"}, - {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:690db6517f09336559dc0b5f55342df62370a48f5469fabf502db2c6d1cffcd2"}, - {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:09c3255458533cb76ef55da8cc49ffab9e33f083739c8bd4f58e79fecfe288f7"}, - {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8ce1415194b4a6bd0cdcc3a1dfbf58b63f910dcb7330fe15bdff542c56949f87"}, - {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b91cbc4b195444e7e258ba27ac33769c41b94967919f10037e6355e998af255c"}, - {file = "coverage-7.4.4-cp310-cp310-win32.whl", hash = "sha256:598825b51b81c808cb6f078dcb972f96af96b078faa47af7dfcdf282835baa8d"}, - {file = "coverage-7.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:09ef9199ed6653989ebbcaacc9b62b514bb63ea2f90256e71fea3ed74bd8ff6f"}, - {file = "coverage-7.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0f9f50e7ef2a71e2fae92774c99170eb8304e3fdf9c8c3c7ae9bab3e7229c5cf"}, - {file = "coverage-7.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:623512f8ba53c422fcfb2ce68362c97945095b864cda94a92edbaf5994201083"}, - {file = "coverage-7.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0513b9508b93da4e1716744ef6ebc507aff016ba115ffe8ecff744d1322a7b63"}, - {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40209e141059b9370a2657c9b15607815359ab3ef9918f0196b6fccce8d3230f"}, - {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2b2b78c78293782fd3767d53e6474582f62443d0504b1554370bde86cc8227"}, - {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:73bfb9c09951125d06ee473bed216e2c3742f530fc5acc1383883125de76d9cd"}, - {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f384c3cc76aeedce208643697fb3e8437604b512255de6d18dae3f27655a384"}, - {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:54eb8d1bf7cacfbf2a3186019bcf01d11c666bd495ed18717162f7eb1e9dd00b"}, - {file = "coverage-7.4.4-cp311-cp311-win32.whl", hash = "sha256:cac99918c7bba15302a2d81f0312c08054a3359eaa1929c7e4b26ebe41e9b286"}, - {file = "coverage-7.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:b14706df8b2de49869ae03a5ccbc211f4041750cd4a66f698df89d44f4bd30ec"}, - {file = "coverage-7.4.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:201bef2eea65e0e9c56343115ba3814e896afe6d36ffd37bab783261db430f76"}, - {file = "coverage-7.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41c9c5f3de16b903b610d09650e5e27adbfa7f500302718c9ffd1c12cf9d6818"}, - {file = "coverage-7.4.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d898fe162d26929b5960e4e138651f7427048e72c853607f2b200909794ed978"}, - {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ea79bb50e805cd6ac058dfa3b5c8f6c040cb87fe83de10845857f5535d1db70"}, - {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce4b94265ca988c3f8e479e741693d143026632672e3ff924f25fab50518dd51"}, - {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:00838a35b882694afda09f85e469c96367daa3f3f2b097d846a7216993d37f4c"}, - {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fdfafb32984684eb03c2d83e1e51f64f0906b11e64482df3c5db936ce3839d48"}, - {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9"}, - {file = "coverage-7.4.4-cp312-cp312-win32.whl", hash = "sha256:137eb07173141545e07403cca94ab625cc1cc6bc4c1e97b6e3846270e7e1fea0"}, - {file = "coverage-7.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:d71eec7d83298f1af3326ce0ff1d0ea83c7cb98f72b577097f9083b20bdaf05e"}, - {file = "coverage-7.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384"}, - {file = "coverage-7.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1"}, - {file = "coverage-7.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a"}, - {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409"}, - {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e"}, - {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd"}, - {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7"}, - {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c"}, - {file = "coverage-7.4.4-cp38-cp38-win32.whl", hash = "sha256:dfa8fe35a0bb90382837b238fff375de15f0dcdb9ae68ff85f7a63649c98527e"}, - {file = "coverage-7.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:b2991665420a803495e0b90a79233c1433d6ed77ef282e8e152a324bbbc5e0c8"}, - {file = "coverage-7.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d"}, - {file = "coverage-7.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357"}, - {file = "coverage-7.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e"}, - {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e"}, - {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4"}, - {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec"}, - {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd"}, - {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade"}, - {file = "coverage-7.4.4-cp39-cp39-win32.whl", hash = "sha256:d89d7b2974cae412400e88f35d86af72208e1ede1a541954af5d944a8ba46c57"}, - {file = "coverage-7.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:9ca28a302acb19b6af89e90f33ee3e1906961f94b54ea37de6737b7ca9d8827c"}, - {file = "coverage-7.4.4-pp38.pp39.pp310-none-any.whl", hash = "sha256:b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677"}, - {file = "coverage-7.4.4.tar.gz", hash = "sha256:c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49"}, + {file = "coverage-7.5.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45"}, + {file = "coverage-7.5.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec"}, + {file = "coverage-7.5.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286"}, + {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc"}, + {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d"}, + {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83"}, + {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d"}, + {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c"}, + {file = "coverage-7.5.3-cp310-cp310-win32.whl", hash = "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84"}, + {file = "coverage-7.5.3-cp310-cp310-win_amd64.whl", hash = "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac"}, + {file = "coverage-7.5.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974"}, + {file = "coverage-7.5.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232"}, + {file = "coverage-7.5.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd"}, + {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807"}, + {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb"}, + {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc"}, + {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8"}, + {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614"}, + {file = "coverage-7.5.3-cp311-cp311-win32.whl", hash = "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9"}, + {file = "coverage-7.5.3-cp311-cp311-win_amd64.whl", hash = "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a"}, + {file = "coverage-7.5.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8"}, + {file = "coverage-7.5.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3"}, + {file = "coverage-7.5.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1"}, + {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db"}, + {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd"}, + {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523"}, + {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"}, + {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84"}, + {file = "coverage-7.5.3-cp312-cp312-win32.whl", hash = "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08"}, + {file = "coverage-7.5.3-cp312-cp312-win_amd64.whl", hash = "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb"}, + {file = "coverage-7.5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb"}, + {file = "coverage-7.5.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155"}, + {file = "coverage-7.5.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24"}, + {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98"}, + {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d"}, + {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d"}, + {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce"}, + {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0"}, + {file = "coverage-7.5.3-cp38-cp38-win32.whl", hash = "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485"}, + {file = "coverage-7.5.3-cp38-cp38-win_amd64.whl", hash = "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56"}, + {file = "coverage-7.5.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85"}, + {file = "coverage-7.5.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31"}, + {file = "coverage-7.5.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d"}, + {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341"}, + {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7"}, + {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52"}, + {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303"}, + {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd"}, + {file = "coverage-7.5.3-cp39-cp39-win32.whl", hash = "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d"}, + {file = "coverage-7.5.3-cp39-cp39-win_amd64.whl", hash = "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0"}, + {file = "coverage-7.5.3-pp38.pp39.pp310-none-any.whl", hash = "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884"}, + {file = "coverage-7.5.3.tar.gz", hash = "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f"}, ] [package.dependencies] @@ -458,19 +458,19 @@ tests = ["pytest", "pytest-cov", "pytest-xdist"] [[package]] name = "dask" -version = "2024.4.1" +version = "2024.5.2" description = "Parallel PyData with Task Scheduling" optional = true python-versions = ">=3.9" files = [ - {file = "dask-2024.4.1-py3-none-any.whl", hash = "sha256:cac5d28b9de7a7cfde46d6fbd8fa81f5654980d010b44d1dbe04dd13b5b63126"}, - {file = "dask-2024.4.1.tar.gz", hash = "sha256:6cd8eb03ddc8dc08d6ca5b167b8de559872bc51cc2b6587d0e9dc754ab19cdf0"}, + {file = "dask-2024.5.2-py3-none-any.whl", hash = "sha256:acc2cfe41d9e0151c216ac40396dbe34df13bc3d8c51dfece190349e4f2243af"}, + {file = "dask-2024.5.2.tar.gz", hash = "sha256:5c9722c44d0195e78b6e54197aa3302e6fcaaac2310fd3014560bcb86253dcb3"}, ] [package.dependencies] click = ">=8.1" cloudpickle = ">=1.5.0" -distributed = {version = "2024.4.1", optional = true, markers = "extra == \"distributed\""} +distributed = {version = "2024.5.2", optional = true, markers = "extra == \"distributed\""} fsspec = ">=2021.09.0" importlib-metadata = {version = ">=4.13.0", markers = "python_version < \"3.12\""} packaging = ">=20.0" @@ -481,9 +481,9 @@ toolz = ">=0.10.0" [package.extras] array = ["numpy (>=1.21)"] complete = ["dask[array,dataframe,diagnostics,distributed]", "lz4 (>=4.3.2)", "pyarrow (>=7.0)", "pyarrow-hotfix"] -dataframe = ["dask-expr (>=1.0,<1.1)", "dask[array]", "pandas (>=1.3)"] +dataframe = ["dask-expr (>=1.1,<1.2)", "dask[array]", "pandas (>=1.3)"] diagnostics = ["bokeh (>=2.4.2)", "jinja2 (>=2.10.3)"] -distributed = ["distributed (==2024.4.1)"] +distributed = ["distributed (==2024.5.2)"] test = ["pandas[test]", "pre-commit", "pytest", "pytest-cov", "pytest-rerunfailures", "pytest-timeout", "pytest-xdist"] [[package]] @@ -514,19 +514,19 @@ profile = ["gprof2dot (>=2022.7.29)"] [[package]] name = "distributed" -version = "2024.4.1" +version = "2024.5.2" description = "Distributed scheduler for Dask" optional = true python-versions = ">=3.9" files = [ - {file = "distributed-2024.4.1-py3-none-any.whl", hash = "sha256:7c8bdf893670e7425119f146d451f67475215a5d40f28b6d70fdab97f5656ccf"}, - {file = "distributed-2024.4.1.tar.gz", hash = "sha256:ae6868395b0c10caf929c63df309cfc8cc2911ecb5d834cff7e4436f760a70cd"}, + {file = "distributed-2024.5.2-py3-none-any.whl", hash = "sha256:c0fd59d5c34179d9c9b5dc5acb42a00a06d163107b79f66c2dc73e9479a92286"}, + {file = "distributed-2024.5.2.tar.gz", hash = "sha256:4cee41093e98340d04d9254012c7d521065f64b3f33546dd0b02b00becb41e21"}, ] [package.dependencies] click = ">=8.0" cloudpickle = ">=1.5.0" -dask = "2024.4.1" +dask = "2024.5.2" jinja2 = ">=2.10.3" locket = ">=1.0.0" msgpack = ">=1.0.0" @@ -553,13 +553,13 @@ files = [ [[package]] name = "eko" -version = "0.14.2" +version = "0.14.3" description = "Evolution Kernel Operators" optional = false -python-versions = ">=3.9,<3.13" +python-versions = "<3.13,>=3.9" files = [ - {file = "eko-0.14.2-py3-none-any.whl", hash = "sha256:19a9be496cc9b7f255941017f11f15331db84a465ee8079c3f0d85a7a1a08db3"}, - {file = "eko-0.14.2.tar.gz", hash = "sha256:3fdac76a09e4d19b27d906413c3f12e9c56e8a95f21b050923523df2a23bff13"}, + {file = "eko-0.14.3-py3-none-any.whl", hash = "sha256:6f8e46ae2b3aa04108f2b0f17e58bb789b3e53ba8fccf87fb810f8ded35b692c"}, + {file = "eko-0.14.3.tar.gz", hash = "sha256:1c5829baefe88c8e1424a1ec963c0cfde4dc1a6abfa439db2a1a4aca9794ba8d"}, ] [package.dependencies] @@ -575,13 +575,13 @@ mark = ["banana-hep (>=0.6.12,<0.7.0)", "matplotlib (>=3.5.1,<4.0.0)", "pandas ( [[package]] name = "exceptiongroup" -version = "1.2.0" +version = "1.2.1" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, - {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, + {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, + {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, ] [package.extras] @@ -629,53 +629,53 @@ files = [ [[package]] name = "fonttools" -version = "4.51.0" +version = "4.53.0" description = "Tools to manipulate font files" optional = false python-versions = ">=3.8" files = [ - {file = "fonttools-4.51.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:84d7751f4468dd8cdd03ddada18b8b0857a5beec80bce9f435742abc9a851a74"}, - {file = "fonttools-4.51.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8b4850fa2ef2cfbc1d1f689bc159ef0f45d8d83298c1425838095bf53ef46308"}, - {file = "fonttools-4.51.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5b48a1121117047d82695d276c2af2ee3a24ffe0f502ed581acc2673ecf1037"}, - {file = "fonttools-4.51.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:180194c7fe60c989bb627d7ed5011f2bef1c4d36ecf3ec64daec8302f1ae0716"}, - {file = "fonttools-4.51.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:96a48e137c36be55e68845fc4284533bda2980f8d6f835e26bca79d7e2006438"}, - {file = "fonttools-4.51.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:806e7912c32a657fa39d2d6eb1d3012d35f841387c8fc6cf349ed70b7c340039"}, - {file = "fonttools-4.51.0-cp310-cp310-win32.whl", hash = "sha256:32b17504696f605e9e960647c5f64b35704782a502cc26a37b800b4d69ff3c77"}, - {file = "fonttools-4.51.0-cp310-cp310-win_amd64.whl", hash = "sha256:c7e91abdfae1b5c9e3a543f48ce96013f9a08c6c9668f1e6be0beabf0a569c1b"}, - {file = "fonttools-4.51.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a8feca65bab31479d795b0d16c9a9852902e3a3c0630678efb0b2b7941ea9c74"}, - {file = "fonttools-4.51.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8ac27f436e8af7779f0bb4d5425aa3535270494d3bc5459ed27de3f03151e4c2"}, - {file = "fonttools-4.51.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e19bd9e9964a09cd2433a4b100ca7f34e34731e0758e13ba9a1ed6e5468cc0f"}, - {file = "fonttools-4.51.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2b92381f37b39ba2fc98c3a45a9d6383bfc9916a87d66ccb6553f7bdd129097"}, - {file = "fonttools-4.51.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:5f6bc991d1610f5c3bbe997b0233cbc234b8e82fa99fc0b2932dc1ca5e5afec0"}, - {file = "fonttools-4.51.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9696fe9f3f0c32e9a321d5268208a7cc9205a52f99b89479d1b035ed54c923f1"}, - {file = "fonttools-4.51.0-cp311-cp311-win32.whl", hash = "sha256:3bee3f3bd9fa1d5ee616ccfd13b27ca605c2b4270e45715bd2883e9504735034"}, - {file = "fonttools-4.51.0-cp311-cp311-win_amd64.whl", hash = "sha256:0f08c901d3866a8905363619e3741c33f0a83a680d92a9f0e575985c2634fcc1"}, - {file = "fonttools-4.51.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:4060acc2bfa2d8e98117828a238889f13b6f69d59f4f2d5857eece5277b829ba"}, - {file = "fonttools-4.51.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:1250e818b5f8a679ad79660855528120a8f0288f8f30ec88b83db51515411fcc"}, - {file = "fonttools-4.51.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76f1777d8b3386479ffb4a282e74318e730014d86ce60f016908d9801af9ca2a"}, - {file = "fonttools-4.51.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b5ad456813d93b9c4b7ee55302208db2b45324315129d85275c01f5cb7e61a2"}, - {file = "fonttools-4.51.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:68b3fb7775a923be73e739f92f7e8a72725fd333eab24834041365d2278c3671"}, - {file = "fonttools-4.51.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8e2f1a4499e3b5ee82c19b5ee57f0294673125c65b0a1ff3764ea1f9db2f9ef5"}, - {file = "fonttools-4.51.0-cp312-cp312-win32.whl", hash = "sha256:278e50f6b003c6aed19bae2242b364e575bcb16304b53f2b64f6551b9c000e15"}, - {file = "fonttools-4.51.0-cp312-cp312-win_amd64.whl", hash = "sha256:b3c61423f22165541b9403ee39874dcae84cd57a9078b82e1dce8cb06b07fa2e"}, - {file = "fonttools-4.51.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:1621ee57da887c17312acc4b0e7ac30d3a4fb0fec6174b2e3754a74c26bbed1e"}, - {file = "fonttools-4.51.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9d9298be7a05bb4801f558522adbe2feea1b0b103d5294ebf24a92dd49b78e5"}, - {file = "fonttools-4.51.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee1af4be1c5afe4c96ca23badd368d8dc75f611887fb0c0dac9f71ee5d6f110e"}, - {file = "fonttools-4.51.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c18b49adc721a7d0b8dfe7c3130c89b8704baf599fb396396d07d4aa69b824a1"}, - {file = "fonttools-4.51.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:de7c29bdbdd35811f14493ffd2534b88f0ce1b9065316433b22d63ca1cd21f14"}, - {file = "fonttools-4.51.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:cadf4e12a608ef1d13e039864f484c8a968840afa0258b0b843a0556497ea9ed"}, - {file = "fonttools-4.51.0-cp38-cp38-win32.whl", hash = "sha256:aefa011207ed36cd280babfaa8510b8176f1a77261833e895a9d96e57e44802f"}, - {file = "fonttools-4.51.0-cp38-cp38-win_amd64.whl", hash = "sha256:865a58b6e60b0938874af0968cd0553bcd88e0b2cb6e588727117bd099eef836"}, - {file = "fonttools-4.51.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:60a3409c9112aec02d5fb546f557bca6efa773dcb32ac147c6baf5f742e6258b"}, - {file = "fonttools-4.51.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7e89853d8bea103c8e3514b9f9dc86b5b4120afb4583b57eb10dfa5afbe0936"}, - {file = "fonttools-4.51.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56fc244f2585d6c00b9bcc59e6593e646cf095a96fe68d62cd4da53dd1287b55"}, - {file = "fonttools-4.51.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0d145976194a5242fdd22df18a1b451481a88071feadf251221af110ca8f00ce"}, - {file = "fonttools-4.51.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c5b8cab0c137ca229433570151b5c1fc6af212680b58b15abd797dcdd9dd5051"}, - {file = "fonttools-4.51.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:54dcf21a2f2d06ded676e3c3f9f74b2bafded3a8ff12f0983160b13e9f2fb4a7"}, - {file = "fonttools-4.51.0-cp39-cp39-win32.whl", hash = "sha256:0118ef998a0699a96c7b28457f15546815015a2710a1b23a7bf6c1be60c01636"}, - {file = "fonttools-4.51.0-cp39-cp39-win_amd64.whl", hash = "sha256:599bdb75e220241cedc6faebfafedd7670335d2e29620d207dd0378a4e9ccc5a"}, - {file = "fonttools-4.51.0-py3-none-any.whl", hash = "sha256:15c94eeef6b095831067f72c825eb0e2d48bb4cea0647c1b05c981ecba2bf39f"}, - {file = "fonttools-4.51.0.tar.gz", hash = "sha256:dc0673361331566d7a663d7ce0f6fdcbfbdc1f59c6e3ed1165ad7202ca183c68"}, + {file = "fonttools-4.53.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:52a6e0a7a0bf611c19bc8ec8f7592bdae79c8296c70eb05917fd831354699b20"}, + {file = "fonttools-4.53.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:099634631b9dd271d4a835d2b2a9e042ccc94ecdf7e2dd9f7f34f7daf333358d"}, + {file = "fonttools-4.53.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e40013572bfb843d6794a3ce076c29ef4efd15937ab833f520117f8eccc84fd6"}, + {file = "fonttools-4.53.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:715b41c3e231f7334cbe79dfc698213dcb7211520ec7a3bc2ba20c8515e8a3b5"}, + {file = "fonttools-4.53.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:74ae2441731a05b44d5988d3ac2cf784d3ee0a535dbed257cbfff4be8bb49eb9"}, + {file = "fonttools-4.53.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:95db0c6581a54b47c30860d013977b8a14febc206c8b5ff562f9fe32738a8aca"}, + {file = "fonttools-4.53.0-cp310-cp310-win32.whl", hash = "sha256:9cd7a6beec6495d1dffb1033d50a3f82dfece23e9eb3c20cd3c2444d27514068"}, + {file = "fonttools-4.53.0-cp310-cp310-win_amd64.whl", hash = "sha256:daaef7390e632283051e3cf3e16aff2b68b247e99aea916f64e578c0449c9c68"}, + {file = "fonttools-4.53.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a209d2e624ba492df4f3bfad5996d1f76f03069c6133c60cd04f9a9e715595ec"}, + {file = "fonttools-4.53.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4f520d9ac5b938e6494f58a25c77564beca7d0199ecf726e1bd3d56872c59749"}, + {file = "fonttools-4.53.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eceef49f457253000e6a2d0f7bd08ff4e9fe96ec4ffce2dbcb32e34d9c1b8161"}, + {file = "fonttools-4.53.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa1f3e34373aa16045484b4d9d352d4c6b5f9f77ac77a178252ccbc851e8b2ee"}, + {file = "fonttools-4.53.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:28d072169fe8275fb1a0d35e3233f6df36a7e8474e56cb790a7258ad822b6fd6"}, + {file = "fonttools-4.53.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4a2a6ba400d386e904fd05db81f73bee0008af37799a7586deaa4aef8cd5971e"}, + {file = "fonttools-4.53.0-cp311-cp311-win32.whl", hash = "sha256:bb7273789f69b565d88e97e9e1da602b4ee7ba733caf35a6c2affd4334d4f005"}, + {file = "fonttools-4.53.0-cp311-cp311-win_amd64.whl", hash = "sha256:9fe9096a60113e1d755e9e6bda15ef7e03391ee0554d22829aa506cdf946f796"}, + {file = "fonttools-4.53.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:d8f191a17369bd53a5557a5ee4bab91d5330ca3aefcdf17fab9a497b0e7cff7a"}, + {file = "fonttools-4.53.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:93156dd7f90ae0a1b0e8871032a07ef3178f553f0c70c386025a808f3a63b1f4"}, + {file = "fonttools-4.53.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bff98816cb144fb7b85e4b5ba3888a33b56ecef075b0e95b95bcd0a5fbf20f06"}, + {file = "fonttools-4.53.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:973d030180eca8255b1bce6ffc09ef38a05dcec0e8320cc9b7bcaa65346f341d"}, + {file = "fonttools-4.53.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c4ee5a24e281fbd8261c6ab29faa7fd9a87a12e8c0eed485b705236c65999109"}, + {file = "fonttools-4.53.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bd5bc124fae781a4422f61b98d1d7faa47985f663a64770b78f13d2c072410c2"}, + {file = "fonttools-4.53.0-cp312-cp312-win32.whl", hash = "sha256:a239afa1126b6a619130909c8404070e2b473dd2b7fc4aacacd2e763f8597fea"}, + {file = "fonttools-4.53.0-cp312-cp312-win_amd64.whl", hash = "sha256:45b4afb069039f0366a43a5d454bc54eea942bfb66b3fc3e9a2c07ef4d617380"}, + {file = "fonttools-4.53.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:93bc9e5aaa06ff928d751dc6be889ff3e7d2aa393ab873bc7f6396a99f6fbb12"}, + {file = "fonttools-4.53.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2367d47816cc9783a28645bc1dac07f8ffc93e0f015e8c9fc674a5b76a6da6e4"}, + {file = "fonttools-4.53.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:907fa0b662dd8fc1d7c661b90782ce81afb510fc4b7aa6ae7304d6c094b27bce"}, + {file = "fonttools-4.53.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e0ad3c6ea4bd6a289d958a1eb922767233f00982cf0fe42b177657c86c80a8f"}, + {file = "fonttools-4.53.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:73121a9b7ff93ada888aaee3985a88495489cc027894458cb1a736660bdfb206"}, + {file = "fonttools-4.53.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:ee595d7ba9bba130b2bec555a40aafa60c26ce68ed0cf509983e0f12d88674fd"}, + {file = "fonttools-4.53.0-cp38-cp38-win32.whl", hash = "sha256:fca66d9ff2ac89b03f5aa17e0b21a97c21f3491c46b583bb131eb32c7bab33af"}, + {file = "fonttools-4.53.0-cp38-cp38-win_amd64.whl", hash = "sha256:31f0e3147375002aae30696dd1dc596636abbd22fca09d2e730ecde0baad1d6b"}, + {file = "fonttools-4.53.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7d6166192dcd925c78a91d599b48960e0a46fe565391c79fe6de481ac44d20ac"}, + {file = "fonttools-4.53.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ef50ec31649fbc3acf6afd261ed89d09eb909b97cc289d80476166df8438524d"}, + {file = "fonttools-4.53.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f193f060391a455920d61684a70017ef5284ccbe6023bb056e15e5ac3de11d1"}, + {file = "fonttools-4.53.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba9f09ff17f947392a855e3455a846f9855f6cf6bec33e9a427d3c1d254c712f"}, + {file = "fonttools-4.53.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:0c555e039d268445172b909b1b6bdcba42ada1cf4a60e367d68702e3f87e5f64"}, + {file = "fonttools-4.53.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a4788036201c908079e89ae3f5399b33bf45b9ea4514913f4dbbe4fac08efe0"}, + {file = "fonttools-4.53.0-cp39-cp39-win32.whl", hash = "sha256:d1a24f51a3305362b94681120c508758a88f207fa0a681c16b5a4172e9e6c7a9"}, + {file = "fonttools-4.53.0-cp39-cp39-win_amd64.whl", hash = "sha256:1e677bfb2b4bd0e5e99e0f7283e65e47a9814b0486cb64a41adf9ef110e078f2"}, + {file = "fonttools-4.53.0-py3-none-any.whl", hash = "sha256:6b4f04b1fbc01a3569d63359f2227c89ab294550de277fd09d8fca6185669fa4"}, + {file = "fonttools-4.53.0.tar.gz", hash = "sha256:c93ed66d32de1559b6fc348838c7572d5c0ac1e4a258e76763a5caddd8944002"}, ] [package.extras] @@ -692,60 +692,15 @@ ufo = ["fs (>=2.2.0,<3)"] unicode = ["unicodedata2 (>=15.1.0)"] woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"] -[[package]] -name = "frozendict" -version = "2.4.2" -description = "A simple immutable dictionary" -optional = true -python-versions = ">=3.6" -files = [ - {file = "frozendict-2.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:19743495b1e92a7e4db56fcd6a5d36ea1d1b0f550822d6fd780e44d58f0b8c18"}, - {file = "frozendict-2.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:81efb4ea854a1c93d954a67389eaf78c508acb2d4768321a835cda2754ec5c01"}, - {file = "frozendict-2.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5f1a4d9662b854dce52b560b60f51349905dc871826b8c6be20141a13067a53"}, - {file = "frozendict-2.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1412aeb325e4a28cfe32106c66c046372bb7fd5a9af1748193549c5d01a9e9c1"}, - {file = "frozendict-2.4.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f7ce0535f02eba9746e4e2cf0abef0f0f2051d20fdccf4af31bc3d1adecf5a71"}, - {file = "frozendict-2.4.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:07153e6d2720fa1131bb180ce388c7042affb29561d8bcd1c0d6e683a8beaea2"}, - {file = "frozendict-2.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:f7a90ea6d5248617a1222daef07d22fb146ff07635a36db327e1ce114bf3e304"}, - {file = "frozendict-2.4.2-cp310-cp310-win_arm64.whl", hash = "sha256:20a6f741c92fdeb3766924cde42b8ee445cf568e3be8aa983cb83e9fe5b61e63"}, - {file = "frozendict-2.4.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:146129502cd9d96de64e0c8f7dc4c66422da3d4bfccf891dd80a3821b358a926"}, - {file = "frozendict-2.4.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9ac1f74ccf818977abbc1868090c06436b8f06534d306f808f15cffc304ae046"}, - {file = "frozendict-2.4.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a8d2ea4f10505ad15f53ce3742420682d916d0c4d566edb8e1019756e7cea30"}, - {file = "frozendict-2.4.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4a5841681e70d2862ca153543f2912e0bab034bf29e2d3610e86ea42506121c2"}, - {file = "frozendict-2.4.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d4a10119f17552cbeab48d4ae830ba091c6d47616589618adc31f251184579a7"}, - {file = "frozendict-2.4.2-cp36-cp36m-win_amd64.whl", hash = "sha256:7d13ffe649e9db6f4bb5e107d9be7dfd23e13101bc69f97aa5fa6cbf6aecaadd"}, - {file = "frozendict-2.4.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:19e64630e164a297f83e9a1c69f1cd36fa4b3d1196c1f9fc006a0385aa198ea4"}, - {file = "frozendict-2.4.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bedb0a6587bae53bd53727b92a87c4cf90ad7a7e0bd2db562d439beb6982712e"}, - {file = "frozendict-2.4.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:83cc9d063131fd8adbeb18a473d222b5dc8301cac9505cfe578158f9a9bf55a9"}, - {file = "frozendict-2.4.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:92c46b155ea9eb9ecabc66ba2d9030f2634319f55c6448688965ece094f14b51"}, - {file = "frozendict-2.4.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:f958d40637e0440bce2453019821c94fe86cfc5f3847ae11cd4f02c3548b1d1b"}, - {file = "frozendict-2.4.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ac954be447a907face9b652207fbd943b9b552212890db959ba653e8f1dc3f56"}, - {file = "frozendict-2.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f7e0ff5e84742604a1b42c2de4f1e67630c0868cf52a5c585b54a99e06f6b453"}, - {file = "frozendict-2.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:84c36bfa819cd8442f6e0bdb86413c7678b2822a46b1a22cfa0f0dd30d9e5c45"}, - {file = "frozendict-2.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cead3bfe70c90c634a9b76807c9d7e75e6c5666ec96fa2cea8e7412ccf22a1f8"}, - {file = "frozendict-2.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3fc6e3158107b5431255978b954758b1041cc70a3b8e7657373110512eb528e3"}, - {file = "frozendict-2.4.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4db1d6cc412bd865cab36723995208b82166a97bc6c724753bcd2b90cf24f164"}, - {file = "frozendict-2.4.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ff6fb5831539fffb09d71cc0cc0462b1f27c0160cb6c6fa2d1f4c1bc7fffe52a"}, - {file = "frozendict-2.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:79e1c94ad2a925ad5723d82a4134c6d851d5a7bc72b7e9da8b2087c42758a512"}, - {file = "frozendict-2.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:34704f9ffb21448d4b5c0f9239f8f058c0efab4bfdbe2956c5be978fef0b929c"}, - {file = "frozendict-2.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5280d685cd1659883a3010dec843afe3065416ae92e453498997d4474a898a39"}, - {file = "frozendict-2.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ca09a376114172e4d9918e6d576f58244c45e21f5af1245085699fd3a171c47"}, - {file = "frozendict-2.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:55953aa2acf5bf183c664f3d0f540f8c8ac8f5fa97170f2098d413414318eb2b"}, - {file = "frozendict-2.4.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:476e4857e1d87b05c9102dd5409216ce4716cb7df619e6657429bc99279303cc"}, - {file = "frozendict-2.4.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4a8b298f39242d25770d029588ce9d4f524e9f4edc60d2d34b6178fb07c8a93e"}, - {file = "frozendict-2.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:c157b8a92743a7905b341edb0663044fecdc7780f96c59a2843d3da68d694b90"}, - {file = "frozendict-2.4.2-cp39-cp39-win_arm64.whl", hash = "sha256:cbab325c0a98b2f3ee291b36710623781b4977a3057f9103a7b0f11bcc23b177"}, - {file = "frozendict-2.4.2.tar.gz", hash = "sha256:741779e1d1a2e6bb2c623f78423bd5d14aad35dc0c57e6ccc89e54eaab5f1b8a"}, -] - [[package]] name = "fsspec" -version = "2024.3.1" +version = "2024.5.0" description = "File-system specification" optional = true python-versions = ">=3.8" files = [ - {file = "fsspec-2024.3.1-py3-none-any.whl", hash = "sha256:918d18d41bf73f0e2b261824baeb1b124bcf771767e3a26425cd7dec3332f512"}, - {file = "fsspec-2024.3.1.tar.gz", hash = "sha256:f39780e282d7d117ffb42bb96992f8a90795e4d0fb0f661a70ca39fe9c43ded9"}, + {file = "fsspec-2024.5.0-py3-none-any.whl", hash = "sha256:e0fdbc446d67e182f49a70b82cf7889028a63588fde6b222521f10937b2b670c"}, + {file = "fsspec-2024.5.0.tar.gz", hash = "sha256:1d021b0b0f933e3b3029ed808eb400c08ba101ca2de4b3483fbc9ca23fcee94a"}, ] [package.extras] @@ -753,7 +708,7 @@ abfs = ["adlfs"] adl = ["adlfs"] arrow = ["pyarrow (>=1)"] dask = ["dask", "distributed"] -devel = ["pytest", "pytest-cov"] +dev = ["pre-commit", "ruff"] dropbox = ["dropbox", "dropboxdrivefs", "requests"] full = ["adlfs", "aiohttp (!=4.0.0a0,!=4.0.0a1)", "dask", "distributed", "dropbox", "dropboxdrivefs", "fusepy", "gcsfs", "libarchive-c", "ocifs", "panel", "paramiko", "pyarrow (>=1)", "pygit2", "requests", "s3fs", "smbprotocol", "tqdm"] fuse = ["fusepy"] @@ -770,6 +725,9 @@ s3 = ["s3fs"] sftp = ["paramiko"] smb = ["smbprotocol"] ssh = ["paramiko"] +test = ["aiohttp (!=4.0.0a0,!=4.0.0a1)", "numpy", "pytest", "pytest-asyncio (!=0.22.0)", "pytest-benchmark", "pytest-cov", "pytest-mock", "pytest-recording", "pytest-rerunfailures", "requests"] +test-downstream = ["aiobotocore (>=2.5.4,<3.0.0)", "dask-expr", "dask[dataframe,test]", "moto[server] (>4,<5)", "pytest-timeout", "xarray"] +test-full = ["adlfs", "aiohttp (!=4.0.0a0,!=4.0.0a1)", "cloudpickle", "dask", "distributed", "dropbox", "dropboxdrivefs", "fastparquet", "fusepy", "gcsfs", "jinja2", "kerchunk", "libarchive-c", "lz4", "notebook", "numpy", "ocifs", "pandas", "panel", "paramiko", "pyarrow", "pyarrow (>=1)", "pyftpdlib", "pygit2", "pytest", "pytest-asyncio (!=0.22.0)", "pytest-benchmark", "pytest-cov", "pytest-mock", "pytest-recording", "pytest-rerunfailures", "python-snappy", "requests", "smbprotocol", "tqdm", "urllib3", "zarr", "zstandard"] tqdm = ["tqdm"] [[package]] @@ -882,69 +840,61 @@ test = ["objgraph", "psutil"] [[package]] name = "grpcio" -version = "1.62.1" +version = "1.64.0" description = "HTTP/2-based RPC framework" optional = true -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "grpcio-1.62.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:179bee6f5ed7b5f618844f760b6acf7e910988de77a4f75b95bbfaa8106f3c1e"}, - {file = "grpcio-1.62.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:48611e4fa010e823ba2de8fd3f77c1322dd60cb0d180dc6630a7e157b205f7ea"}, - {file = "grpcio-1.62.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:b2a0e71b0a2158aa4bce48be9f8f9eb45cbd17c78c7443616d00abbe2a509f6d"}, - {file = "grpcio-1.62.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fbe80577c7880911d3ad65e5ecc997416c98f354efeba2f8d0f9112a67ed65a5"}, - {file = "grpcio-1.62.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58f6c693d446964e3292425e1d16e21a97a48ba9172f2d0df9d7b640acb99243"}, - {file = "grpcio-1.62.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:77c339403db5a20ef4fed02e4d1a9a3d9866bf9c0afc77a42234677313ea22f3"}, - {file = "grpcio-1.62.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b5a4ea906db7dec694098435d84bf2854fe158eb3cd51e1107e571246d4d1d70"}, - {file = "grpcio-1.62.1-cp310-cp310-win32.whl", hash = "sha256:4187201a53f8561c015bc745b81a1b2d278967b8de35f3399b84b0695e281d5f"}, - {file = "grpcio-1.62.1-cp310-cp310-win_amd64.whl", hash = "sha256:844d1f3fb11bd1ed362d3fdc495d0770cfab75761836193af166fee113421d66"}, - {file = "grpcio-1.62.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:833379943d1728a005e44103f17ecd73d058d37d95783eb8f0b28ddc1f54d7b2"}, - {file = "grpcio-1.62.1-cp311-cp311-macosx_10_10_universal2.whl", hash = "sha256:c7fcc6a32e7b7b58f5a7d27530669337a5d587d4066060bcb9dee7a8c833dfb7"}, - {file = "grpcio-1.62.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:fa7d28eb4d50b7cbe75bb8b45ed0da9a1dc5b219a0af59449676a29c2eed9698"}, - {file = "grpcio-1.62.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:48f7135c3de2f298b833be8b4ae20cafe37091634e91f61f5a7eb3d61ec6f660"}, - {file = "grpcio-1.62.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:71f11fd63365ade276c9d4a7b7df5c136f9030e3457107e1791b3737a9b9ed6a"}, - {file = "grpcio-1.62.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4b49fd8fe9f9ac23b78437da94c54aa7e9996fbb220bac024a67469ce5d0825f"}, - {file = "grpcio-1.62.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:482ae2ae78679ba9ed5752099b32e5fe580443b4f798e1b71df412abf43375db"}, - {file = "grpcio-1.62.1-cp311-cp311-win32.whl", hash = "sha256:1faa02530b6c7426404372515fe5ddf66e199c2ee613f88f025c6f3bd816450c"}, - {file = "grpcio-1.62.1-cp311-cp311-win_amd64.whl", hash = "sha256:5bd90b8c395f39bc82a5fb32a0173e220e3f401ff697840f4003e15b96d1befc"}, - {file = "grpcio-1.62.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:b134d5d71b4e0837fff574c00e49176051a1c532d26c052a1e43231f252d813b"}, - {file = "grpcio-1.62.1-cp312-cp312-macosx_10_10_universal2.whl", hash = "sha256:d1f6c96573dc09d50dbcbd91dbf71d5cf97640c9427c32584010fbbd4c0e0037"}, - {file = "grpcio-1.62.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:359f821d4578f80f41909b9ee9b76fb249a21035a061a327f91c953493782c31"}, - {file = "grpcio-1.62.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a485f0c2010c696be269184bdb5ae72781344cb4e60db976c59d84dd6354fac9"}, - {file = "grpcio-1.62.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b50b09b4dc01767163d67e1532f948264167cd27f49e9377e3556c3cba1268e1"}, - {file = "grpcio-1.62.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:3227c667dccbe38f2c4d943238b887bac588d97c104815aecc62d2fd976e014b"}, - {file = "grpcio-1.62.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:3952b581eb121324853ce2b191dae08badb75cd493cb4e0243368aa9e61cfd41"}, - {file = "grpcio-1.62.1-cp312-cp312-win32.whl", hash = "sha256:83a17b303425104d6329c10eb34bba186ffa67161e63fa6cdae7776ff76df73f"}, - {file = "grpcio-1.62.1-cp312-cp312-win_amd64.whl", hash = "sha256:6696ffe440333a19d8d128e88d440f91fb92c75a80ce4b44d55800e656a3ef1d"}, - {file = "grpcio-1.62.1-cp37-cp37m-linux_armv7l.whl", hash = "sha256:e3393b0823f938253370ebef033c9fd23d27f3eae8eb9a8f6264900c7ea3fb5a"}, - {file = "grpcio-1.62.1-cp37-cp37m-macosx_10_10_universal2.whl", hash = "sha256:83e7ccb85a74beaeae2634f10eb858a0ed1a63081172649ff4261f929bacfd22"}, - {file = "grpcio-1.62.1-cp37-cp37m-manylinux_2_17_aarch64.whl", hash = "sha256:882020c87999d54667a284c7ddf065b359bd00251fcd70279ac486776dbf84ec"}, - {file = "grpcio-1.62.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a10383035e864f386fe096fed5c47d27a2bf7173c56a6e26cffaaa5a361addb1"}, - {file = "grpcio-1.62.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:960edebedc6b9ada1ef58e1c71156f28689978188cd8cff3b646b57288a927d9"}, - {file = "grpcio-1.62.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:23e2e04b83f347d0aadde0c9b616f4726c3d76db04b438fd3904b289a725267f"}, - {file = "grpcio-1.62.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:978121758711916d34fe57c1f75b79cdfc73952f1481bb9583399331682d36f7"}, - {file = "grpcio-1.62.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9084086190cc6d628f282e5615f987288b95457292e969b9205e45b442276407"}, - {file = "grpcio-1.62.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:22bccdd7b23c420a27fd28540fb5dcbc97dc6be105f7698cb0e7d7a420d0e362"}, - {file = "grpcio-1.62.1-cp38-cp38-macosx_10_10_universal2.whl", hash = "sha256:8999bf1b57172dbc7c3e4bb3c732658e918f5c333b2942243f10d0d653953ba9"}, - {file = "grpcio-1.62.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:d9e52558b8b8c2f4ac05ac86344a7417ccdd2b460a59616de49eb6933b07a0bd"}, - {file = "grpcio-1.62.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1714e7bc935780bc3de1b3fcbc7674209adf5208ff825799d579ffd6cd0bd505"}, - {file = "grpcio-1.62.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8842ccbd8c0e253c1f189088228f9b433f7a93b7196b9e5b6f87dba393f5d5d"}, - {file = "grpcio-1.62.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1f1e7b36bdff50103af95a80923bf1853f6823dd62f2d2a2524b66ed74103e49"}, - {file = "grpcio-1.62.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bba97b8e8883a8038606480d6b6772289f4c907f6ba780fa1f7b7da7dfd76f06"}, - {file = "grpcio-1.62.1-cp38-cp38-win32.whl", hash = "sha256:a7f615270fe534548112a74e790cd9d4f5509d744dd718cd442bf016626c22e4"}, - {file = "grpcio-1.62.1-cp38-cp38-win_amd64.whl", hash = "sha256:e6c8c8693df718c5ecbc7babb12c69a4e3677fd11de8886f05ab22d4e6b1c43b"}, - {file = "grpcio-1.62.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:73db2dc1b201d20ab7083e7041946910bb991e7e9761a0394bbc3c2632326483"}, - {file = "grpcio-1.62.1-cp39-cp39-macosx_10_10_universal2.whl", hash = "sha256:407b26b7f7bbd4f4751dbc9767a1f0716f9fe72d3d7e96bb3ccfc4aace07c8de"}, - {file = "grpcio-1.62.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:f8de7c8cef9261a2d0a62edf2ccea3d741a523c6b8a6477a340a1f2e417658de"}, - {file = "grpcio-1.62.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd5c8a1af40ec305d001c60236308a67e25419003e9bb3ebfab5695a8d0b369"}, - {file = "grpcio-1.62.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be0477cb31da67846a33b1a75c611f88bfbcd427fe17701b6317aefceee1b96f"}, - {file = "grpcio-1.62.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:60dcd824df166ba266ee0cfaf35a31406cd16ef602b49f5d4dfb21f014b0dedd"}, - {file = "grpcio-1.62.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:973c49086cabab773525f6077f95e5a993bfc03ba8fc32e32f2c279497780585"}, - {file = "grpcio-1.62.1-cp39-cp39-win32.whl", hash = "sha256:12859468e8918d3bd243d213cd6fd6ab07208195dc140763c00dfe901ce1e1b4"}, - {file = "grpcio-1.62.1-cp39-cp39-win_amd64.whl", hash = "sha256:b7209117bbeebdfa5d898205cc55153a51285757902dd73c47de498ad4d11332"}, - {file = "grpcio-1.62.1.tar.gz", hash = "sha256:6c455e008fa86d9e9a9d85bb76da4277c0d7d9668a3bfa70dbe86e9f3c759947"}, -] - -[package.extras] -protobuf = ["grpcio-tools (>=1.62.1)"] + {file = "grpcio-1.64.0-cp310-cp310-linux_armv7l.whl", hash = "sha256:3b09c3d9de95461214a11d82cc0e6a46a6f4e1f91834b50782f932895215e5db"}, + {file = "grpcio-1.64.0-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:7e013428ab472892830287dd082b7d129f4d8afef49227a28223a77337555eaa"}, + {file = "grpcio-1.64.0-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:02cc9cc3f816d30f7993d0d408043b4a7d6a02346d251694d8ab1f78cc723e7e"}, + {file = "grpcio-1.64.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f5de082d936e0208ce8db9095821361dfa97af8767a6607ae71425ac8ace15c"}, + {file = "grpcio-1.64.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7b7bf346391dffa182fba42506adf3a84f4a718a05e445b37824136047686a1"}, + {file = "grpcio-1.64.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:b2cbdfba18408389a1371f8c2af1659119e1831e5ed24c240cae9e27b4abc38d"}, + {file = "grpcio-1.64.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:aca4f15427d2df592e0c8f3d38847e25135e4092d7f70f02452c0e90d6a02d6d"}, + {file = "grpcio-1.64.0-cp310-cp310-win32.whl", hash = "sha256:7c1f5b2298244472bcda49b599be04579f26425af0fd80d3f2eb5fd8bc84d106"}, + {file = "grpcio-1.64.0-cp310-cp310-win_amd64.whl", hash = "sha256:73f84f9e5985a532e47880b3924867de16fa1aa513fff9b26106220c253c70c5"}, + {file = "grpcio-1.64.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:2a18090371d138a57714ee9bffd6c9c9cb2e02ce42c681aac093ae1e7189ed21"}, + {file = "grpcio-1.64.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:59c68df3a934a586c3473d15956d23a618b8f05b5e7a3a904d40300e9c69cbf0"}, + {file = "grpcio-1.64.0-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:b52e1ec7185512103dd47d41cf34ea78e7a7361ba460187ddd2416b480e0938c"}, + {file = "grpcio-1.64.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8d598b5d5e2c9115d7fb7e2cb5508d14286af506a75950762aa1372d60e41851"}, + {file = "grpcio-1.64.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01615bbcae6875eee8091e6b9414072f4e4b00d8b7e141f89635bdae7cf784e5"}, + {file = "grpcio-1.64.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:0b2dfe6dcace264807d9123d483d4c43274e3f8c39f90ff51de538245d7a4145"}, + {file = "grpcio-1.64.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7f17572dc9acd5e6dfd3014d10c0b533e9f79cd9517fc10b0225746f4c24b58e"}, + {file = "grpcio-1.64.0-cp311-cp311-win32.whl", hash = "sha256:6ec5ed15b4ffe56e2c6bc76af45e6b591c9be0224b3fb090adfb205c9012367d"}, + {file = "grpcio-1.64.0-cp311-cp311-win_amd64.whl", hash = "sha256:597191370951b477b7a1441e1aaa5cacebeb46a3b0bd240ec3bb2f28298c7553"}, + {file = "grpcio-1.64.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:1ce4cd5a61d4532651079e7aae0fedf9a80e613eed895d5b9743e66b52d15812"}, + {file = "grpcio-1.64.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:650a8150a9b288f40d5b7c1d5400cc11724eae50bd1f501a66e1ea949173649b"}, + {file = "grpcio-1.64.0-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:8de0399b983f8676a7ccfdd45e5b2caec74a7e3cc576c6b1eecf3b3680deda5e"}, + {file = "grpcio-1.64.0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:46b8b43ba6a2a8f3103f103f97996cad507bcfd72359af6516363c48793d5a7b"}, + {file = "grpcio-1.64.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a54362f03d4dcfae63be455d0a7d4c1403673498b92c6bfe22157d935b57c7a9"}, + {file = "grpcio-1.64.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:1f8ea18b928e539046bb5f9c124d717fbf00cc4b2d960ae0b8468562846f5aa1"}, + {file = "grpcio-1.64.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:c56c91bd2923ddb6e7ed28ebb66d15633b03e0df22206f22dfcdde08047e0a48"}, + {file = "grpcio-1.64.0-cp312-cp312-win32.whl", hash = "sha256:874c741c8a66f0834f653a69e7e64b4e67fcd4a8d40296919b93bab2ccc780ba"}, + {file = "grpcio-1.64.0-cp312-cp312-win_amd64.whl", hash = "sha256:0da1d921f8e4bcee307aeef6c7095eb26e617c471f8cb1c454fd389c5c296d1e"}, + {file = "grpcio-1.64.0-cp38-cp38-linux_armv7l.whl", hash = "sha256:c46fb6bfca17bfc49f011eb53416e61472fa96caa0979b4329176bdd38cbbf2a"}, + {file = "grpcio-1.64.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3d2004e85cf5213995d09408501f82c8534700d2babeb81dfdba2a3bff0bb396"}, + {file = "grpcio-1.64.0-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:6d5541eb460d73a07418524fb64dcfe0adfbcd32e2dac0f8f90ce5b9dd6c046c"}, + {file = "grpcio-1.64.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f279ad72dd7d64412e10f2443f9f34872a938c67387863c4cd2fb837f53e7d2"}, + {file = "grpcio-1.64.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85fda90b81da25993aa47fae66cae747b921f8f6777550895fb62375b776a231"}, + {file = "grpcio-1.64.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a053584079b793a54bece4a7d1d1b5c0645bdbee729215cd433703dc2532f72b"}, + {file = "grpcio-1.64.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:579dd9fb11bc73f0de061cab5f8b2def21480fd99eb3743ed041ad6a1913ee2f"}, + {file = "grpcio-1.64.0-cp38-cp38-win32.whl", hash = "sha256:23b6887bb21d77649d022fa1859e05853fdc2e60682fd86c3db652a555a282e0"}, + {file = "grpcio-1.64.0-cp38-cp38-win_amd64.whl", hash = "sha256:753cb58683ba0c545306f4e17dabf468d29cb6f6b11832e1e432160bb3f8403c"}, + {file = "grpcio-1.64.0-cp39-cp39-linux_armv7l.whl", hash = "sha256:2186d76a7e383e1466e0ea2b0febc343ffeae13928c63c6ec6826533c2d69590"}, + {file = "grpcio-1.64.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0f30596cdcbed3c98024fb4f1d91745146385b3f9fd10c9f2270cbfe2ed7ed91"}, + {file = "grpcio-1.64.0-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:d9171f025a196f5bcfec7e8e7ffb7c3535f7d60aecd3503f9e250296c7cfc150"}, + {file = "grpcio-1.64.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf4c8daed18ae2be2f1fc7d613a76ee2a2e28fdf2412d5c128be23144d28283d"}, + {file = "grpcio-1.64.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3550493ac1d23198d46dc9c9b24b411cef613798dc31160c7138568ec26bc9b4"}, + {file = "grpcio-1.64.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:3161a8f8bb38077a6470508c1a7301cd54301c53b8a34bb83e3c9764874ecabd"}, + {file = "grpcio-1.64.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2e8fabe2cc57a369638ab1ad8e6043721014fdf9a13baa7c0e35995d3a4a7618"}, + {file = "grpcio-1.64.0-cp39-cp39-win32.whl", hash = "sha256:31890b24d47b62cc27da49a462efe3d02f3c120edb0e6c46dcc0025506acf004"}, + {file = "grpcio-1.64.0-cp39-cp39-win_amd64.whl", hash = "sha256:5a56797dea8c02e7d3a85dfea879f286175cf4d14fbd9ab3ef2477277b927baa"}, + {file = "grpcio-1.64.0.tar.gz", hash = "sha256:257baf07f53a571c215eebe9679c3058a313fd1d1f7c4eede5a8660108c52d9c"}, +] + +[package.extras] +protobuf = ["grpcio-tools (>=1.64.0)"] [[package]] name = "h5py" @@ -1148,13 +1098,13 @@ testing = ["Django", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] [[package]] name = "jinja2" -version = "3.1.3" +version = "3.1.4" description = "A very fast and expressive template engine." optional = false python-versions = ">=3.7" files = [ - {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, - {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, + {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"}, + {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"}, ] [package.dependencies] @@ -1165,13 +1115,13 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "keras" -version = "3.2.1" +version = "3.3.3" description = "Multi-backend Keras." optional = true python-versions = ">=3.9" files = [ - {file = "keras-3.2.1-py3-none-any.whl", hash = "sha256:0be1e89b041e697be562d8422ecb958ee5481acfc089913200926c561d258a03"}, - {file = "keras-3.2.1.tar.gz", hash = "sha256:966abbf0dfc1f9725f6293fb2a04ec83f56cd2a800990b38d1a03041255214a7"}, + {file = "keras-3.3.3-py3-none-any.whl", hash = "sha256:260df9ef71c6b89eb6816ce1c60f139c38ccdddd16f24e7005d2be127cdef8e4"}, + {file = "keras-3.3.3.tar.gz", hash = "sha256:f2fdffc8434fd77045cf8fb21816dbaa2308d5f76974ca924b2f60b40433b1a0"}, ] [package.dependencies] @@ -1643,10 +1593,10 @@ files = [ [package.dependencies] numpy = [ - {version = ">=1.21.2", markers = "python_version >= \"3.10\" and python_version < \"3.11\""}, {version = ">1.20", markers = "python_version < \"3.10\""}, + {version = ">=1.21.2", markers = "python_version >= \"3.10\""}, + {version = ">=1.23.3", markers = "python_version >= \"3.11\""}, {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, - {version = ">=1.23.3", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, ] [package.extras] @@ -1757,7 +1707,6 @@ develop = false [package.dependencies] eko = "^0.14.1" -frozendict = "*" hyperopt = "*" matplotlib = ">=3.3.0,<3.8" numpy = "*" @@ -1781,7 +1730,7 @@ tests = ["hypothesis", "pytest", "pytest-mpl"] type = "git" url = "https://github.com/NNPDF/nnpdf" reference = "HEAD" -resolved_reference = "3ff2773aab60d48c9aa57f926a7d718dabc62a8e" +resolved_reference = "37f48752cc362291c06df2f3990f815276bf12ee" [[package]] name = "numba" @@ -1992,8 +1941,8 @@ files = [ [package.dependencies] numpy = [ {version = ">=1.22.4", markers = "python_version < \"3.11\""}, - {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, {version = ">=1.23.2", markers = "python_version == \"3.11\""}, + {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -2041,13 +1990,13 @@ testing = ["docopt", "pytest"] [[package]] name = "partd" -version = "1.4.1" +version = "1.4.2" description = "Appendable key-value storage" optional = true -python-versions = ">=3.7" +python-versions = ">=3.9" files = [ - {file = "partd-1.4.1-py3-none-any.whl", hash = "sha256:27e766663d36c161e2827aa3e28541c992f0b9527d3cca047e13fb3acdb989e6"}, - {file = "partd-1.4.1.tar.gz", hash = "sha256:56c25dd49e6fea5727e731203c466c6e092f308d8f0024e199d02f6aa2167f67"}, + {file = "partd-1.4.2-py3-none-any.whl", hash = "sha256:978e4ac767ec4ba5b86c6eaa52e5a2a3bc748a2ca839e8cc798f1cc6ce6efb0f"}, + {file = "partd-1.4.2.tar.gz", hash = "sha256:d022c33afbdc8405c226621b015e8067888173d85f7f5ecebb3cafed9a20f02c"}, ] [package.dependencies] @@ -2055,7 +2004,7 @@ locket = "*" toolz = "*" [package.extras] -complete = ["blosc", "numpy (>=1.9.0)", "pandas (>=0.19.0)", "pyzmq"] +complete = ["blosc", "numpy (>=1.20.0)", "pandas (>=1.3)", "pyzmq"] [[package]] name = "pdbpp" @@ -2278,82 +2227,52 @@ xmp = ["defusedxml"] [[package]] name = "pineappl" -version = "0.7.3" +version = "0.7.4" description = "Python bindings to PineAPPL" optional = false -python-versions = ">=3.7" -files = [ - {file = "pineappl-0.7.3-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:837c3cde97d6fa76ecbeec84fe57fd727f148d9bd37a8d291949c64f9d0419d9"}, - {file = "pineappl-0.7.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cf8bbd08474ad845ae9c1cbebb72f497356774e4e0ef7531cf0fdf04249d2b25"}, - {file = "pineappl-0.7.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d681fa0b573ab89784a17bf59a1c26a4db81cfdbbf0395ba6f5988b782941ff"}, - {file = "pineappl-0.7.3-cp310-none-win_amd64.whl", hash = "sha256:5c36c3911bffde4c8545259809012c2a6495be0ed7fcdaa8f4b8fa2063b6390c"}, - {file = "pineappl-0.7.3-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:5774301df584c9f6ee4f717f2fe7c00069a06d8c90c1efec406344c84d7a9339"}, - {file = "pineappl-0.7.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ecf3d01b6bbc9bda60ccbcade817e601d5a1bcb2105ffbed719f0717094c6c0"}, - {file = "pineappl-0.7.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:387fbd0ff2f9aca3dad4bf4e0f88c13abda7cd6ecd0cf74c1c9a9ed05776aa69"}, - {file = "pineappl-0.7.3-cp311-none-win_amd64.whl", hash = "sha256:346ad296bcabf15b38bd1c86dcafb1c59e7ffaad34afe8abfb26143f7cb0a35c"}, - {file = "pineappl-0.7.3-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:643806d5d05fb51ec17882f636c879bee4325bda0912eb1c50f3b7052017343c"}, - {file = "pineappl-0.7.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5fba2decb31d5327ae7e94473a4572e66155fe1849e024d023cd5fc5239affa8"}, - {file = "pineappl-0.7.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30a4c401f790470e9dc0fcb4b95fd375b4d4011ebc72db0256e4a9764d95636b"}, - {file = "pineappl-0.7.3-cp312-none-win_amd64.whl", hash = "sha256:b8b99da35aba36f36b8ac6e9503c146224f91bc9a2020a969e98670e0493e391"}, - {file = "pineappl-0.7.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2537b7430b3928ec2dc9c8f8c27efc5e59de6d78bc13528d3c30883e02877e03"}, - {file = "pineappl-0.7.3-cp37-cp37m-macosx_10_12_x86_64.whl", hash = "sha256:db5cc79cce905b66d41b2fccb63f473aaa12148e1cda8277d70ea46324e5f9bb"}, - {file = "pineappl-0.7.3-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:1a0ac6deda38573861b677878a370f21f51757f9432e77894cd05f4ceea6f28b"}, - {file = "pineappl-0.7.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a14a5475fc163a6057dfdb5a0a9477c70abb58daa65c60d4a70732ea417db40"}, - {file = "pineappl-0.7.3-cp37-none-win_amd64.whl", hash = "sha256:44ec1fdf07072b66a7a42f038ec5917dc8a8f79b9cb1c475dd2fa558c8d29756"}, - {file = "pineappl-0.7.3-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:8a65fb30d2679927ac024671a1d5a41ccfcb680c2da04841a08d52c91d6e95dd"}, - {file = "pineappl-0.7.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ad56b46f514d0c99d6309ff2051a17427eff1cc9b51e200e991c424e3943f60d"}, - {file = "pineappl-0.7.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:83f2a4e4247bb1a52ec7e8000dafa7ac3a0b67c46c22fa500153f92e4041f4d8"}, - {file = "pineappl-0.7.3-cp38-none-win_amd64.whl", hash = "sha256:061aa5a935d43bb850b2ec43d2f8fa50e8abb38f9524c3c222da17fcd131bd7d"}, - {file = "pineappl-0.7.3-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:2942f8d24db1a64930c29092570c417176ca4f1778215928d9609bd1f2201844"}, - {file = "pineappl-0.7.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6665b3f78544587f6d329bf5fe8a4e89fa435dc69fb14f404b1b8ce3b703ce9c"}, - {file = "pineappl-0.7.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8569ea2e2672f1c1fbeb5d0e9395319654b8ce8aead375e274554ddee1b95755"}, - {file = "pineappl-0.7.3-cp39-none-win_amd64.whl", hash = "sha256:d016d273b6fa132b2555cd0b5eb411ae6229e5961e65c2fdac2ef40a801135d3"}, - {file = "pineappl-0.7.3-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:1bc2f5ae94c65fec4dabd4cd4e809181f8b070cb1b17a189d5e616d4bbdca727"}, - {file = "pineappl-0.7.3-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:486c2e06c3cc2c1d4f62e94386ee6e0b4d430373dbfeb24a5e6204321fa427b0"}, - {file = "pineappl-0.7.3-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f017274b318e1e20abc8f76e3c17d2845416e5aa4da23022f3c2092e30826c3"}, - {file = "pineappl-0.7.3-pp37-pypy37_pp73-macosx_10_12_x86_64.whl", hash = "sha256:8d61df3b926bfd71fb53bb7038ef50c3b8324583ca464f2cedac9a32e6670ef0"}, - {file = "pineappl-0.7.3-pp37-pypy37_pp73-macosx_11_0_arm64.whl", hash = "sha256:cef626d416639cb928079d61c8e26d453e6d133d43b7da51fc835cd25681dfb7"}, - {file = "pineappl-0.7.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:34fc52a0e93017b0bfa8efdb2b4ed39783b3b3ac346557a70845e8348e932ebd"}, - {file = "pineappl-0.7.3-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:8f4cb5925f90f3e0fccb19137a81745a11cd6495d7ab869071d4fd0fc41e33c1"}, - {file = "pineappl-0.7.3-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:d6d4357cbbf43e891aec49af753712935e614e6512a1c9ccff4d451d13a8a61a"}, - {file = "pineappl-0.7.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6118300880ca6e7437e7eb3f35ceaf0b42af4c7e513d1fc93337f27d553a88b1"}, - {file = "pineappl-0.7.3-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:04d180ea49b8d464f423fbb49fb922e2b61820a9136e6863ee035466897a2610"}, - {file = "pineappl-0.7.3-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:ff2ea16c181f4c401182d7e46c5ece54c144c2bdf56052e9bad7fbd80d7238e2"}, - {file = "pineappl-0.7.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3068adcfbb4c0e3ea445503c775e08a0bb1e9b923bd5a7c2bd6822072051b33e"}, - {file = "pineappl-0.7.3.tar.gz", hash = "sha256:39081a4e490406bfd03bca2b137b0b0256dfd5efeba3a2621566fe8e26f53446"}, -] +python-versions = ">=3.6" +files = [] +develop = false [package.dependencies] numpy = ">=1.16.0,<2.0.0" [package.extras] -docs = ["nbsphinx (>=0.9.2)", "sphinx (>=6.2.1)", "sphinx_rtd_theme (>=1.2.2)", "sphinxcontrib-bibtex (>=2.5.0)"] +docs = ["nbsphinx (>=0.9.2)", "sphinx (>=6.2.1)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-bibtex (>=2.5.0)"] test = ["pytest", "pytest-cov"] +[package.source] +type = "git" +url = "https://github.com/NNPDF/pineappl.git" +reference = "extend_eko_convolution" +resolved_reference = "4222163499b1bb1c5f01895ed599c98177e26018" +subdirectory = "pineappl_py" + [[package]] name = "platformdirs" -version = "4.2.0" -description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +version = "4.2.2" +description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.2.0-py3-none-any.whl", hash = "sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068"}, - {file = "platformdirs-4.2.0.tar.gz", hash = "sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768"}, + {file = "platformdirs-4.2.2-py3-none-any.whl", hash = "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee"}, + {file = "platformdirs-4.2.2.tar.gz", hash = "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"}, ] [package.extras] docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] +type = ["mypy (>=1.8)"] [[package]] name = "pluggy" -version = "1.4.0" +version = "1.5.0" description = "plugin and hook calling mechanisms for python" optional = false python-versions = ">=3.8" files = [ - {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"}, - {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"}, + {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"}, + {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"}, ] [package.extras] @@ -2362,13 +2281,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "prompt-toolkit" -version = "3.0.43" +version = "3.0.45" description = "Library for building powerful interactive command lines in Python" optional = false python-versions = ">=3.7.0" files = [ - {file = "prompt_toolkit-3.0.43-py3-none-any.whl", hash = "sha256:a11a29cb3bf0a28a387fe5122cdb649816a957cd9261dcedf8c9f1fef33eacf6"}, - {file = "prompt_toolkit-3.0.43.tar.gz", hash = "sha256:3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d"}, + {file = "prompt_toolkit-3.0.45-py3-none-any.whl", hash = "sha256:a29b89160e494e3ea8622b09fa5897610b437884dcdcd054fdc1308883326c2a"}, + {file = "prompt_toolkit-3.0.45.tar.gz", hash = "sha256:07c60ee4ab7b7e90824b61afa840c8f5aad2d46b3e2e10acc33d8ecc94a49089"}, ] [package.dependencies] @@ -2494,37 +2413,36 @@ pybtex = ">=0.16" [[package]] name = "pygments" -version = "2.17.2" +version = "2.18.0" description = "Pygments is a syntax highlighting package written in Python." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"}, - {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"}, + {file = "pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"}, + {file = "pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199"}, ] [package.extras] -plugins = ["importlib-metadata"] windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pylint" -version = "3.1.0" +version = "3.2.2" description = "python code static checker" optional = false python-versions = ">=3.8.0" files = [ - {file = "pylint-3.1.0-py3-none-any.whl", hash = "sha256:507a5b60953874766d8a366e8e8c7af63e058b26345cfcb5f91f89d987fd6b74"}, - {file = "pylint-3.1.0.tar.gz", hash = "sha256:6a69beb4a6f63debebaab0a3477ecd0f559aa726af4954fc948c51f7a2549e23"}, + {file = "pylint-3.2.2-py3-none-any.whl", hash = "sha256:3f8788ab20bb8383e06dd2233e50f8e08949cfd9574804564803441a4946eab4"}, + {file = "pylint-3.2.2.tar.gz", hash = "sha256:d068ca1dfd735fb92a07d33cb8f288adc0f6bc1287a139ca2425366f7cbe38f8"}, ] [package.dependencies] -astroid = ">=3.1.0,<=3.2.0-dev0" +astroid = ">=3.2.2,<=3.3.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} dill = [ {version = ">=0.2", markers = "python_version < \"3.11\""}, + {version = ">=0.3.6", markers = "python_version >= \"3.11\""}, {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, - {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, ] isort = ">=4.2.5,<5.13.0 || >5.13.0,<6" mccabe = ">=0.6,<0.8" @@ -2789,6 +2707,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -2796,8 +2715,15 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -2814,6 +2740,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -2821,6 +2748,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -2856,13 +2784,13 @@ resolved_reference = "02acde3847daf6e06ad2b7c1bbf0ecb4516fdf72" [[package]] name = "requests" -version = "2.31.0" +version = "2.32.3" description = "Python HTTP for Humans." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, + {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, + {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, ] [package.dependencies] @@ -2972,36 +2900,36 @@ files = [ [[package]] name = "scipy" -version = "1.13.0" +version = "1.13.1" description = "Fundamental algorithms for scientific computing in Python" optional = false python-versions = ">=3.9" files = [ - {file = "scipy-1.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ba419578ab343a4e0a77c0ef82f088238a93eef141b2b8017e46149776dfad4d"}, - {file = "scipy-1.13.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:22789b56a999265431c417d462e5b7f2b487e831ca7bef5edeb56efe4c93f86e"}, - {file = "scipy-1.13.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:05f1432ba070e90d42d7fd836462c50bf98bd08bed0aa616c359eed8a04e3922"}, - {file = "scipy-1.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8434f6f3fa49f631fae84afee424e2483289dfc30a47755b4b4e6b07b2633a4"}, - {file = "scipy-1.13.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:dcbb9ea49b0167de4167c40eeee6e167caeef11effb0670b554d10b1e693a8b9"}, - {file = "scipy-1.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:1d2f7bb14c178f8b13ebae93f67e42b0a6b0fc50eba1cd8021c9b6e08e8fb1cd"}, - {file = "scipy-1.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0fbcf8abaf5aa2dc8d6400566c1a727aed338b5fe880cde64907596a89d576fa"}, - {file = "scipy-1.13.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:5e4a756355522eb60fcd61f8372ac2549073c8788f6114449b37e9e8104f15a5"}, - {file = "scipy-1.13.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5acd8e1dbd8dbe38d0004b1497019b2dbbc3d70691e65d69615f8a7292865d7"}, - {file = "scipy-1.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ff7dad5d24a8045d836671e082a490848e8639cabb3dbdacb29f943a678683d"}, - {file = "scipy-1.13.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4dca18c3ffee287ddd3bc8f1dabaf45f5305c5afc9f8ab9cbfab855e70b2df5c"}, - {file = "scipy-1.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:a2f471de4d01200718b2b8927f7d76b5d9bde18047ea0fa8bd15c5ba3f26a1d6"}, - {file = "scipy-1.13.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d0de696f589681c2802f9090fff730c218f7c51ff49bf252b6a97ec4a5d19e8b"}, - {file = "scipy-1.13.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:b2a3ff461ec4756b7e8e42e1c681077349a038f0686132d623fa404c0bee2551"}, - {file = "scipy-1.13.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6bf9fe63e7a4bf01d3645b13ff2aa6dea023d38993f42aaac81a18b1bda7a82a"}, - {file = "scipy-1.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e7626dfd91cdea5714f343ce1176b6c4745155d234f1033584154f60ef1ff42"}, - {file = "scipy-1.13.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:109d391d720fcebf2fbe008621952b08e52907cf4c8c7efc7376822151820820"}, - {file = "scipy-1.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:8930ae3ea371d6b91c203b1032b9600d69c568e537b7988a3073dfe4d4774f21"}, - {file = "scipy-1.13.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5407708195cb38d70fd2d6bb04b1b9dd5c92297d86e9f9daae1576bd9e06f602"}, - {file = "scipy-1.13.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:ac38c4c92951ac0f729c4c48c9e13eb3675d9986cc0c83943784d7390d540c78"}, - {file = "scipy-1.13.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09c74543c4fbeb67af6ce457f6a6a28e5d3739a87f62412e4a16e46f164f0ae5"}, - {file = "scipy-1.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28e286bf9ac422d6beb559bc61312c348ca9b0f0dae0d7c5afde7f722d6ea13d"}, - {file = "scipy-1.13.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:33fde20efc380bd23a78a4d26d59fc8704e9b5fd9b08841693eb46716ba13d86"}, - {file = "scipy-1.13.0-cp39-cp39-win_amd64.whl", hash = "sha256:45c08bec71d3546d606989ba6e7daa6f0992918171e2a6f7fbedfa7361c2de1e"}, - {file = "scipy-1.13.0.tar.gz", hash = "sha256:58569af537ea29d3f78e5abd18398459f195546bb3be23d16677fb26616cc11e"}, + {file = "scipy-1.13.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:20335853b85e9a49ff7572ab453794298bcf0354d8068c5f6775a0eabf350aca"}, + {file = "scipy-1.13.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:d605e9c23906d1994f55ace80e0125c587f96c020037ea6aa98d01b4bd2e222f"}, + {file = "scipy-1.13.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cfa31f1def5c819b19ecc3a8b52d28ffdcc7ed52bb20c9a7589669dd3c250989"}, + {file = "scipy-1.13.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f26264b282b9da0952a024ae34710c2aff7d27480ee91a2e82b7b7073c24722f"}, + {file = "scipy-1.13.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eccfa1906eacc02de42d70ef4aecea45415f5be17e72b61bafcfd329bdc52e94"}, + {file = "scipy-1.13.1-cp310-cp310-win_amd64.whl", hash = "sha256:2831f0dc9c5ea9edd6e51e6e769b655f08ec6db6e2e10f86ef39bd32eb11da54"}, + {file = "scipy-1.13.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:27e52b09c0d3a1d5b63e1105f24177e544a222b43611aaf5bc44d4a0979e32f9"}, + {file = "scipy-1.13.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:54f430b00f0133e2224c3ba42b805bfd0086fe488835effa33fa291561932326"}, + {file = "scipy-1.13.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89369d27f9e7b0884ae559a3a956e77c02114cc60a6058b4e5011572eea9299"}, + {file = "scipy-1.13.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a78b4b3345f1b6f68a763c6e25c0c9a23a9fd0f39f5f3d200efe8feda560a5fa"}, + {file = "scipy-1.13.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:45484bee6d65633752c490404513b9ef02475b4284c4cfab0ef946def50b3f59"}, + {file = "scipy-1.13.1-cp311-cp311-win_amd64.whl", hash = "sha256:5713f62f781eebd8d597eb3f88b8bf9274e79eeabf63afb4a737abc6c84ad37b"}, + {file = "scipy-1.13.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5d72782f39716b2b3509cd7c33cdc08c96f2f4d2b06d51e52fb45a19ca0c86a1"}, + {file = "scipy-1.13.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:017367484ce5498445aade74b1d5ab377acdc65e27095155e448c88497755a5d"}, + {file = "scipy-1.13.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:949ae67db5fa78a86e8fa644b9a6b07252f449dcf74247108c50e1d20d2b4627"}, + {file = "scipy-1.13.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de3ade0e53bc1f21358aa74ff4830235d716211d7d077e340c7349bc3542e884"}, + {file = "scipy-1.13.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2ac65fb503dad64218c228e2dc2d0a0193f7904747db43014645ae139c8fad16"}, + {file = "scipy-1.13.1-cp312-cp312-win_amd64.whl", hash = "sha256:cdd7dacfb95fea358916410ec61bbc20440f7860333aee6d882bb8046264e949"}, + {file = "scipy-1.13.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:436bbb42a94a8aeef855d755ce5a465479c721e9d684de76bf61a62e7c2b81d5"}, + {file = "scipy-1.13.1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:8335549ebbca860c52bf3d02f80784e91a004b71b059e3eea9678ba994796a24"}, + {file = "scipy-1.13.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d533654b7d221a6a97304ab63c41c96473ff04459e404b83275b60aa8f4b7004"}, + {file = "scipy-1.13.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:637e98dcf185ba7f8e663e122ebf908c4702420477ae52a04f9908707456ba4d"}, + {file = "scipy-1.13.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a014c2b3697bde71724244f63de2476925596c24285c7a637364761f8710891c"}, + {file = "scipy-1.13.1-cp39-cp39-win_amd64.whl", hash = "sha256:392e4ec766654852c25ebad4f64e4e584cf19820b980bc04960bca0b0cd6eaa2"}, + {file = "scipy-1.13.1.tar.gz", hash = "sha256:095a87a0312b08dfd6a6155cbbd310a8c51800fc931b8c0b84003014b874ed3c"}, ] [package.dependencies] @@ -3084,13 +3012,13 @@ files = [ [[package]] name = "sphinx" -version = "7.3.5" +version = "7.3.7" description = "Python documentation generator" optional = false python-versions = ">=3.9" files = [ - {file = "sphinx-7.3.5-py3-none-any.whl", hash = "sha256:e6a8f418321429669ef9c1e20c1f294b3fe1f248206b46044c86e1545480687f"}, - {file = "sphinx-7.3.5.tar.gz", hash = "sha256:30d03bbaa53b77d38863fd6b95cc4edb4a84a1512787b3b0c12fb3b4fb25d9e9"}, + {file = "sphinx-7.3.7-py3-none-any.whl", hash = "sha256:413f75440be4cacf328f580b4274ada4565fb2187d696a84970c23f77b64d8c3"}, + {file = "sphinx-7.3.7.tar.gz", hash = "sha256:a4a7db75ed37531c05002d56ed6948d4c42f473a36f46e1382b0bd76ca9627bc"}, ] [package.dependencies] @@ -3319,7 +3247,7 @@ files = [ ] [package.dependencies] -greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\")"} +greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"win32\" or platform_machine == \"WIN32\" or platform_machine == \"AMD64\" or platform_machine == \"amd64\" or platform_machine == \"x86_64\" or platform_machine == \"ppc64le\" or platform_machine == \"aarch64\")"} [package.extras] aiomysql = ["aiomysql (>=0.2.0)", "greenlet (!=0.4.17)"] @@ -3466,32 +3394,35 @@ and-cuda = ["nvidia-cublas-cu12 (==12.3.4.1)", "nvidia-cuda-cupti-cu12 (==12.3.1 [[package]] name = "tensorflow-io-gcs-filesystem" -version = "0.36.0" +version = "0.37.0" description = "TensorFlow IO" optional = true -python-versions = ">=3.7, <3.12" -files = [ - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:702c6df62b38095ff613c433546d9424d4f33902a5ab26b00fd26457e27a99fa"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:e9b8aaca2789af356c42afda0f52380f82e5abb2f3c0b85087833fcfe03875d8"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c477aed96864ceae77d7051c3b687f28813aba7320fc5dd552164fad6ec8d1a1"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be1ff92559dfa23048b01179a1827081947583f5c6f9986ccac471df8a29322a"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:72c3ca4b8c0d8dbdd970699d05a100107cf200317ad8e6a8373e2c37225cd552"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:848e8e89a0f49258c7782189c938d8d1162d989da1a80c79f95c7af3ef6006c8"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4d72db1ab03edb65fa1e98d06e504ccbc64282d38ab3589afb6db66dc448d1c1"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1bd4d946b5fa23220daa473a80e511a5fb27493d7e49d17dff0bb43bb0a31f32"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fa346fd1dd9f57848b73874007440504f060fadd689fa1cc29cc49817d0eeaf3"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:0a4437824424a4423cf86162cb8b21b1bec24698194332748b50bb952e62ab9f"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:31806bd7ac2db789161bc720747de22947063265561a4c17be54698fd9780b03"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fc0e57976c1aa035af6281f0330cfb8dd50eee2f63412ecc84d60ff5075d29b7"}, - {file = "tensorflow_io_gcs_filesystem-0.36.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e97ff5c280eb10f699098ae21057be2b146d39e8a906cd5db91f2ea6c34e47d0"}, -] - -[package.extras] -tensorflow = ["tensorflow (>=2.15.0,<2.16.0)"] -tensorflow-aarch64 = ["tensorflow-aarch64 (>=2.15.0,<2.16.0)"] -tensorflow-cpu = ["tensorflow-cpu (>=2.15.0,<2.16.0)"] -tensorflow-gpu = ["tensorflow-gpu (>=2.15.0,<2.16.0)"] -tensorflow-rocm = ["tensorflow-rocm (>=2.15.0,<2.16.0)"] +python-versions = "<3.12,>=3.7" +files = [ + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:82cc4d8e26fb143fc814ac8ab95fede83363a315f5b62f8ae68312f1aca1cc6e"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:677d6d7c84a94a3b27ea5d16633ea09adadef09c2630480e8e94209558828b02"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e5d1ac4d2010e8cdf259918ba1500c942b51b7ed2e549f55b404c1fb52f695d"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2901bc4a91158fa0a10d37594c8a5efb1445dd5a041b1b5b90f782a5d1b15e"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:eab6e4c1daf7ddbfef608cd8e2102861021678dfb3f6a7fb3f613db9d6992919"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:4ec3c0d0a9d3676a2e74198e3dff66d74c7c34f974257f2176236d0703b31a0e"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:af0f79400656bb88bf326d2b8e63aef49c07a0ce8c14c3e2589a62e765d8c21f"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13bc337f2c2db63a39c81c8fd0ececc0c3d5fcf4ce229dfed0b0085a23dd60e9"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:57e7af9c81e79bf8fb552985dc8972ac90437d34bd4c1c9019a92a07eb12bc98"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:48a8e7aec651bea8db410f6426c6446a56d16a5ab32201a70d8d684c113137b7"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71ccf64a137efcb2be2627225b4e48110cbf34da39b23c5cc688fe803f2510f1"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03d5598b8007551f4e1391bf85a83a1865e3fa0789beef15a200efaa06a23fb5"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:8d3ad5f30b6dbe09baefdb80e9aa7ff3869c772928b865f8ffc8402be7675a43"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:95bb229e968fca943806c6ac04e81dc4966fc4a36ab83efaa061a4ecb3ea5e85"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8385f4fe447812bd8e2e11ef523cf02765319100e5d9e4a9b5a876d4440c900c"}, + {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:500ec871a8d59cf78992b7fd4750d86ea3d35e231fb0bea7a7eabcf73abfceeb"}, +] + +[package.extras] +tensorflow = ["tensorflow (>=2.16.0,<2.17.0)"] +tensorflow-aarch64 = ["tensorflow-aarch64 (>=2.16.0,<2.17.0)"] +tensorflow-cpu = ["tensorflow-cpu (>=2.16.0,<2.17.0)"] +tensorflow-gpu = ["tensorflow-gpu (>=2.16.0,<2.17.0)"] +tensorflow-rocm = ["tensorflow-rocm (>=2.16.0,<2.17.0)"] [[package]] name = "termcolor" @@ -3520,13 +3451,13 @@ files = [ [[package]] name = "tomlkit" -version = "0.12.4" +version = "0.12.5" description = "Style preserving TOML library" optional = false python-versions = ">=3.7" files = [ - {file = "tomlkit-0.12.4-py3-none-any.whl", hash = "sha256:5cd82d48a3dd89dee1f9d64420aa20ae65cfbd00668d6f094d7578a78efbb77b"}, - {file = "tomlkit-0.12.4.tar.gz", hash = "sha256:7ca1cfc12232806517a8515047ba66a19369e71edf2439d0f5824f91032b6cc3"}, + {file = "tomlkit-0.12.5-py3-none-any.whl", hash = "sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f"}, + {file = "tomlkit-0.12.5.tar.gz", hash = "sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c"}, ] [[package]] @@ -3562,13 +3493,13 @@ files = [ [[package]] name = "tqdm" -version = "4.66.2" +version = "4.66.4" description = "Fast, Extensible Progress Meter" optional = true python-versions = ">=3.7" files = [ - {file = "tqdm-4.66.2-py3-none-any.whl", hash = "sha256:1ee4f8a893eb9bef51c6e35730cebf234d5d0b6bd112b0271e10ed7c24a02bd9"}, - {file = "tqdm-4.66.2.tar.gz", hash = "sha256:6cd52cdf0fef0e0f543299cfc96fec90d7b8a7e88745f411ec33eb44d5ed3531"}, + {file = "tqdm-4.66.4-py3-none-any.whl", hash = "sha256:b75ca56b413b030bc3f00af51fd2c1a1a5eac6a0c1cca83cbb37a5c52abce644"}, + {file = "tqdm-4.66.4.tar.gz", hash = "sha256:e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb"}, ] [package.dependencies] @@ -3582,28 +3513,28 @@ telegram = ["requests"] [[package]] name = "traitlets" -version = "5.14.2" +version = "5.14.3" description = "Traitlets Python configuration system" optional = false python-versions = ">=3.8" files = [ - {file = "traitlets-5.14.2-py3-none-any.whl", hash = "sha256:fcdf85684a772ddeba87db2f398ce00b40ff550d1528c03c14dbf6a02003cd80"}, - {file = "traitlets-5.14.2.tar.gz", hash = "sha256:8cdd83c040dab7d1dee822678e5f5d100b514f7b72b01615b26fc5718916fdf9"}, + {file = "traitlets-5.14.3-py3-none-any.whl", hash = "sha256:b74e89e397b1ed28cc831db7aea759ba6640cb3de13090ca145426688ff1ac4f"}, + {file = "traitlets-5.14.3.tar.gz", hash = "sha256:9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7"}, ] [package.extras] docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"] -test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0,<8.1)", "pytest-mock", "pytest-mypy-testing"] +test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0,<8.2)", "pytest-mock", "pytest-mypy-testing"] [[package]] name = "typing-extensions" -version = "4.11.0" +version = "4.12.1" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"}, - {file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"}, + {file = "typing_extensions-4.12.1-py3-none-any.whl", hash = "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a"}, + {file = "typing_extensions-4.12.1.tar.gz", hash = "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"}, ] [[package]] @@ -3662,13 +3593,13 @@ files = [ [[package]] name = "werkzeug" -version = "3.0.2" +version = "3.0.3" description = "The comprehensive WSGI web application library." optional = true python-versions = ">=3.8" files = [ - {file = "werkzeug-3.0.2-py3-none-any.whl", hash = "sha256:3aac3f5da756f93030740bc235d3e09449efcf65f2f55e3602e1d851b8f48795"}, - {file = "werkzeug-3.0.2.tar.gz", hash = "sha256:e39b645a6ac92822588e7b39a692e7828724ceae0b0d702ef96701f90e70128d"}, + {file = "werkzeug-3.0.3-py3-none-any.whl", hash = "sha256:fc9645dc43e03e4d630d23143a04a7f947a9a3b5727cd535fdfe155a17cc48c8"}, + {file = "werkzeug-3.0.3.tar.gz", hash = "sha256:097e5bfda9f0aba8da6b8545146def481d06aa7d3266e7448e2cccf67dd8bd18"}, ] [package.dependencies] @@ -3800,18 +3731,18 @@ files = [ [[package]] name = "zipp" -version = "3.18.1" +version = "3.19.1" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.18.1-py3-none-any.whl", hash = "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b"}, - {file = "zipp-3.18.1.tar.gz", hash = "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715"}, + {file = "zipp-3.19.1-py3-none-any.whl", hash = "sha256:2828e64edb5386ea6a52e7ba7cdb17bb30a73a858f5eb6eb93d8d36f5ea26091"}, + {file = "zipp-3.19.1.tar.gz", hash = "sha256:35427f6d5594f4acf82d25541438348c26736fa9b3afa2754bcd63cdb99d8e8f"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [extras] docs = [] @@ -3820,4 +3751,4 @@ nnpdf = ["lhapdf-management", "nnpdf"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "6421d996d90389d39fef7b01f6159b8622480492871aaf1c4ada632421e0b7aa" +content-hash = "bf579e1d95d7f4c3a6d1799fb5316e2a806bf9f4dc863ecceb57c92e4d6c83cb" diff --git a/pyproject.toml b/pyproject.toml index bf34b510..590baa8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ packages = [{ include = "pineko", from = "src" }] [tool.poetry.dependencies] python = ">=3.9,<3.13" eko = "^0.14.2" -pineappl = ">0.7.0" +pineappl = { git = "https://github.com/NNPDF/pineappl.git", branch = "extend_eko_convolution", subdirectory = "pineappl_py" } PyYAML = "^6.0" numpy = "^1.21.0" pandas = "^2.1" From ba90feac93c51765b9a786649d0586ab3cf28086 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 4 Jun 2024 09:39:20 +0200 Subject: [PATCH 11/66] make opcard working --- src/pineko/evolve.py | 7 ++++++- src/pineko/theory.py | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 9c8807ad..9914ef11 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -195,11 +195,16 @@ def dump_card(card_path, operators_card, conv_type, suffix=False): op_to_dump["configs"]["polarized"] = conv_type == "polPDF" if suffix: - card_path = card_path.parent / f"{card_path.stem}_{conv_type_a}.yaml" + card_path = card_path.parent / f"{card_path.stem}_{conv_type}.yaml" with open(card_path, "w", encoding="UTF-8") as f: yaml.safe_dump(op_to_dump, f) f.write(f"# {pineko_version=}") + if card_path.exists(): + rich.print( + f"[green]Success:[/] Wrote card with {len(q2_grid)} Q2 points to {card_path}" + ) + # For hardonic obs we might need to dump 2 eko cards if conv_type_a == conv_type_b: diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 1a42f7bf..eeaf6b16 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -246,10 +246,6 @@ def opcard(self, name, grid, tcard): opcard_path, tcard, ) - if opcard_path.exists(): - rich.print( - f"[green]Success:[/] Wrote card with {len(q2_grid)} Q2 points to {opcard_path}" - ) def opcards(self): """Write operator cards.""" From 95a157ca4eb2c75f25e9b1b918818e483c1b59fd Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 4 Jun 2024 09:57:09 +0200 Subject: [PATCH 12/66] make ekos working --- src/pineko/evolve.py | 10 +++--- src/pineko/theory.py | 75 +++++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 9914ef11..207f2b0c 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -55,14 +55,14 @@ def get_ekos_convolution_type(kv): pineappl grid metadata """ if "convolution_type_1" in kv: - eko1 = kv["convolution_type_1"] + conv_type_1 = kv["convolution_type_1"] # TODO: this case is now deprecated and should be remved from yadism and pinefarm elif "polarized" in kv and kv["polarized"]: - eko1 = "polPDF" + conv_type_1 = "polPDF" else: - eko1 = "PDF" - eko2 = kv.get("convolution_type_2", "PDF") - return eko1, eko2 + conv_type_1 = "PDF" + conv_type_2 = kv.get("convolution_type_2", "PDF") + return conv_type_1, conv_type_2 def write_operator_card_from_file( diff --git a/src/pineko/theory.py b/src/pineko/theory.py index eeaf6b16..d2eec266 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -302,7 +302,7 @@ def activate_logging(self, path, filename, activated_loggers=()): logger_.setLevel(logging.INFO) return True - def eko(self, name, _grid, tcard): + def eko(self, name, grid, tcard): """Compute a single eko. Parameters @@ -320,37 +320,48 @@ def eko(self, name, _grid, tcard): paths["logs"]["eko"], f"{self.theory_id}-{name}.log", ("eko",) ) # setup data - ocard = self.load_operator_card(name) - # For nFONLL mixed prescriptions (such as FONLL-B) the PTO written on - # the tcard is used to produce the grid by yadism and it might be different - # from the PTO needed for the PDF evolution (and so by EKO). Here we - # ensure that the PTO used in the EKO calculation reflects the real - # perturbative order of the prescription. - if "PTOEKO" in tcard: - tcard["PTO"] = tcard["PTOEKO"] - # The operator card has been already generated in the correct format - # The theory card needs to be converted to a format that eko can use - legacy_class = eko.io.runcards.Legacy(tcard, ocard) - new_theory = legacy_class.new_theory - new_op = eko.io.runcards.OperatorCard.from_dict(ocard) - eko_filename = self.ekos_path() / f"{name}.tar" - if eko_filename.exists(): - if not self.overwrite: - rich.print(f"Skipping existing operator {eko_filename}") - return - eko_filename.unlink() - # do it! - logger.info("Start computation of %s", name) - start_time = time.perf_counter() - # Actual computation of the EKO - solve(new_theory, new_op, eko_filename) - logger.info( - "Finished computation of %s - took %f s", - name, - time.perf_counter() - start_time, - ) - if eko_filename.exists(): - rich.print(f"[green]Success:[/] Wrote EKO to {eko_filename}") + grid_kv = pineappl.grid.Grid.read(grid).key_values() + conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(grid_kv) + if conv_type_a == conv_type_b: + names = [name] + else: + names = [ + f"{name}_{conv_type_a}", + f"{name}_{conv_type_b}", + ] + + for name in names: + ocard = self.load_operator_card(name) + # For nFONLL mixed prescriptions (such as FONLL-B) the PTO written on + # the tcard is used to produce the grid by yadism and it might be different + # from the PTO needed for the PDF evolution (and so by EKO). Here we + # ensure that the PTO used in the EKO calculation reflects the real + # perturbative order of the prescription. + if "PTOEKO" in tcard: + tcard["PTO"] = tcard["PTOEKO"] + # The operator card has been already generated in the correct format + # The theory card needs to be converted to a format that eko can use + legacy_class = eko.io.runcards.Legacy(tcard, ocard) + new_theory = legacy_class.new_theory + new_op = eko.io.runcards.OperatorCard.from_dict(ocard) + eko_filename = self.ekos_path() / f"{name}.tar" + if eko_filename.exists(): + if not self.overwrite: + rich.print(f"Skipping existing operator {eko_filename}") + return + eko_filename.unlink() + # do it! + logger.info("Start computation of %s", name) + start_time = time.perf_counter() + # Actual computation of the EKO + solve(new_theory, new_op, eko_filename) + logger.info( + "Finished computation of %s - took %f s", + name, + time.perf_counter() - start_time, + ) + if eko_filename.exists(): + rich.print(f"[green]Success:[/] Wrote EKO to {eko_filename}") def ekos(self): """Compute all ekos.""" From ea405fdc4c30f459c32d7e15c0348b3ccb3eb521 Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Tue, 4 Jun 2024 09:58:46 +0200 Subject: [PATCH 13/66] Update src/pineko/evolve.py Co-authored-by: Felix Hekhorn --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 207f2b0c..1d3ef07b 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -47,7 +47,7 @@ def sv_scheme(tcard): def get_ekos_convolution_type(kv): - """Temporary finction to retrive the ekos convolution type. + """Retrieve the ekos convolution type. Parameters ---------- From 34ee7d5bafc9cb46ed372f86affdab63d929f2cc Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 4 Jun 2024 15:36:10 +0200 Subject: [PATCH 14/66] make fks working --- src/pineko/evolve.py | 2 +- src/pineko/theory.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 1d3ef07b..30858015 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -127,7 +127,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): """ # Add a +1 to the orders for the difference in convention between nnpdf and pineappl # NB: This would not happen for nFONLL - is_fns = int(check.is_fonll_mixed(tcard["FNS"], pineappl_grid.lumi())) + is_fns = int(check.is_fonll_mixed(tcard["FNS"], pineappl_grid.channels())) max_as = 1 + tcard["PTO"] + is_fns max_al = 1 + tcard["QED"] # ... in order to create a mask ... diff --git a/src/pineko/theory.py b/src/pineko/theory.py index d2eec266..3a794476 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -428,7 +428,7 @@ def fk(self, name, grid_path, tcard, pdf): # Check if we are computing FONLL-B fktable and eventually change max_as if check.is_fonll_mixed( tcard["FNS"], - grid.lumi(), + grid.channels(), ): max_as += 1 @@ -472,7 +472,7 @@ def fk(self, name, grid_path, tcard, pdf): operators_a.paths.root.parent / f"eko-tmp-{name}-{np.random.rand()}.tar" ) - operators_b.deepcopy(eko_tmp_path_b) + operators_b.deepcopy(eko_tmp_path_b) with eko.EKO.edit(eko_tmp_path_a) as operators_a: # Obtain the assumptions hash From f2dbc468d6e1a550423baa4820033457958c8fec Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Tue, 4 Jun 2024 16:03:22 +0200 Subject: [PATCH 15/66] start fixing some of the benchmarks --- benchmarks/bench_autosv.py | 4 ++-- benchmarks/bench_kfactor.py | 4 ++-- benchmarks/bench_regression.py | 2 +- src/pineko/comparator.py | 4 ++-- src/pineko/kfactor.py | 2 +- src/pineko/scale_variations.py | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/benchmarks/bench_autosv.py b/benchmarks/bench_autosv.py index a6dc025b..b8d491c1 100644 --- a/benchmarks/bench_autosv.py +++ b/benchmarks/bench_autosv.py @@ -40,7 +40,7 @@ def benchmark_compute_ren_sv_grid(test_files, tmp_path, test_pdf, lhapdf_path): plusrensv_grid = pineappl.grid.Grid.read(plusrensv_grid_path) sv_list = [(0.5, 1.0), (2.0, 1.0)] # Only ren sv have to be tested bin_number = to_test_grid.bins() - to_test_res = to_test_grid.convolute_with_one( + to_test_res = to_test_grid.convolve_with_one( 2212, pdf.xfxQ2, pdf.alphasQ2, @@ -49,7 +49,7 @@ def benchmark_compute_ren_sv_grid(test_files, tmp_path, test_pdf, lhapdf_path): np.array([], dtype=bool), sv_list, ).reshape(bin_number, len(sv_list)) - plusrensv_res = plusrensv_grid.convolute_with_one( + plusrensv_res = plusrensv_grid.convolve_with_one( 2212, pdf.xfxQ2, pdf.alphasQ2, diff --git a/benchmarks/bench_kfactor.py b/benchmarks/bench_kfactor.py index 76644dfb..f7602610 100644 --- a/benchmarks/bench_kfactor.py +++ b/benchmarks/bench_kfactor.py @@ -28,7 +28,7 @@ def benchmark_kfactor_inclusion(test_files, tmp_path, test_pdf, lhapdf_path): order_mask_nnloQCD = pineappl.grid.Order.create_mask( pluskfactor_grid.orders(), 3, 0, True ) - to_test_res_nlo = pluskfactor_grid.convolute_with_one( + to_test_res_nlo = pluskfactor_grid.convolve_with_one( 2212, pdf.xfxQ2, pdf.alphasQ2, @@ -37,7 +37,7 @@ def benchmark_kfactor_inclusion(test_files, tmp_path, test_pdf, lhapdf_path): np.array([], dtype=bool), sv_list, ).reshape(bin_number, len(sv_list)) - to_test_res_nnlo = pluskfactor_grid.convolute_with_one( + to_test_res_nnlo = pluskfactor_grid.convolve_with_one( 2212, pdf.xfxQ2, pdf.alphasQ2, diff --git a/benchmarks/bench_regression.py b/benchmarks/bench_regression.py index be02e5b2..ec6349aa 100644 --- a/benchmarks/bench_regression.py +++ b/benchmarks/bench_regression.py @@ -125,7 +125,7 @@ def benchmark_regression(tmp_path, dataset): fkt = FkTable.read( tmp_path / "data" / "fktables" / str(THEORYID) / f"{grid_name}.pineappl.lz4" ) - result.append(fkt.convolute_with_one(2212, pdf.xfxQ2)) + result.append(fkt.convolve_with_one(2212, pdf.xfxQ2)) result = np.concatenate(result) if not regression_path.exists(): diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index a99d68ae..f19a90b4 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -36,7 +36,7 @@ def compare(pine, fktable, max_as, max_al, pdf, xir, xif): pdgid = int(pdfset.set().get_entry("Particle")) order_mask = pineappl.grid.Order.create_mask(pine.orders(), max_as, max_al, True) before = np.array( - pine.convolute_with_one( + pine.convolve_with_one( pdgid, pdfset.xfxQ2, pdfset.alphasQ2, @@ -44,7 +44,7 @@ def compare(pine, fktable, max_as, max_al, pdf, xir, xif): xi=((xir, xif),), ) ) - after = np.array(fktable.convolute_with_one(pdgid, pdfset.xfxQ2)) + after = np.array(fktable.convolve_with_one(pdgid, pdfset.xfxQ2)) df = pd.DataFrame() # add bin info for d in range(pine.bin_dimensions()): diff --git a/src/pineko/kfactor.py b/src/pineko/kfactor.py index 214b8eef..92f616df 100644 --- a/src/pineko/kfactor.py +++ b/src/pineko/kfactor.py @@ -179,7 +179,7 @@ def create_singlegridonly( # extract the relevant order to rescale from the grid for each lumi and bin grid_orders = [order.as_tuple() for order in grid.orders()] order_index = grid_orders.index(order) - for lumi_index in range(len(new_grid.lumi())): + for lumi_index in range(len(new_grid.channels())): for bin_index in range(grid.bins()): extracted_subgrid = grid.subgrid(order_index, bin_index, lumi_index) scales_array = construct_scales_array( diff --git a/src/pineko/scale_variations.py b/src/pineko/scale_variations.py index 75c65cc4..3fe47551 100644 --- a/src/pineko/scale_variations.py +++ b/src/pineko/scale_variations.py @@ -100,7 +100,7 @@ def initialize_new_grid(grid, new_order): bin_limits = [ float(bin) for bin in range(grid.bins() + 1) ] # The +1 explanation is that n bins have n+1 bin limits, and range generates numbers from a half-open interval (range(n) generates n numbers). - lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in grid.lumi()] + lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in grid.channels()] subgrid_params = pineappl.subgrid.SubgridParams() new_order = [pineappl.grid.Order(*new_order)] # create new_grid with same lumi and bin_limits of the original grid but with new_order @@ -116,7 +116,7 @@ def create_svonly(grid, order, new_order, scalefactor): # extract the relevant order to rescale from the grid for each lumi and bin grid_orders = [order.as_tuple() for order in grid.orders()] order_index = grid_orders.index(order) - for lumi_index in range(len(new_grid.lumi())): + for lumi_index in range(len(new_grid.channels())): for bin_index in range(grid.bins()): extracted_subgrid = grid.subgrid(order_index, bin_index, lumi_index) extracted_subgrid.scale(scalefactor) @@ -205,7 +205,7 @@ def merge_grids( def construct_and_dump_order_exists_grid(ori_grid, to_construct_order): """Remove the order that has to be substituted from the grid.""" bin_limits = [float(bin) for bin in range(ori_grid.bins() + 1)] - lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in ori_grid.lumi()] + lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in ori_grid.channels()] subgrid_params = pineappl.subgrid.SubgridParams() ori_grid_orders = [order.as_tuple() for order in ori_grid.orders()] new_orders = [ From 929726d974adce7ada47266a42a8a4c968fccac6 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 4 Jun 2024 16:12:09 +0200 Subject: [PATCH 16/66] make tests passing --- src/pineko/scale_variations.py | 4 ++-- tests/test_evolve.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pineko/scale_variations.py b/src/pineko/scale_variations.py index 3fe47551..fe57fb50 100644 --- a/src/pineko/scale_variations.py +++ b/src/pineko/scale_variations.py @@ -100,7 +100,7 @@ def initialize_new_grid(grid, new_order): bin_limits = [ float(bin) for bin in range(grid.bins() + 1) ] # The +1 explanation is that n bins have n+1 bin limits, and range generates numbers from a half-open interval (range(n) generates n numbers). - lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in grid.channels()] + lumi_grid = [pineappl.lumi.Channel(mylum) for mylum in grid.channels()] subgrid_params = pineappl.subgrid.SubgridParams() new_order = [pineappl.grid.Order(*new_order)] # create new_grid with same lumi and bin_limits of the original grid but with new_order @@ -205,7 +205,7 @@ def merge_grids( def construct_and_dump_order_exists_grid(ori_grid, to_construct_order): """Remove the order that has to be substituted from the grid.""" bin_limits = [float(bin) for bin in range(ori_grid.bins() + 1)] - lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in ori_grid.channels()] + lumi_grid = [pineappl.lumi.Channel(mylum) for mylum in ori_grid.channels()] subgrid_params = pineappl.subgrid.SubgridParams() ori_grid_orders = [order.as_tuple() for order in ori_grid.orders()] new_orders = [ diff --git a/tests/test_evolve.py b/tests/test_evolve.py index 51621062..038d6f7f 100644 --- a/tests/test_evolve.py +++ b/tests/test_evolve.py @@ -36,7 +36,7 @@ class FakePine: def orders(self): return [pineappl.grid.Order(0, 0, 0, 0)] - def lumi(self): + def channels(self): return [[(21, 21, 1)]] def evolve_info(self, _): From ea263a4342a4e35d5a5a0a84c1a5563e32adc444 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 4 Jun 2024 16:25:14 +0200 Subject: [PATCH 17/66] remove duplicated print statement --- src/pineko/cli/opcard.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pineko/cli/opcard.py b/src/pineko/cli/opcard.py index 7fa95494..530b53b7 100644 --- a/src/pineko/cli/opcard.py +++ b/src/pineko/cli/opcard.py @@ -28,9 +28,7 @@ def subcommand(pineappl_path, default_card_path, thcard_path, opcard_path): """ tcard = yaml.safe_load(pathlib.Path(thcard_path).read_text(encoding="utf-8")) + opcard_path = pathlib.Path(opcard_path) _x_grid, q2_grid = evolve.write_operator_card_from_file( pineappl_path, default_card_path, opcard_path, tcard ) - rich.print( - f"[green]Success:[/] Wrote card with {len(q2_grid)} Q2 points to {opcard_path}" - ) From 81bcfd03a3f9541f772903f23c65815231a28393 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 4 Jun 2024 16:34:02 +0200 Subject: [PATCH 18/66] revert changes to Channel --- src/pineko/scale_variations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pineko/scale_variations.py b/src/pineko/scale_variations.py index fe57fb50..3fe47551 100644 --- a/src/pineko/scale_variations.py +++ b/src/pineko/scale_variations.py @@ -100,7 +100,7 @@ def initialize_new_grid(grid, new_order): bin_limits = [ float(bin) for bin in range(grid.bins() + 1) ] # The +1 explanation is that n bins have n+1 bin limits, and range generates numbers from a half-open interval (range(n) generates n numbers). - lumi_grid = [pineappl.lumi.Channel(mylum) for mylum in grid.channels()] + lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in grid.channels()] subgrid_params = pineappl.subgrid.SubgridParams() new_order = [pineappl.grid.Order(*new_order)] # create new_grid with same lumi and bin_limits of the original grid but with new_order @@ -205,7 +205,7 @@ def merge_grids( def construct_and_dump_order_exists_grid(ori_grid, to_construct_order): """Remove the order that has to be substituted from the grid.""" bin_limits = [float(bin) for bin in range(ori_grid.bins() + 1)] - lumi_grid = [pineappl.lumi.Channel(mylum) for mylum in ori_grid.channels()] + lumi_grid = [pineappl.lumi.LumiEntry(mylum) for mylum in ori_grid.channels()] subgrid_params = pineappl.subgrid.SubgridParams() ori_grid_orders = [order.as_tuple() for order in ori_grid.orders()] new_orders = [ From 4274fa64a47dcd2f3c9610b5425062194cf376f1 Mon Sep 17 00:00:00 2001 From: Tanjona Rabemananjara Date: Tue, 4 Jun 2024 22:20:21 +0200 Subject: [PATCH 19/66] give a try on setting up rustup & cargo in CI --- .github/workflows/bench.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 9ccd10ee..25caf834 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -23,6 +23,8 @@ jobs: with: virtualenvs-create: false installer-parallel: true + # Temporary fix to get unreleased version of pineappl + - uses: moonrepo/setup-rust@v1 - name: Install dependencies run: poetry install --no-interaction --no-root --with test -E nnpdf - name: Install project From f435cac4c1e8e14d17d5ccaf28ae4175a2b0f255 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 5 Jun 2024 21:22:06 +0200 Subject: [PATCH 20/66] correct syntax --- src/pineko/evolve.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 30858015..c441ac48 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -58,9 +58,9 @@ def get_ekos_convolution_type(kv): conv_type_1 = kv["convolution_type_1"] # TODO: this case is now deprecated and should be remved from yadism and pinefarm elif "polarized" in kv and kv["polarized"]: - conv_type_1 = "polPDF" + conv_type_1 = "PolPDF" else: - conv_type_1 = "PDF" + conv_type_1 = "UnpolPDF" conv_type_2 = kv.get("convolution_type_2", "PDF") return conv_type_1, conv_type_2 @@ -192,7 +192,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): def dump_card(card_path, operators_card, conv_type, suffix=False): op_to_dump = copy.deepcopy(operators_card) - op_to_dump["configs"]["polarized"] = conv_type == "polPDF" + op_to_dump["configs"]["polarized"] = conv_type == "PolPDF" if suffix: card_path = card_path.parent / f"{card_path.stem}_{conv_type}.yaml" @@ -322,6 +322,7 @@ def xgrid_reshape(operators): for mur2 in mur2_grid ] # We need to use ekompatibility in order to pass a dictionary to pineappl + fktable = grid.evolve( ekompatibility.pineappl_layout(operators_a), xir * xir * mur2_grid, From b413bd60eb8d28dfc77649c853c416177fd6a4d3 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 5 Jun 2024 23:30:45 +0200 Subject: [PATCH 21/66] fix test --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index c441ac48..b1250133 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -61,7 +61,7 @@ def get_ekos_convolution_type(kv): conv_type_1 = "PolPDF" else: conv_type_1 = "UnpolPDF" - conv_type_2 = kv.get("convolution_type_2", "PDF") + conv_type_2 = kv.get("convolution_type_2", "UnpolPDF") return conv_type_1, conv_type_2 From 840eb9e209d518b58b95726d080e2ccfc54bd089 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Thu, 6 Jun 2024 08:53:01 +0200 Subject: [PATCH 22/66] restore DIS polarized compatibility --- src/pineko/evolve.py | 15 +++++++++++++-- src/pineko/theory.py | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index b1250133..f5e96ac1 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -61,7 +61,18 @@ def get_ekos_convolution_type(kv): conv_type_1 = "PolPDF" else: conv_type_1 = "UnpolPDF" - conv_type_2 = kv.get("convolution_type_2", "UnpolPDF") + + # TODO: initial_state_2 is now deprecated, needed for comatibility + if "convolution_particle_2" in kv: + part_2 = kv["convolution_particle_2"] + else: + part_2 = kv["initial_state_2"] + + # check for DIS + if check.islepton(float(part_2)): + conv_type_2 = None + else: + conv_type_2 = kv.get("convolution_type_2", "UnpolPDF") return conv_type_1, conv_type_2 @@ -207,7 +218,7 @@ def dump_card(card_path, operators_card, conv_type, suffix=False): # For hardonic obs we might need to dump 2 eko cards - if conv_type_a == conv_type_b: + if conv_type_b is None or conv_type_a == conv_type_b: dump_card(card_path, operators_card, conv_type_a) else: # dump card_a diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 3a794476..2b049199 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -322,7 +322,7 @@ def eko(self, name, grid, tcard): # setup data grid_kv = pineappl.grid.Grid.read(grid).key_values() conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(grid_kv) - if conv_type_a == conv_type_b: + if conv_type_b is None or conv_type_a == conv_type_b: names = [name] else: names = [ @@ -411,7 +411,7 @@ def fk(self, name, grid_path, tcard, pdf): conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(kv) # setup data - if conv_type_a == conv_type_b: + if conv_type_b is None or conv_type_a == conv_type_b: eko_filename = [self.ekos_path() / f"{name}.tar"] else: eko_filename = [ From 49295cd9f8c7952356e00c6579513ab58b5675b7 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Thu, 6 Jun 2024 10:19:04 +0200 Subject: [PATCH 23/66] make FakePine less fake --- tests/test_evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_evolve.py b/tests/test_evolve.py index 038d6f7f..425f82ac 100644 --- a/tests/test_evolve.py +++ b/tests/test_evolve.py @@ -43,7 +43,7 @@ def evolve_info(self, _): return self._evolve_info def key_values(self): - return {} + return {"convolution_particle_1": 2212, "convolution_particle_2": 11} def test_write_operator_card_q0(tmp_path): From c503f6f35dd5ab18e10291864751bdb96b3e348e Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Wed, 19 Jun 2024 08:52:22 +0200 Subject: [PATCH 24/66] update poetry lock --- poetry.lock | 368 ++++++++++++++++++++++++++-------------------------- 1 file changed, 185 insertions(+), 183 deletions(-) diff --git a/poetry.lock b/poetry.lock index a1cb6777..6b8ca012 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "absl-py" @@ -115,13 +115,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "banana-hep" -version = "0.6.13" +version = "0.6.14" description = "Benchmark QCD physics" optional = false -python-versions = ">=3.9.0,<3.13" +python-versions = "<3.13,>=3.9.0" files = [ - {file = "banana_hep-0.6.13-py3-none-any.whl", hash = "sha256:a8348d6dff7c4d24b91ce9a69fdd71c262bb84ea8385a8571a5d91538d30bb69"}, - {file = "banana_hep-0.6.13.tar.gz", hash = "sha256:b889fac6e2fafa5015b54a044ab3318003aa868a1f70e4f1312ef2151f720ac6"}, + {file = "banana_hep-0.6.14-py3-none-any.whl", hash = "sha256:f21b721eb98040de27582adecf4814f3c3323a9164f3cb7d51d56a7a1e21e093"}, + {file = "banana_hep-0.6.14.tar.gz", hash = "sha256:15476feb8d5e086a432404b23f9b00ab312f3eb65287dfe856b947a0a8a4897f"}, ] [package.dependencies] @@ -376,63 +376,63 @@ test-no-images = ["pytest", "pytest-cov", "pytest-xdist", "wurlitzer"] [[package]] name = "coverage" -version = "7.5.0" +version = "7.5.3" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:432949a32c3e3f820af808db1833d6d1631664d53dd3ce487aa25d574e18ad1c"}, - {file = "coverage-7.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2bd7065249703cbeb6d4ce679c734bef0ee69baa7bff9724361ada04a15b7e3b"}, - {file = "coverage-7.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bbfe6389c5522b99768a93d89aca52ef92310a96b99782973b9d11e80511f932"}, - {file = "coverage-7.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:39793731182c4be939b4be0cdecde074b833f6171313cf53481f869937129ed3"}, - {file = "coverage-7.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85a5dbe1ba1bf38d6c63b6d2c42132d45cbee6d9f0c51b52c59aa4afba057517"}, - {file = "coverage-7.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:357754dcdfd811462a725e7501a9b4556388e8ecf66e79df6f4b988fa3d0b39a"}, - {file = "coverage-7.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a81eb64feded34f40c8986869a2f764f0fe2db58c0530d3a4afbcde50f314880"}, - {file = "coverage-7.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:51431d0abbed3a868e967f8257c5faf283d41ec882f58413cf295a389bb22e58"}, - {file = "coverage-7.5.0-cp310-cp310-win32.whl", hash = "sha256:f609ebcb0242d84b7adeee2b06c11a2ddaec5464d21888b2c8255f5fd6a98ae4"}, - {file = "coverage-7.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:6782cd6216fab5a83216cc39f13ebe30adfac2fa72688c5a4d8d180cd52e8f6a"}, - {file = "coverage-7.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e768d870801f68c74c2b669fc909839660180c366501d4cc4b87efd6b0eee375"}, - {file = "coverage-7.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:84921b10aeb2dd453247fd10de22907984eaf80901b578a5cf0bb1e279a587cb"}, - {file = "coverage-7.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:710c62b6e35a9a766b99b15cdc56d5aeda0914edae8bb467e9c355f75d14ee95"}, - {file = "coverage-7.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c379cdd3efc0658e652a14112d51a7668f6bfca7445c5a10dee7eabecabba19d"}, - {file = "coverage-7.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fea9d3ca80bcf17edb2c08a4704259dadac196fe5e9274067e7a20511fad1743"}, - {file = "coverage-7.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:41327143c5b1d715f5f98a397608f90ab9ebba606ae4e6f3389c2145410c52b1"}, - {file = "coverage-7.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:565b2e82d0968c977e0b0f7cbf25fd06d78d4856289abc79694c8edcce6eb2de"}, - {file = "coverage-7.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cf3539007202ebfe03923128fedfdd245db5860a36810136ad95a564a2fdffff"}, - {file = "coverage-7.5.0-cp311-cp311-win32.whl", hash = "sha256:bf0b4b8d9caa8d64df838e0f8dcf68fb570c5733b726d1494b87f3da85db3a2d"}, - {file = "coverage-7.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:9c6384cc90e37cfb60435bbbe0488444e54b98700f727f16f64d8bfda0b84656"}, - {file = "coverage-7.5.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fed7a72d54bd52f4aeb6c6e951f363903bd7d70bc1cad64dd1f087980d309ab9"}, - {file = "coverage-7.5.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cbe6581fcff7c8e262eb574244f81f5faaea539e712a058e6707a9d272fe5b64"}, - {file = "coverage-7.5.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad97ec0da94b378e593ef532b980c15e377df9b9608c7c6da3506953182398af"}, - {file = "coverage-7.5.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bd4bacd62aa2f1a1627352fe68885d6ee694bdaebb16038b6e680f2924a9b2cc"}, - {file = "coverage-7.5.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:adf032b6c105881f9d77fa17d9eebe0ad1f9bfb2ad25777811f97c5362aa07f2"}, - {file = "coverage-7.5.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4ba01d9ba112b55bfa4b24808ec431197bb34f09f66f7cb4fd0258ff9d3711b1"}, - {file = "coverage-7.5.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:f0bfe42523893c188e9616d853c47685e1c575fe25f737adf473d0405dcfa7eb"}, - {file = "coverage-7.5.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a9a7ef30a1b02547c1b23fa9a5564f03c9982fc71eb2ecb7f98c96d7a0db5cf2"}, - {file = "coverage-7.5.0-cp312-cp312-win32.whl", hash = "sha256:3c2b77f295edb9fcdb6a250f83e6481c679335ca7e6e4a955e4290350f2d22a4"}, - {file = "coverage-7.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:427e1e627b0963ac02d7c8730ca6d935df10280d230508c0ba059505e9233475"}, - {file = "coverage-7.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9dd88fce54abbdbf4c42fb1fea0e498973d07816f24c0e27a1ecaf91883ce69e"}, - {file = "coverage-7.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a898c11dca8f8c97b467138004a30133974aacd572818c383596f8d5b2eb04a9"}, - {file = "coverage-7.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:07dfdd492d645eea1bd70fb1d6febdcf47db178b0d99161d8e4eed18e7f62fe7"}, - {file = "coverage-7.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d3d117890b6eee85887b1eed41eefe2e598ad6e40523d9f94c4c4b213258e4a4"}, - {file = "coverage-7.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6afd2e84e7da40fe23ca588379f815fb6dbbb1b757c883935ed11647205111cb"}, - {file = "coverage-7.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:a9960dd1891b2ddf13a7fe45339cd59ecee3abb6b8326d8b932d0c5da208104f"}, - {file = "coverage-7.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ced268e82af993d7801a9db2dbc1d2322e786c5dc76295d8e89473d46c6b84d4"}, - {file = "coverage-7.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e7c211f25777746d468d76f11719e64acb40eed410d81c26cefac641975beb88"}, - {file = "coverage-7.5.0-cp38-cp38-win32.whl", hash = "sha256:262fffc1f6c1a26125d5d573e1ec379285a3723363f3bd9c83923c9593a2ac25"}, - {file = "coverage-7.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:eed462b4541c540d63ab57b3fc69e7d8c84d5957668854ee4e408b50e92ce26a"}, - {file = "coverage-7.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d0194d654e360b3e6cc9b774e83235bae6b9b2cac3be09040880bb0e8a88f4a1"}, - {file = "coverage-7.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:33c020d3322662e74bc507fb11488773a96894aa82a622c35a5a28673c0c26f5"}, - {file = "coverage-7.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cbdf2cae14a06827bec50bd58e49249452d211d9caddd8bd80e35b53cb04631"}, - {file = "coverage-7.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3235d7c781232e525b0761730e052388a01548bd7f67d0067a253887c6e8df46"}, - {file = "coverage-7.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2de4e546f0ec4b2787d625e0b16b78e99c3e21bc1722b4977c0dddf11ca84e"}, - {file = "coverage-7.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4d0e206259b73af35c4ec1319fd04003776e11e859936658cb6ceffdeba0f5be"}, - {file = "coverage-7.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2055c4fb9a6ff624253d432aa471a37202cd8f458c033d6d989be4499aed037b"}, - {file = "coverage-7.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:075299460948cd12722a970c7eae43d25d37989da682997687b34ae6b87c0ef0"}, - {file = "coverage-7.5.0-cp39-cp39-win32.whl", hash = "sha256:280132aada3bc2f0fac939a5771db4fbb84f245cb35b94fae4994d4c1f80dae7"}, - {file = "coverage-7.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:c58536f6892559e030e6924896a44098bc1290663ea12532c78cef71d0df8493"}, - {file = "coverage-7.5.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:2b57780b51084d5223eee7b59f0d4911c31c16ee5aa12737c7a02455829ff067"}, - {file = "coverage-7.5.0.tar.gz", hash = "sha256:cf62d17310f34084c59c01e027259076479128d11e4661bb6c9acb38c5e19bb8"}, + {file = "coverage-7.5.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45"}, + {file = "coverage-7.5.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec"}, + {file = "coverage-7.5.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286"}, + {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc"}, + {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d"}, + {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83"}, + {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d"}, + {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c"}, + {file = "coverage-7.5.3-cp310-cp310-win32.whl", hash = "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84"}, + {file = "coverage-7.5.3-cp310-cp310-win_amd64.whl", hash = "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac"}, + {file = "coverage-7.5.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974"}, + {file = "coverage-7.5.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232"}, + {file = "coverage-7.5.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd"}, + {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807"}, + {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb"}, + {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc"}, + {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8"}, + {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614"}, + {file = "coverage-7.5.3-cp311-cp311-win32.whl", hash = "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9"}, + {file = "coverage-7.5.3-cp311-cp311-win_amd64.whl", hash = "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a"}, + {file = "coverage-7.5.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8"}, + {file = "coverage-7.5.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3"}, + {file = "coverage-7.5.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1"}, + {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db"}, + {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd"}, + {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523"}, + {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"}, + {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84"}, + {file = "coverage-7.5.3-cp312-cp312-win32.whl", hash = "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08"}, + {file = "coverage-7.5.3-cp312-cp312-win_amd64.whl", hash = "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb"}, + {file = "coverage-7.5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb"}, + {file = "coverage-7.5.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155"}, + {file = "coverage-7.5.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24"}, + {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98"}, + {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d"}, + {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d"}, + {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce"}, + {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0"}, + {file = "coverage-7.5.3-cp38-cp38-win32.whl", hash = "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485"}, + {file = "coverage-7.5.3-cp38-cp38-win_amd64.whl", hash = "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56"}, + {file = "coverage-7.5.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85"}, + {file = "coverage-7.5.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31"}, + {file = "coverage-7.5.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d"}, + {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341"}, + {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7"}, + {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52"}, + {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303"}, + {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd"}, + {file = "coverage-7.5.3-cp39-cp39-win32.whl", hash = "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d"}, + {file = "coverage-7.5.3-cp39-cp39-win_amd64.whl", hash = "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0"}, + {file = "coverage-7.5.3-pp38.pp39.pp310-none-any.whl", hash = "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884"}, + {file = "coverage-7.5.3.tar.gz", hash = "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f"}, ] [package.dependencies] @@ -458,19 +458,19 @@ tests = ["pytest", "pytest-cov", "pytest-xdist"] [[package]] name = "dask" -version = "2024.4.2" +version = "2024.6.0" description = "Parallel PyData with Task Scheduling" optional = true python-versions = ">=3.9" files = [ - {file = "dask-2024.4.2-py3-none-any.whl", hash = "sha256:56fbe92472e3b323ab7beaf2dc8437d48066ac21aa9c2c17ac40d2b6f7b4c414"}, - {file = "dask-2024.4.2.tar.gz", hash = "sha256:3d7a516468d96e72581b84c7bb00172366f30d24c689ea4e9bd1334ab6d98f8a"}, + {file = "dask-2024.6.0-py3-none-any.whl", hash = "sha256:de0ced6cd46dbc6c01120c8870457af46d667940805a4be063a74dd467466804"}, + {file = "dask-2024.6.0.tar.gz", hash = "sha256:6882ce7e485336d707e540080ed48e01f9c09485d52a2928ea05f9a9e44bb433"}, ] [package.dependencies] click = ">=8.1" cloudpickle = ">=1.5.0" -distributed = {version = "2024.4.2", optional = true, markers = "extra == \"distributed\""} +distributed = {version = "2024.6.0", optional = true, markers = "extra == \"distributed\""} fsspec = ">=2021.09.0" importlib-metadata = {version = ">=4.13.0", markers = "python_version < \"3.12\""} packaging = ">=20.0" @@ -483,7 +483,7 @@ array = ["numpy (>=1.21)"] complete = ["dask[array,dataframe,diagnostics,distributed]", "lz4 (>=4.3.2)", "pyarrow (>=7.0)", "pyarrow-hotfix"] dataframe = ["dask-expr (>=1.1,<1.2)", "dask[array]", "pandas (>=1.3)"] diagnostics = ["bokeh (>=2.4.2)", "jinja2 (>=2.10.3)"] -distributed = ["distributed (==2024.4.2)"] +distributed = ["distributed (==2024.6.0)"] test = ["pandas[test]", "pre-commit", "pytest", "pytest-cov", "pytest-rerunfailures", "pytest-timeout", "pytest-xdist"] [[package]] @@ -514,19 +514,19 @@ profile = ["gprof2dot (>=2022.7.29)"] [[package]] name = "distributed" -version = "2024.4.2" +version = "2024.6.0" description = "Distributed scheduler for Dask" optional = true python-versions = ">=3.9" files = [ - {file = "distributed-2024.4.2-py3-none-any.whl", hash = "sha256:801d3b5e5fe5273d0da335db527a12568ee9ad3368eba6a735bb852cf6753dac"}, - {file = "distributed-2024.4.2.tar.gz", hash = "sha256:58e86c407f499b782ecc62b712723d05265c7e8c76ee870b1c3c32e4dfcf1893"}, + {file = "distributed-2024.6.0-py3-none-any.whl", hash = "sha256:abe45c53754a7bcd36b7cbb821e1246db5d2b5ebe76c3bd18de1167dcd94d7d6"}, + {file = "distributed-2024.6.0.tar.gz", hash = "sha256:9ed0f822f0159c305415d44ba9a937557f2f03f8d78d539324ef3daf82a17b7b"}, ] [package.dependencies] click = ">=8.0" cloudpickle = ">=1.5.0" -dask = "2024.4.2" +dask = "2024.6.0" jinja2 = ">=2.10.3" locket = ">=1.0.0" msgpack = ">=1.0.0" @@ -694,13 +694,13 @@ woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"] [[package]] name = "fsspec" -version = "2024.5.0" +version = "2024.6.0" description = "File-system specification" optional = true python-versions = ">=3.8" files = [ - {file = "fsspec-2024.5.0-py3-none-any.whl", hash = "sha256:e0fdbc446d67e182f49a70b82cf7889028a63588fde6b222521f10937b2b670c"}, - {file = "fsspec-2024.5.0.tar.gz", hash = "sha256:1d021b0b0f933e3b3029ed808eb400c08ba101ca2de4b3483fbc9ca23fcee94a"}, + {file = "fsspec-2024.6.0-py3-none-any.whl", hash = "sha256:58d7122eb8a1a46f7f13453187bfea4972d66bf01618d37366521b1998034cee"}, + {file = "fsspec-2024.6.0.tar.gz", hash = "sha256:f579960a56e6d8038a9efc8f9c77279ec12e6299aa86b0769a7e9c46b94527c2"}, ] [package.extras] @@ -709,6 +709,7 @@ adl = ["adlfs"] arrow = ["pyarrow (>=1)"] dask = ["dask", "distributed"] dev = ["pre-commit", "ruff"] +doc = ["numpydoc", "sphinx", "sphinx-design", "sphinx-rtd-theme", "yarl"] dropbox = ["dropbox", "dropboxdrivefs", "requests"] full = ["adlfs", "aiohttp (!=4.0.0a0,!=4.0.0a1)", "dask", "distributed", "dropbox", "dropboxdrivefs", "fusepy", "gcsfs", "libarchive-c", "ocifs", "panel", "paramiko", "pyarrow (>=1)", "pygit2", "requests", "s3fs", "smbprotocol", "tqdm"] fuse = ["fusepy"] @@ -840,61 +841,61 @@ test = ["objgraph", "psutil"] [[package]] name = "grpcio" -version = "1.63.0" +version = "1.64.1" description = "HTTP/2-based RPC framework" optional = true python-versions = ">=3.8" files = [ - {file = "grpcio-1.63.0-cp310-cp310-linux_armv7l.whl", hash = "sha256:2e93aca840c29d4ab5db93f94ed0a0ca899e241f2e8aec6334ab3575dc46125c"}, - {file = "grpcio-1.63.0-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:91b73d3f1340fefa1e1716c8c1ec9930c676d6b10a3513ab6c26004cb02d8b3f"}, - {file = "grpcio-1.63.0-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:b3afbd9d6827fa6f475a4f91db55e441113f6d3eb9b7ebb8fb806e5bb6d6bd0d"}, - {file = "grpcio-1.63.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8f3f6883ce54a7a5f47db43289a0a4c776487912de1a0e2cc83fdaec9685cc9f"}, - {file = "grpcio-1.63.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf8dae9cc0412cb86c8de5a8f3be395c5119a370f3ce2e69c8b7d46bb9872c8d"}, - {file = "grpcio-1.63.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:08e1559fd3b3b4468486b26b0af64a3904a8dbc78d8d936af9c1cf9636eb3e8b"}, - {file = "grpcio-1.63.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5c039ef01516039fa39da8a8a43a95b64e288f79f42a17e6c2904a02a319b357"}, - {file = "grpcio-1.63.0-cp310-cp310-win32.whl", hash = "sha256:ad2ac8903b2eae071055a927ef74121ed52d69468e91d9bcbd028bd0e554be6d"}, - {file = "grpcio-1.63.0-cp310-cp310-win_amd64.whl", hash = "sha256:b2e44f59316716532a993ca2966636df6fbe7be4ab6f099de6815570ebe4383a"}, - {file = "grpcio-1.63.0-cp311-cp311-linux_armv7l.whl", hash = "sha256:f28f8b2db7b86c77916829d64ab21ff49a9d8289ea1564a2b2a3a8ed9ffcccd3"}, - {file = "grpcio-1.63.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:65bf975639a1f93bee63ca60d2e4951f1b543f498d581869922910a476ead2f5"}, - {file = "grpcio-1.63.0-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:b5194775fec7dc3dbd6a935102bb156cd2c35efe1685b0a46c67b927c74f0cfb"}, - {file = "grpcio-1.63.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4cbb2100ee46d024c45920d16e888ee5d3cf47c66e316210bc236d5bebc42b3"}, - {file = "grpcio-1.63.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1ff737cf29b5b801619f10e59b581869e32f400159e8b12d7a97e7e3bdeee6a2"}, - {file = "grpcio-1.63.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cd1e68776262dd44dedd7381b1a0ad09d9930ffb405f737d64f505eb7f77d6c7"}, - {file = "grpcio-1.63.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:93f45f27f516548e23e4ec3fbab21b060416007dbe768a111fc4611464cc773f"}, - {file = "grpcio-1.63.0-cp311-cp311-win32.whl", hash = "sha256:878b1d88d0137df60e6b09b74cdb73db123f9579232c8456f53e9abc4f62eb3c"}, - {file = "grpcio-1.63.0-cp311-cp311-win_amd64.whl", hash = "sha256:756fed02dacd24e8f488f295a913f250b56b98fb793f41d5b2de6c44fb762434"}, - {file = "grpcio-1.63.0-cp312-cp312-linux_armv7l.whl", hash = "sha256:93a46794cc96c3a674cdfb59ef9ce84d46185fe9421baf2268ccb556f8f81f57"}, - {file = "grpcio-1.63.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:a7b19dfc74d0be7032ca1eda0ed545e582ee46cd65c162f9e9fc6b26ef827dc6"}, - {file = "grpcio-1.63.0-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:8064d986d3a64ba21e498b9a376cbc5d6ab2e8ab0e288d39f266f0fca169b90d"}, - {file = "grpcio-1.63.0-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:219bb1848cd2c90348c79ed0a6b0ea51866bc7e72fa6e205e459fedab5770172"}, - {file = "grpcio-1.63.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2d60cd1d58817bc5985fae6168d8b5655c4981d448d0f5b6194bbcc038090d2"}, - {file = "grpcio-1.63.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:9e350cb096e5c67832e9b6e018cf8a0d2a53b2a958f6251615173165269a91b0"}, - {file = "grpcio-1.63.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:56cdf96ff82e3cc90dbe8bac260352993f23e8e256e063c327b6cf9c88daf7a9"}, - {file = "grpcio-1.63.0-cp312-cp312-win32.whl", hash = "sha256:3a6d1f9ea965e750db7b4ee6f9fdef5fdf135abe8a249e75d84b0a3e0c668a1b"}, - {file = "grpcio-1.63.0-cp312-cp312-win_amd64.whl", hash = "sha256:d2497769895bb03efe3187fb1888fc20e98a5f18b3d14b606167dacda5789434"}, - {file = "grpcio-1.63.0-cp38-cp38-linux_armv7l.whl", hash = "sha256:fdf348ae69c6ff484402cfdb14e18c1b0054ac2420079d575c53a60b9b2853ae"}, - {file = "grpcio-1.63.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a3abfe0b0f6798dedd2e9e92e881d9acd0fdb62ae27dcbbfa7654a57e24060c0"}, - {file = "grpcio-1.63.0-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:6ef0ad92873672a2a3767cb827b64741c363ebaa27e7f21659e4e31f4d750280"}, - {file = "grpcio-1.63.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b416252ac5588d9dfb8a30a191451adbf534e9ce5f56bb02cd193f12d8845b7f"}, - {file = "grpcio-1.63.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e3b77eaefc74d7eb861d3ffbdf91b50a1bb1639514ebe764c47773b833fa2d91"}, - {file = "grpcio-1.63.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:b005292369d9c1f80bf70c1db1c17c6c342da7576f1c689e8eee4fb0c256af85"}, - {file = "grpcio-1.63.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:cdcda1156dcc41e042d1e899ba1f5c2e9f3cd7625b3d6ebfa619806a4c1aadda"}, - {file = "grpcio-1.63.0-cp38-cp38-win32.whl", hash = "sha256:01799e8649f9e94ba7db1aeb3452188048b0019dc37696b0f5ce212c87c560c3"}, - {file = "grpcio-1.63.0-cp38-cp38-win_amd64.whl", hash = "sha256:6a1a3642d76f887aa4009d92f71eb37809abceb3b7b5a1eec9c554a246f20e3a"}, - {file = "grpcio-1.63.0-cp39-cp39-linux_armv7l.whl", hash = "sha256:75f701ff645858a2b16bc8c9fc68af215a8bb2d5a9b647448129de6e85d52bce"}, - {file = "grpcio-1.63.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:cacdef0348a08e475a721967f48206a2254a1b26ee7637638d9e081761a5ba86"}, - {file = "grpcio-1.63.0-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:0697563d1d84d6985e40ec5ec596ff41b52abb3fd91ec240e8cb44a63b895094"}, - {file = "grpcio-1.63.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6426e1fb92d006e47476d42b8f240c1d916a6d4423c5258ccc5b105e43438f61"}, - {file = "grpcio-1.63.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e48cee31bc5f5a31fb2f3b573764bd563aaa5472342860edcc7039525b53e46a"}, - {file = "grpcio-1.63.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:50344663068041b34a992c19c600236e7abb42d6ec32567916b87b4c8b8833b3"}, - {file = "grpcio-1.63.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:259e11932230d70ef24a21b9fb5bb947eb4703f57865a404054400ee92f42f5d"}, - {file = "grpcio-1.63.0-cp39-cp39-win32.whl", hash = "sha256:a44624aad77bf8ca198c55af811fd28f2b3eaf0a50ec5b57b06c034416ef2d0a"}, - {file = "grpcio-1.63.0-cp39-cp39-win_amd64.whl", hash = "sha256:166e5c460e5d7d4656ff9e63b13e1f6029b122104c1633d5f37eaea348d7356d"}, - {file = "grpcio-1.63.0.tar.gz", hash = "sha256:f3023e14805c61bc439fb40ca545ac3d5740ce66120a678a3c6c2c55b70343d1"}, -] - -[package.extras] -protobuf = ["grpcio-tools (>=1.63.0)"] + {file = "grpcio-1.64.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:55697ecec192bc3f2f3cc13a295ab670f51de29884ca9ae6cd6247df55df2502"}, + {file = "grpcio-1.64.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:3b64ae304c175671efdaa7ec9ae2cc36996b681eb63ca39c464958396697daff"}, + {file = "grpcio-1.64.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:bac71b4b28bc9af61efcdc7630b166440bbfbaa80940c9a697271b5e1dabbc61"}, + {file = "grpcio-1.64.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c024ffc22d6dc59000faf8ad781696d81e8e38f4078cb0f2630b4a3cf231a90"}, + {file = "grpcio-1.64.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7cd5c1325f6808b8ae31657d281aadb2a51ac11ab081ae335f4f7fc44c1721d"}, + {file = "grpcio-1.64.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0a2813093ddb27418a4c99f9b1c223fab0b053157176a64cc9db0f4557b69bd9"}, + {file = "grpcio-1.64.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2981c7365a9353f9b5c864595c510c983251b1ab403e05b1ccc70a3d9541a73b"}, + {file = "grpcio-1.64.1-cp310-cp310-win32.whl", hash = "sha256:1262402af5a511c245c3ae918167eca57342c72320dffae5d9b51840c4b2f86d"}, + {file = "grpcio-1.64.1-cp310-cp310-win_amd64.whl", hash = "sha256:19264fc964576ddb065368cae953f8d0514ecc6cb3da8903766d9fb9d4554c33"}, + {file = "grpcio-1.64.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:58b1041e7c870bb30ee41d3090cbd6f0851f30ae4eb68228955d973d3efa2e61"}, + {file = "grpcio-1.64.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:bbc5b1d78a7822b0a84c6f8917faa986c1a744e65d762ef6d8be9d75677af2ca"}, + {file = "grpcio-1.64.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:5841dd1f284bd1b3d8a6eca3a7f062b06f1eec09b184397e1d1d43447e89a7ae"}, + {file = "grpcio-1.64.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8caee47e970b92b3dd948371230fcceb80d3f2277b3bf7fbd7c0564e7d39068e"}, + {file = "grpcio-1.64.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:73819689c169417a4f978e562d24f2def2be75739c4bed1992435d007819da1b"}, + {file = "grpcio-1.64.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6503b64c8b2dfad299749cad1b595c650c91e5b2c8a1b775380fcf8d2cbba1e9"}, + {file = "grpcio-1.64.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1de403fc1305fd96cfa75e83be3dee8538f2413a6b1685b8452301c7ba33c294"}, + {file = "grpcio-1.64.1-cp311-cp311-win32.whl", hash = "sha256:d4d29cc612e1332237877dfa7fe687157973aab1d63bd0f84cf06692f04c0367"}, + {file = "grpcio-1.64.1-cp311-cp311-win_amd64.whl", hash = "sha256:5e56462b05a6f860b72f0fa50dca06d5b26543a4e88d0396259a07dc30f4e5aa"}, + {file = "grpcio-1.64.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:4657d24c8063e6095f850b68f2d1ba3b39f2b287a38242dcabc166453e950c59"}, + {file = "grpcio-1.64.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:62b4e6eb7bf901719fce0ca83e3ed474ae5022bb3827b0a501e056458c51c0a1"}, + {file = "grpcio-1.64.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:ee73a2f5ca4ba44fa33b4d7d2c71e2c8a9e9f78d53f6507ad68e7d2ad5f64a22"}, + {file = "grpcio-1.64.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:198908f9b22e2672a998870355e226a725aeab327ac4e6ff3a1399792ece4762"}, + {file = "grpcio-1.64.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39b9d0acaa8d835a6566c640f48b50054f422d03e77e49716d4c4e8e279665a1"}, + {file = "grpcio-1.64.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:5e42634a989c3aa6049f132266faf6b949ec2a6f7d302dbb5c15395b77d757eb"}, + {file = "grpcio-1.64.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b1a82e0b9b3022799c336e1fc0f6210adc019ae84efb7321d668129d28ee1efb"}, + {file = "grpcio-1.64.1-cp312-cp312-win32.whl", hash = "sha256:55260032b95c49bee69a423c2f5365baa9369d2f7d233e933564d8a47b893027"}, + {file = "grpcio-1.64.1-cp312-cp312-win_amd64.whl", hash = "sha256:c1a786ac592b47573a5bb7e35665c08064a5d77ab88a076eec11f8ae86b3e3f6"}, + {file = "grpcio-1.64.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:a011ac6c03cfe162ff2b727bcb530567826cec85eb8d4ad2bfb4bd023287a52d"}, + {file = "grpcio-1.64.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4d6dab6124225496010bd22690f2d9bd35c7cbb267b3f14e7a3eb05c911325d4"}, + {file = "grpcio-1.64.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a5e771d0252e871ce194d0fdcafd13971f1aae0ddacc5f25615030d5df55c3a2"}, + {file = "grpcio-1.64.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2c3c1b90ab93fed424e454e93c0ed0b9d552bdf1b0929712b094f5ecfe7a23ad"}, + {file = "grpcio-1.64.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20405cb8b13fd779135df23fabadc53b86522d0f1cba8cca0e87968587f50650"}, + {file = "grpcio-1.64.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:0cc79c982ccb2feec8aad0e8fb0d168bcbca85bc77b080d0d3c5f2f15c24ea8f"}, + {file = "grpcio-1.64.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a3a035c37ce7565b8f4f35ff683a4db34d24e53dc487e47438e434eb3f701b2a"}, + {file = "grpcio-1.64.1-cp38-cp38-win32.whl", hash = "sha256:1257b76748612aca0f89beec7fa0615727fd6f2a1ad580a9638816a4b2eb18fd"}, + {file = "grpcio-1.64.1-cp38-cp38-win_amd64.whl", hash = "sha256:0a12ddb1678ebc6a84ec6b0487feac020ee2b1659cbe69b80f06dbffdb249122"}, + {file = "grpcio-1.64.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:75dbbf415026d2862192fe1b28d71f209e2fd87079d98470db90bebe57b33179"}, + {file = "grpcio-1.64.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e3d9f8d1221baa0ced7ec7322a981e28deb23749c76eeeb3d33e18b72935ab62"}, + {file = "grpcio-1.64.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:5f8b75f64d5d324c565b263c67dbe4f0af595635bbdd93bb1a88189fc62ed2e5"}, + {file = "grpcio-1.64.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c84ad903d0d94311a2b7eea608da163dace97c5fe9412ea311e72c3684925602"}, + {file = "grpcio-1.64.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:940e3ec884520155f68a3b712d045e077d61c520a195d1a5932c531f11883489"}, + {file = "grpcio-1.64.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f10193c69fc9d3d726e83bbf0f3d316f1847c3071c8c93d8090cf5f326b14309"}, + {file = "grpcio-1.64.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ac15b6c2c80a4d1338b04d42a02d376a53395ddf0ec9ab157cbaf44191f3ffdd"}, + {file = "grpcio-1.64.1-cp39-cp39-win32.whl", hash = "sha256:03b43d0ccf99c557ec671c7dede64f023c7da9bb632ac65dbc57f166e4970040"}, + {file = "grpcio-1.64.1-cp39-cp39-win_amd64.whl", hash = "sha256:ed6091fa0adcc7e4ff944090cf203a52da35c37a130efa564ded02b7aff63bcd"}, + {file = "grpcio-1.64.1.tar.gz", hash = "sha256:8d51dd1c59d5fa0f34266b80a3805ec29a1f26425c2a54736133f6d87fc4968a"}, +] + +[package.extras] +protobuf = ["grpcio-tools (>=1.64.1)"] [[package]] name = "h5py" @@ -1283,6 +1284,7 @@ description = "Clang Python Bindings, mirrored from the official LLVM repo: http optional = true python-versions = "*" files = [ + {file = "libclang-18.1.1-py2.py3-none-macosx_10_9_x86_64.whl", hash = "sha256:6f14c3f194704e5d09769108f03185fce7acaf1d1ae4bbb2f30a72c2400cb7c5"}, {file = "libclang-18.1.1-py2.py3-none-macosx_11_0_arm64.whl", hash = "sha256:83ce5045d101b669ac38e6da8e58765f12da2d3aafb3b9b98d88b286a60964d8"}, {file = "libclang-18.1.1-py2.py3-none-manylinux2010_x86_64.whl", hash = "sha256:c533091d8a3bbf7460a00cb6c1a71da93bffe148f172c7d03b1c31fbf8aa2a0b"}, {file = "libclang-18.1.1-py2.py3-none-manylinux2014_aarch64.whl", hash = "sha256:54dda940a4a0491a9d1532bf071ea3ef26e6dbaf03b5000ed94dd7174e8f9592"}, @@ -1592,9 +1594,9 @@ files = [ [package.dependencies] numpy = [ + {version = ">=1.21.2", markers = "python_version >= \"3.10\" and python_version < \"3.11\""}, {version = ">1.20", markers = "python_version < \"3.10\""}, - {version = ">=1.21.2", markers = "python_version >= \"3.10\""}, - {version = ">=1.23.3", markers = "python_version >= \"3.11\""}, + {version = ">=1.23.3", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, {version = ">=1.26.0", markers = "python_version >= \"3.12\""}, ] @@ -1729,7 +1731,7 @@ tests = ["hypothesis", "pytest", "pytest-mpl"] type = "git" url = "https://github.com/NNPDF/nnpdf" reference = "HEAD" -resolved_reference = "400e5c1d543ea30dd8d497729a31bca0ab479bb8" +resolved_reference = "761ab4c99f0fe2ef944b08090b238725def51532" [[package]] name = "numba" @@ -1890,13 +1892,13 @@ torch = ["torch"] [[package]] name = "packaging" -version = "24.0" +version = "24.1" description = "Core utilities for Python packages" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, - {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, + {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"}, + {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"}, ] [[package]] @@ -2244,18 +2246,18 @@ test = ["pytest", "pytest-cov"] type = "git" url = "https://github.com/NNPDF/pineappl.git" reference = "extend_eko_convolution" -resolved_reference = "4222163499b1bb1c5f01895ed599c98177e26018" +resolved_reference = "e236b3c4dc8415577d0142bce450084d97a0231f" subdirectory = "pineappl_py" [[package]] name = "platformdirs" -version = "4.2.1" +version = "4.2.2" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.2.1-py3-none-any.whl", hash = "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"}, - {file = "platformdirs-4.2.1.tar.gz", hash = "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf"}, + {file = "platformdirs-4.2.2-py3-none-any.whl", hash = "sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee"}, + {file = "platformdirs-4.2.2.tar.gz", hash = "sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3"}, ] [package.extras] @@ -2280,13 +2282,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "prompt-toolkit" -version = "3.0.45" +version = "3.0.47" description = "Library for building powerful interactive command lines in Python" optional = false python-versions = ">=3.7.0" files = [ - {file = "prompt_toolkit-3.0.45-py3-none-any.whl", hash = "sha256:a29b89160e494e3ea8622b09fa5897610b437884dcdcd054fdc1308883326c2a"}, - {file = "prompt_toolkit-3.0.45.tar.gz", hash = "sha256:07c60ee4ab7b7e90824b61afa840c8f5aad2d46b3e2e10acc33d8ecc94a49089"}, + {file = "prompt_toolkit-3.0.47-py3-none-any.whl", hash = "sha256:0d7bfa67001d5e39d02c224b663abc33687405033a8c422d0d675a5a13361d10"}, + {file = "prompt_toolkit-3.0.47.tar.gz", hash = "sha256:1e1b29cb58080b1e69f207c893a1a7bf16d127a5c30c9d17a25a5d77792e5360"}, ] [package.dependencies] @@ -2314,27 +2316,28 @@ files = [ [[package]] name = "psutil" -version = "5.9.8" +version = "6.0.0" description = "Cross-platform lib for process and system monitoring in Python." optional = true -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"}, - {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"}, - {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"}, - {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"}, - {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"}, - {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"}, - {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"}, - {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"}, - {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"}, - {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"}, - {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"}, - {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"}, - {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"}, - {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"}, - {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"}, - {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"}, +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" +files = [ + {file = "psutil-6.0.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a021da3e881cd935e64a3d0a20983bda0bb4cf80e4f74fa9bfcb1bc5785360c6"}, + {file = "psutil-6.0.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:1287c2b95f1c0a364d23bc6f2ea2365a8d4d9b726a3be7294296ff7ba97c17f0"}, + {file = "psutil-6.0.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a9a3dbfb4de4f18174528d87cc352d1f788b7496991cca33c6996f40c9e3c92c"}, + {file = "psutil-6.0.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:6ec7588fb3ddaec7344a825afe298db83fe01bfaaab39155fa84cf1c0d6b13c3"}, + {file = "psutil-6.0.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:1e7c870afcb7d91fdea2b37c24aeb08f98b6d67257a5cb0a8bc3ac68d0f1a68c"}, + {file = "psutil-6.0.0-cp27-none-win32.whl", hash = "sha256:02b69001f44cc73c1c5279d02b30a817e339ceb258ad75997325e0e6169d8b35"}, + {file = "psutil-6.0.0-cp27-none-win_amd64.whl", hash = "sha256:21f1fb635deccd510f69f485b87433460a603919b45e2a324ad65b0cc74f8fb1"}, + {file = "psutil-6.0.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c588a7e9b1173b6e866756dde596fd4cad94f9399daf99ad8c3258b3cb2b47a0"}, + {file = "psutil-6.0.0-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ed2440ada7ef7d0d608f20ad89a04ec47d2d3ab7190896cd62ca5fc4fe08bf0"}, + {file = "psutil-6.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fd9a97c8e94059b0ef54a7d4baf13b405011176c3b6ff257c247cae0d560ecd"}, + {file = "psutil-6.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e8d0054fc88153ca0544f5c4d554d42e33df2e009c4ff42284ac9ebdef4132"}, + {file = "psutil-6.0.0-cp36-cp36m-win32.whl", hash = "sha256:fc8c9510cde0146432bbdb433322861ee8c3efbf8589865c8bf8d21cb30c4d14"}, + {file = "psutil-6.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:34859b8d8f423b86e4385ff3665d3f4d94be3cdf48221fbe476e883514fdb71c"}, + {file = "psutil-6.0.0-cp37-abi3-win32.whl", hash = "sha256:a495580d6bae27291324fe60cea0b5a7c23fa36a7cd35035a16d93bdcf076b9d"}, + {file = "psutil-6.0.0-cp37-abi3-win_amd64.whl", hash = "sha256:33ea5e1c975250a720b3a6609c490db40dae5d83a4eb315170c4fe0d8b1f34b3"}, + {file = "psutil-6.0.0-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:ffe7fc9b6b36beadc8c322f84e1caff51e8703b88eee1da46d1e3a6ae11b4fd0"}, + {file = "psutil-6.0.0.tar.gz", hash = "sha256:8faae4f310b6d969fa26ca0545338b21f73c6b15db7c4a8d934a5482faa818f2"}, ] [package.extras] @@ -2426,13 +2429,13 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pylint" -version = "3.2.2" +version = "3.2.3" description = "python code static checker" optional = false python-versions = ">=3.8.0" files = [ - {file = "pylint-3.2.2-py3-none-any.whl", hash = "sha256:3f8788ab20bb8383e06dd2233e50f8e08949cfd9574804564803441a4946eab4"}, - {file = "pylint-3.2.2.tar.gz", hash = "sha256:d068ca1dfd735fb92a07d33cb8f288adc0f6bc1287a139ca2425366f7cbe38f8"}, + {file = "pylint-3.2.3-py3-none-any.whl", hash = "sha256:b3d7d2708a3e04b4679e02d99e72329a8b7ee8afb8d04110682278781f889fa8"}, + {file = "pylint-3.2.3.tar.gz", hash = "sha256:02f6c562b215582386068d52a30f520d84fdbcf2a95fc7e855b816060d048b60"}, ] [package.dependencies] @@ -2440,7 +2443,7 @@ astroid = ">=3.2.2,<=3.3.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} dill = [ {version = ">=0.2", markers = "python_version < \"3.11\""}, - {version = ">=0.3.6", markers = "python_version >= \"3.11\""}, + {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, ] isort = ">=4.2.5,<5.13.0 || >5.13.0,<6" @@ -2719,7 +2722,6 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -3247,7 +3249,7 @@ files = [ ] [package.dependencies] -greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"win32\" or platform_machine == \"WIN32\" or platform_machine == \"AMD64\" or platform_machine == \"amd64\" or platform_machine == \"x86_64\" or platform_machine == \"ppc64le\" or platform_machine == \"aarch64\")"} +greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\")"} [package.extras] aiomysql = ["aiomysql (>=0.2.0)", "greenlet (!=0.4.17)"] @@ -3473,22 +3475,22 @@ files = [ [[package]] name = "tornado" -version = "6.4" +version = "6.4.1" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." optional = true -python-versions = ">= 3.8" +python-versions = ">=3.8" files = [ - {file = "tornado-6.4-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:02ccefc7d8211e5a7f9e8bc3f9e5b0ad6262ba2fbb683a6443ecc804e5224ce0"}, - {file = "tornado-6.4-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:27787de946a9cffd63ce5814c33f734c627a87072ec7eed71f7fc4417bb16263"}, - {file = "tornado-6.4-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f7894c581ecdcf91666a0912f18ce5e757213999e183ebfc2c3fdbf4d5bd764e"}, - {file = "tornado-6.4-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e43bc2e5370a6a8e413e1e1cd0c91bedc5bd62a74a532371042a18ef19e10579"}, - {file = "tornado-6.4-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0251554cdd50b4b44362f73ad5ba7126fc5b2c2895cc62b14a1c2d7ea32f212"}, - {file = "tornado-6.4-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:fd03192e287fbd0899dd8f81c6fb9cbbc69194d2074b38f384cb6fa72b80e9c2"}, - {file = "tornado-6.4-cp38-abi3-musllinux_1_1_i686.whl", hash = "sha256:88b84956273fbd73420e6d4b8d5ccbe913c65d31351b4c004ae362eba06e1f78"}, - {file = "tornado-6.4-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:71ddfc23a0e03ef2df1c1397d859868d158c8276a0603b96cf86892bff58149f"}, - {file = "tornado-6.4-cp38-abi3-win32.whl", hash = "sha256:6f8a6c77900f5ae93d8b4ae1196472d0ccc2775cc1dfdc9e7727889145c45052"}, - {file = "tornado-6.4-cp38-abi3-win_amd64.whl", hash = "sha256:10aeaa8006333433da48dec9fe417877f8bcc21f48dda8d661ae79da357b2a63"}, - {file = "tornado-6.4.tar.gz", hash = "sha256:72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee"}, + {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:163b0aafc8e23d8cdc3c9dfb24c5368af84a81e3364745ccb4427669bf84aec8"}, + {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6d5ce3437e18a2b66fbadb183c1d3364fb03f2be71299e7d10dbeeb69f4b2a14"}, + {file = "tornado-6.4.1-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e20b9113cd7293f164dc46fffb13535266e713cdb87bd2d15ddb336e96cfc4"}, + {file = "tornado-6.4.1-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ae50a504a740365267b2a8d1a90c9fbc86b780a39170feca9bcc1787ff80842"}, + {file = "tornado-6.4.1-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613bf4ddf5c7a95509218b149b555621497a6cc0d46ac341b30bd9ec19eac7f3"}, + {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:25486eb223babe3eed4b8aecbac33b37e3dd6d776bc730ca14e1bf93888b979f"}, + {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:454db8a7ecfcf2ff6042dde58404164d969b6f5d58b926da15e6b23817950fc4"}, + {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a02a08cc7a9314b006f653ce40483b9b3c12cda222d6a46d4ac63bb6c9057698"}, + {file = "tornado-6.4.1-cp38-abi3-win32.whl", hash = "sha256:d9a566c40b89757c9aa8e6f032bcdb8ca8795d7c1a9762910c722b1635c9de4d"}, + {file = "tornado-6.4.1-cp38-abi3-win_amd64.whl", hash = "sha256:b24b8982ed444378d7f21d563f4180a2de31ced9d8d84443907a0a64da2072e7"}, + {file = "tornado-6.4.1.tar.gz", hash = "sha256:92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9"}, ] [[package]] @@ -3528,13 +3530,13 @@ test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0, [[package]] name = "typing-extensions" -version = "4.12.1" +version = "4.12.2" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.12.1-py3-none-any.whl", hash = "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a"}, - {file = "typing_extensions-4.12.1.tar.gz", hash = "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"}, + {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"}, + {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] [[package]] @@ -3550,13 +3552,13 @@ files = [ [[package]] name = "urllib3" -version = "2.2.1" +version = "2.2.2" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.8" files = [ - {file = "urllib3-2.2.1-py3-none-any.whl", hash = "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d"}, - {file = "urllib3-2.2.1.tar.gz", hash = "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"}, + {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"}, + {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"}, ] [package.extras] @@ -3731,18 +3733,18 @@ files = [ [[package]] name = "zipp" -version = "3.19.1" +version = "3.19.2" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.19.1-py3-none-any.whl", hash = "sha256:2828e64edb5386ea6a52e7ba7cdb17bb30a73a858f5eb6eb93d8d36f5ea26091"}, - {file = "zipp-3.19.1.tar.gz", hash = "sha256:35427f6d5594f4acf82d25541438348c26736fa9b3afa2754bcd63cdb99d8e8f"}, + {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"}, + {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"}, ] [package.extras] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] +test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [extras] docs = [] From 453bc459760b6f8e45101a2431079b2a60cc375b Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 8 Jul 2024 15:10:33 +0200 Subject: [PATCH 25/66] fix inherit ekos --- src/pineko/theory.py | 59 ++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 1ad844bd..d6d6154a 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -24,6 +24,29 @@ logger = logging.getLogger(__name__) +def get_eko_names(grid, name): + """Find eko names. + + Parameters + ---------- + name : str + grid name, i.e. it's true stem + grid : pathlib.Path + path to grid + """ + grid_kv = pineappl.grid.Grid.read(grid).key_values() + conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(grid_kv) + names = [] + if conv_type_b is None or conv_type_a == conv_type_b: + names = [name] + else: + names = [ + f"{name}_{conv_type_a}", + f"{name}_{conv_type_b}", + ] + return names + + def check_scvar_evolve(grid, max_as, max_al, kind: check.Scale): """Check scale variations and central orders consistency.""" available, max_as_effective = check.contains_sv(grid, max_as, max_al, kind) @@ -169,7 +192,7 @@ def inherit_grids(self, target_theory_id): other.mkdir(exist_ok=True) self.iterate(self.inherit_grid, other=other) - def inherit_eko(self, name, _grid, other): + def inherit_eko(self, name, grid, other): """Inherit a EKO to a new theory. Parameters @@ -181,17 +204,19 @@ def inherit_eko(self, name, _grid, other): other : pathlib.Path new folder """ - eko_path = self.ekos_path() / f"{name}.tar" - new = other / f"{name}.tar" - if new.exists(): - if not self.overwrite: - rich.print(f"Skipping existing eko {new}") - return - new.unlink() - # link - new.symlink_to(eko_path) - if new.exists(): - rich.print(f"[green]Success:[/] Created link at {new}") + names = get_eko_names(grid, name) + for name in names: + eko_path = self.ekos_path() / f"{name}.tar" + new = other / f"{name}.tar" + if new.exists(): + if not self.overwrite: + rich.print(f"Skipping existing eko {new}") + return + new.unlink() + # link + new.symlink_to(eko_path) + if new.exists(): + rich.print(f"[green]Success:[/] Created link at {new}") def inherit_ekos(self, target_theory_id): """Inherit ekos to a new theory. @@ -320,15 +345,7 @@ def eko(self, name, grid, tcard): paths["logs"]["eko"], f"{self.theory_id}-{name}.log", ("eko",) ) # setup data - grid_kv = pineappl.grid.Grid.read(grid).key_values() - conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(grid_kv) - if conv_type_b is None or conv_type_a == conv_type_b: - names = [name] - else: - names = [ - f"{name}_{conv_type_a}", - f"{name}_{conv_type_b}", - ] + names = get_eko_names(grid, name) for name in names: ocard = self.load_operator_card(name) From adf5bb817bdcb99d215f43e55862668084f6ead7 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 8 Jul 2024 15:17:50 +0200 Subject: [PATCH 26/66] more on ekos names --- src/pineko/theory.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index d6d6154a..517a71c4 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -427,18 +427,8 @@ def fk(self, name, grid_path, tcard, pdf): grid.optimize() # Do you need one or multiple ekos? - kv = grid.key_values() - conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(kv) - - # setup data - if conv_type_b is None or conv_type_a == conv_type_b: - eko_filename = [self.ekos_path() / f"{name}.tar"] - else: - eko_filename = [ - self.ekos_path() / f"{name}_{conv_type_a}.tar", - self.ekos_path() / f"{name}_{conv_type_b}.tar", - ] - + names = get_eko_names(grid, name) + eko_filename = [self.ekos_path() / f"{ekoname}.tar" for ekoname in names] fk_filename = self.fks_path / f"{name}.{parser.EXT}" if fk_filename.exists(): if not self.overwrite: From c847c48270384834433e9251f4e8aa84b2148b37 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Mon, 8 Jul 2024 15:31:13 +0200 Subject: [PATCH 27/66] fix path type --- src/pineko/theory.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 517a71c4..c5533399 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -24,17 +24,17 @@ logger = logging.getLogger(__name__) -def get_eko_names(grid, name): +def get_eko_names(grid_path, name): """Find eko names. Parameters ---------- + grid_path : pathlib.Path + path to grid name : str grid name, i.e. it's true stem - grid : pathlib.Path - path to grid """ - grid_kv = pineappl.grid.Grid.read(grid).key_values() + grid_kv = pineappl.grid.Grid.read(grid_path).key_values() conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(grid_kv) names = [] if conv_type_b is None or conv_type_a == conv_type_b: @@ -427,7 +427,7 @@ def fk(self, name, grid_path, tcard, pdf): grid.optimize() # Do you need one or multiple ekos? - names = get_eko_names(grid, name) + names = get_eko_names(grid_path, name) eko_filename = [self.ekos_path() / f"{ekoname}.tar" for ekoname in names] fk_filename = self.fks_path / f"{name}.{parser.EXT}" if fk_filename.exists(): From cc0830192180ef24ae086dbaee1d6995e1d62ab8 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 16 Jul 2024 11:46:20 +0200 Subject: [PATCH 28/66] update evolve method --- src/pineko/evolve.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 9eaa388d..9cd0b22b 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -370,20 +370,21 @@ def xgrid_reshape(operators): for mur2 in mur2_grid ] # We need to use ekompatibility in order to pass a dictionary to pineappl - - fktable = grid.evolve( - ekompatibility.pineappl_layout(operators_a), - xir * xir * mur2_grid, - alphas_values, - operators_b=( - ekompatibility.pineappl_layout(operators_b) - if operators_b is not None - else None - ), - lumi_id_types="evol", - order_mask=order_mask, - xi=(xir, xif), - ) + if operators_b is not None: + fktable = grid.evolve_with_slice_iter2( + ekompatibility.pineappl_layout(operators_a), + ekompatibility.pineappl_layout(operators_b), + alphas_table=alphas_values, + xi=(xir, xif), + order_mask=order_mask, + ) + else: + fktable = grid.evolve_with_slice_iter( + ekompatibility.pineappl_layout(operators_a), + alphas_table=alphas_values, + xi=(xir, xif), + order_mask=order_mask, + ) rich.print(f"Optimizing for {assumptions}") fktable.optimize(assumptions) fktable.set_key_value("eko_version", operators_a.metadata.version) From 91376439545c37e455bc7aed113b41bab22a540d Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 16 Jul 2024 13:34:40 +0200 Subject: [PATCH 29/66] covolute -> convolve --- benchmarks/bench_cli.py | 4 ++-- docs/source/overview/running.rst | 8 ++++---- src/pineko/cli/__init__.py | 2 +- src/pineko/cli/{convolute.py => convolve.py} | 4 ++-- src/pineko/comparator.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename src/pineko/cli/{convolute.py => convolve.py} (98%) diff --git a/benchmarks/bench_cli.py b/benchmarks/bench_cli.py index 86a1b29e..76547f99 100644 --- a/benchmarks/bench_cli.py +++ b/benchmarks/bench_cli.py @@ -86,7 +86,7 @@ def benchmark_compare_cli(lhapdf_path, test_files, test_pdf): assert "yll left" in result.output -def benchmark_convolute_cli(test_files, tmp_path): +def benchmark_convolve_cli(test_files, tmp_path): grid_path = pathlib.Path( test_files / "data/grids/400/HERA_NC_225GEV_EP_SIGMARED.pineappl.lz4" ) @@ -95,7 +95,7 @@ def benchmark_convolute_cli(test_files, tmp_path): runner = CliRunner() result = runner.invoke( command, - ["convolute", str(grid_path), str(eko_path), str(fk_path), "2", "0"], + ["convolve", str(grid_path), str(eko_path), str(fk_path), "2", "0"], ) assert "Optimizing for Nf6Ind" in result.output diff --git a/docs/source/overview/running.rst b/docs/source/overview/running.rst index 8553cc1e..e2920989 100644 --- a/docs/source/overview/running.rst +++ b/docs/source/overview/running.rst @@ -44,13 +44,13 @@ Generating the FK Table ----------------------- You need to have the |EKO| computed in the previous step. -Then you can convolute the |EKO| with the grids by running:: +Then you can convolve the |EKO| with the grids by running:: pineko theory fks THEORY_ID DATASET1 DATASET2 ... -Note that you can also convolute a single grid with a single eko (obtaining a single FK table) by running:: +Note that you can also convolve a single grid with a single eko (obtaining a single FK table) by running:: - pineko convolute GRID OPCARD FKTABLE MAX_AS MAX_AL + pineko convolve GRID OPCARD FKTABLE MAX_AS MAX_AL If necessary it is possible to specify the values of the *renormalization* and *factorization* scale variations with the options ``--xir`` and ``--xif``. @@ -89,7 +89,7 @@ Comparing grids and FK tables """"""""""""""""""""""""""""" With the command ``pineko compare`` it is possible to compare the predictions as provided by the grid -(convoluted with a |PDF|) with the predictions as provided by the |FK| table. This is done like +(convolved with a |PDF|) with the predictions as provided by the |FK| table. This is done like pineko compare GRID FKTABLE MAX_AS MAX_AL PDF diff --git a/src/pineko/cli/__init__.py b/src/pineko/cli/__init__.py index 58491a44..005d6528 100644 --- a/src/pineko/cli/__init__.py +++ b/src/pineko/cli/__init__.py @@ -3,7 +3,7 @@ from . import ( check, compare, - convolute, + convolve, fonll, gen_sv, kfactor, diff --git a/src/pineko/cli/convolute.py b/src/pineko/cli/convolve.py similarity index 98% rename from src/pineko/cli/convolute.py rename to src/pineko/cli/convolve.py index 3aa91022..b5fbfebe 100644 --- a/src/pineko/cli/convolute.py +++ b/src/pineko/cli/convolve.py @@ -9,7 +9,7 @@ from ._base import command -@command.command("convolute") +@command.command("convolve") @click.argument("grid_path", type=click.Path(exists=True)) @click.argument("op_path", type=click.Path(exists=True)) @click.argument("fktable", type=click.Path()) @@ -32,7 +32,7 @@ def subcommand( ): """Convolute PineAPPL grid and EKO into an FK table. - GRID_PATH and OP_PATH are the path to the respective elements to convolute, and + GRID_PATH and OP_PATH are the path to the respective elements to convolve, and FKTABLE is the path where to dump the output. MAX_AS and MAX_AL are used to specify the order in QCD and QED diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index f19a90b4..090b9026 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -13,7 +13,7 @@ def compare(pine, fktable, max_as, max_al, pdf, xir, xif): pine : pineappl.grid.Grid uncovoluted grid fktable : pineappl.fktable.FkTable - convoluted grid + convolved grid max_as : int maximum power of strong coupling max_al : int From d62dac4e332529f016f7e139cad28cf17bfd77a8 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Tue, 16 Jul 2024 13:35:25 +0200 Subject: [PATCH 30/66] update ekocompatibility layout --- src/pineko/ekompatibility.py | 35 ++++++++++++++++------------------- src/pineko/evolve.py | 16 +++++++++------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/pineko/ekompatibility.py b/src/pineko/ekompatibility.py index 028c2498..b658f904 100644 --- a/src/pineko/ekompatibility.py +++ b/src/pineko/ekompatibility.py @@ -1,12 +1,11 @@ """Compatibility layer for EKO migration.""" -from typing import Any, Dict - from eko import EKO, basis_rotation +from pineappl.grid import PyOperatorSliceInfo, PyPidBasis -def pineappl_layout(operator: EKO) -> Dict[str, Any]: - """Extract information required by :func:`pineappl.grid.Grid.convolute_eko`. +def pineappl_layout(operator: EKO) -> list: + """Extract information required by :func:`pineappl.grid.Grid.convolve_eko`. Parameters ---------- @@ -19,18 +18,16 @@ def pineappl_layout(operator: EKO) -> Dict[str, Any]: a minimal object, with all and only the information consumed by PineAPPL """ - oldgrid = {} - oldgrid["Q2grid"] = {} - for q2, op in operator.items(): - oldop = dict(operators=op.operator) - oldgrid["Q2grid"][q2[0]] = oldop - - oldgrid["q2_ref"] = operator.mu20 - oldgrid["targetpids"] = operator.bases.targetpids - oldgrid["targetgrid"] = operator.bases.targetgrid.raw - # The EKO contains the rotation matrix but we pass the list of - # evol basis pids to pineappl. - oldgrid["inputpids"] = basis_rotation.evol_basis_pids - oldgrid["inputgrid"] = operator.bases.inputgrid.raw - - return oldgrid + eko_iterator = [] + for (q2, _), op in operator.items(): + info = PyOperatorSliceInfo( + fac0=operator.mu20, + x0=operator.bases.inputgrid.raw, + pids0=basis_rotation.evol_basis_pids, + fac1=q2, + x1=operator.bases.targetgrid.raw, + pids1=operator.bases.targetpids, + pid_basis=PyPidBasis.Pdg, + ) + eko_iterator.append((info, op.operator)) + return eko_iterator diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 9cd0b22b..eec37c67 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -18,6 +18,7 @@ from eko.io.types import ScaleVariationsMethod from eko.matchings import Atlas, nf_default from eko.quantities import heavy_quarks +from pineappl.fk_table import PyFkAssumptions from . import check, comparator, ekompatibility, version @@ -285,11 +286,11 @@ def evolve_grid( Parameters ---------- grid : pineappl.grid.Grid - unconvoluted grid + unconvolved grid operators_a : eko.EKO evolution operator fktable_path : str - target path for convoluted grid + target path for convolved grid max_as : int maximum power of strong coupling max_al : int @@ -372,21 +373,22 @@ def xgrid_reshape(operators): # We need to use ekompatibility in order to pass a dictionary to pineappl if operators_b is not None: fktable = grid.evolve_with_slice_iter2( - ekompatibility.pineappl_layout(operators_a), - ekompatibility.pineappl_layout(operators_b), + iter(ekompatibility.pineappl_layout(operators_a)), + iter(ekompatibility.pineappl_layout(operators_b)), alphas_table=alphas_values, xi=(xir, xif), order_mask=order_mask, ) else: fktable = grid.evolve_with_slice_iter( - ekompatibility.pineappl_layout(operators_a), - alphas_table=alphas_values, + iter(ekompatibility.pineappl_layout(operators_a)), + ren1=mur2_grid, + alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, ) rich.print(f"Optimizing for {assumptions}") - fktable.optimize(assumptions) + fktable.optimize(PyFkAssumptions(assumptions)) fktable.set_key_value("eko_version", operators_a.metadata.version) fktable.set_key_value("eko_theory_card", json.dumps(operators_a.theory_card.raw)) From b1c8c78deabda2863581fd79248c3ea5ff96897f Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 17 Jul 2024 13:06:53 +0200 Subject: [PATCH 31/66] remove ekocomaptibility --- src/pineko/ekompatibility.py | 33 --------------------------------- src/pineko/evolve.py | 25 ++++++++++++++++++++----- 2 files changed, 20 insertions(+), 38 deletions(-) delete mode 100644 src/pineko/ekompatibility.py diff --git a/src/pineko/ekompatibility.py b/src/pineko/ekompatibility.py deleted file mode 100644 index b658f904..00000000 --- a/src/pineko/ekompatibility.py +++ /dev/null @@ -1,33 +0,0 @@ -"""Compatibility layer for EKO migration.""" - -from eko import EKO, basis_rotation -from pineappl.grid import PyOperatorSliceInfo, PyPidBasis - - -def pineappl_layout(operator: EKO) -> list: - """Extract information required by :func:`pineappl.grid.Grid.convolve_eko`. - - Parameters - ---------- - operator: eko.EKO - evolution operator in the new layout - - Returns - ------- - dict - a minimal object, with all and only the information consumed by PineAPPL - - """ - eko_iterator = [] - for (q2, _), op in operator.items(): - info = PyOperatorSliceInfo( - fac0=operator.mu20, - x0=operator.bases.inputgrid.raw, - pids0=basis_rotation.evol_basis_pids, - fac1=q2, - x1=operator.bases.targetgrid.raw, - pids1=operator.bases.targetpids, - pid_basis=PyPidBasis.Pdg, - ) - eko_iterator.append((info, op.operator)) - return eko_iterator diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index eec37c67..b0e7acf5 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -15,12 +15,14 @@ import rich.box import rich.panel import yaml +from eko import basis_rotation from eko.io.types import ScaleVariationsMethod from eko.matchings import Atlas, nf_default from eko.quantities import heavy_quarks from pineappl.fk_table import PyFkAssumptions +from pineappl.grid import PyOperatorSliceInfo, PyPidBasis -from . import check, comparator, ekompatibility, version +from . import check, comparator, version logger = logging.getLogger(__name__) @@ -370,18 +372,31 @@ def xgrid_reshape(operators): ) for mur2 in mur2_grid ] - # We need to use ekompatibility in order to pass a dictionary to pineappl + + def prepare(operator, items): + (q2, _), op = items + info = PyOperatorSliceInfo( + fac0=operator.mu20, + x0=operator.bases.inputgrid.raw, + pids0=basis_rotation.evol_basis_pids, + fac1=q2, + x1=operator.bases.targetgrid.raw, + pids1=operator.bases.targetpids, + pid_basis=PyPidBasis.Pdg, + ) + return (info, op.operator) + if operators_b is not None: fktable = grid.evolve_with_slice_iter2( - iter(ekompatibility.pineappl_layout(operators_a)), - iter(ekompatibility.pineappl_layout(operators_b)), + map(lambda it: prepare(operators_a, it), operators_a.items()), + map(lambda it: prepare(operators_b, it), operators_b.items()), alphas_table=alphas_values, xi=(xir, xif), order_mask=order_mask, ) else: fktable = grid.evolve_with_slice_iter( - iter(ekompatibility.pineappl_layout(operators_a)), + map(lambda it: prepare(operators_a, it), operators_a.items()), ren1=mur2_grid, alphas=alphas_values, xi=(xir, xif), From ca58d1a9004e1cfaabebb76d7da78d1ca32ddb51 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 19 Jul 2024 09:45:00 +0200 Subject: [PATCH 32/66] init fix on benchmarks --- benchmarks/bench_theory.py | 9 +++++++-- pyproject.toml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/benchmarks/bench_theory.py b/benchmarks/bench_theory.py index 76e9fbf0..f36d85cb 100644 --- a/benchmarks/bench_theory.py +++ b/benchmarks/bench_theory.py @@ -58,8 +58,13 @@ def benchmark_inherit_grids(test_files): def benchmark_inherit_eko(tmp_path): - from_eko = theory_obj.ekos_path() - theory_obj.inherit_eko("TestEko", from_eko, tmp_path) + for grid in theory_obj.grids_path().iterdir(): + name = grid.stem.split(".")[0] + # here NUTEV eko is not present + if (theory_obj.ekos_path() / f"{name}.tar").exists(): + theory_obj.inherit_eko(name, grid, tmp_path) + assert tmp_path.is_dir() + assert (tmp_path / f"{name}.tar").exists() def benchmark_inherit_ekos(test_files): diff --git a/pyproject.toml b/pyproject.toml index 590baa8a..4f21eeba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ packages = [{ include = "pineko", from = "src" }] [tool.poetry.dependencies] python = ">=3.9,<3.13" eko = "^0.14.2" -pineappl = { git = "https://github.com/NNPDF/pineappl.git", branch = "extend_eko_convolution", subdirectory = "pineappl_py" } +pineappl = "^0.8.1" PyYAML = "^6.0" numpy = "^1.21.0" pandas = "^2.1" From ed8fed9e10f865b5f84077adc346ac6cc45e3454 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 19 Jul 2024 09:51:55 +0200 Subject: [PATCH 33/66] remove temporary fix --- .github/workflows/bench.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 1e675da9..8b3fdcea 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -23,8 +23,6 @@ jobs: with: virtualenvs-create: false installer-parallel: true - # Temporary fix to get unreleased version of pineappl - - uses: moonrepo/setup-rust@v1 - name: Install dependencies run: poetry install --no-interaction --no-root --with test -E nnpdf - name: Install project From 4d44dbfd8193d11d47012f3dc5f567301d739520 Mon Sep 17 00:00:00 2001 From: Felix Hekhorn Date: Mon, 22 Jul 2024 13:10:29 +0300 Subject: [PATCH 34/66] Fix comparison print --- src/pineko/cli/convolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/cli/convolve.py b/src/pineko/cli/convolve.py index b5fbfebe..abb35c16 100644 --- a/src/pineko/cli/convolve.py +++ b/src/pineko/cli/convolve.py @@ -71,5 +71,5 @@ def subcommand( comparison_pdf=pdf, min_as=min_as, ) - if comp: + if comp is not None: print(comp.to_string()) From 6812bdd73bcda01225399a873d2bf79c2d2c63d3 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 23 Jul 2024 17:10:19 +0200 Subject: [PATCH 35/66] PyPidBasis from Pdg to Evol --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index b0e7acf5..f6d79a9e 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -382,7 +382,7 @@ def prepare(operator, items): fac1=q2, x1=operator.bases.targetgrid.raw, pids1=operator.bases.targetpids, - pid_basis=PyPidBasis.Pdg, + pid_basis=PyPidBasis.Evol, ) return (info, op.operator) From c1fe1839071287928cc41fa63c39a60974aa19bb Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 23 Jul 2024 18:05:25 +0200 Subject: [PATCH 36/66] update compare and convolve to accept multiple pdfs --- docs/source/overview/running.rst | 4 +- pyproject.toml | 2 +- src/pineko/cli/compare.py | 10 +++-- src/pineko/cli/convolve.py | 73 ++++++++++++++++++++++++-------- src/pineko/comparator.py | 62 +++++++++++++++++++++------ src/pineko/evolve.py | 14 +++--- 6 files changed, 123 insertions(+), 42 deletions(-) diff --git a/docs/source/overview/running.rst b/docs/source/overview/running.rst index e2920989..fe2bb123 100644 --- a/docs/source/overview/running.rst +++ b/docs/source/overview/running.rst @@ -50,7 +50,7 @@ Then you can convolve the |EKO| with the grids by running:: Note that you can also convolve a single grid with a single eko (obtaining a single FK table) by running:: - pineko convolve GRID OPCARD FKTABLE MAX_AS MAX_AL + pineko convolve GRID FKTABLE MAX_AS MAX_AL OP_PATH_1 OP_PATH_2 If necessary it is possible to specify the values of the *renormalization* and *factorization* scale variations with the options ``--xir`` and ``--xif``. @@ -91,7 +91,7 @@ Comparing grids and FK tables With the command ``pineko compare`` it is possible to compare the predictions as provided by the grid (convolved with a |PDF|) with the predictions as provided by the |FK| table. This is done like - pineko compare GRID FKTABLE MAX_AS MAX_AL PDF + pineko compare GRID FKTABLE MAX_AS MAX_AL PDF_1 PDF_2 again eventually specifying the values of *renormalization* and *factorization* scales with the appropriate options. diff --git a/pyproject.toml b/pyproject.toml index 4f21eeba..1db36a65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ packages = [{ include = "pineko", from = "src" }] [tool.poetry.dependencies] python = ">=3.9,<3.13" eko = "^0.14.2" -pineappl = "^0.8.1" +pineappl = "^0.8.2" PyYAML = "^6.0" numpy = "^1.21.0" pandas = "^2.1" diff --git a/src/pineko/cli/compare.py b/src/pineko/cli/compare.py index 6a85e2c9..f018dc1a 100644 --- a/src/pineko/cli/compare.py +++ b/src/pineko/cli/compare.py @@ -13,10 +13,10 @@ @click.argument("fktable_path", type=click.Path()) @click.argument("max_as", type=int) @click.argument("max_al", type=int) -@click.argument("pdf", type=str) +@click.argument("pdfs", type=click.STRING, nargs=-1) @click.option("--xir", default=1.0, help="renormalization scale variation") @click.option("--xif", default=1.0, help="factorization scale variation") -def subcommand(pineappl_path, fktable_path, max_as, max_al, pdf, xir, xif): +def subcommand(pineappl_path, fktable_path, max_as, max_al, pdfs, xir, xif): """Compare process level PineAPPL grid and derived FK Table. The comparison between the grid stored at PINEAPPL_PATH, and the FK table @@ -31,5 +31,9 @@ def subcommand(pineappl_path, fktable_path, max_as, max_al, pdf, xir, xif): """ pine = pineappl.grid.Grid.read(pineappl_path) fk = pineappl.fk_table.FkTable.read(fktable_path) + pdf1 = pdfs[0] + pdf2 = pdfs[1] if len(pdfs) == 2 else None # Note that we need to cast to string before printing to avoid ellipsis ... - rich.print(comparator.compare(pine, fk, max_as, max_al, pdf, xir, xif).to_string()) + rich.print( + comparator.compare(pine, fk, max_as, max_al, pdf1, xir, xif, pdf2).to_string() + ) diff --git a/src/pineko/cli/convolve.py b/src/pineko/cli/convolve.py index abb35c16..e197b95d 100644 --- a/src/pineko/cli/convolve.py +++ b/src/pineko/cli/convolve.py @@ -11,15 +11,21 @@ @command.command("convolve") @click.argument("grid_path", type=click.Path(exists=True)) -@click.argument("op_path", type=click.Path(exists=True)) @click.argument("fktable", type=click.Path()) @click.argument("max_as", type=int) @click.argument("max_al", type=int) +@click.argument("op_paths", type=click.Path(exists=True), nargs=-1) @click.option("--xir", default=1.0, help="renormalization scale variation") @click.option("--xif", default=1.0, help="factorization scale variation") @click.option("--min_as", type=int, help="Minimum exponent of as") @click.option( - "--pdf", default=None, help="if given, print comparison table", show_default=True + "--pdf1", + default=None, + help="PDF for the first convolution. If given, print comparison table", + show_default=True, +) +@click.option( + "--pdf2", default=None, help="PDF for the second convolution.", show_default=True ) @click.option( "--assumptions", @@ -28,11 +34,22 @@ show_default=True, ) def subcommand( - grid_path, op_path, fktable, max_as, max_al, xir, xif, pdf, assumptions, min_as + grid_path, + fktable, + max_as, + max_al, + op_paths, + xir, + xif, + pdf1, + pdf2, + assumptions, + min_as, ): """Convolute PineAPPL grid and EKO into an FK table. - GRID_PATH and OP_PATH are the path to the respective elements to convolve, and + GRID_PATH and OP_PATH are the path to the respective elements to convolve. + Note that multiple operators are allowed. FKTABLE is the path where to dump the output. MAX_AS and MAX_AL are used to specify the order in QCD and QED @@ -50,26 +67,46 @@ def subcommand( PDF is an optional PDF set compatible with the EKO to compare grid and FK table. """ grid = pineappl.grid.Grid.read(grid_path) - with eko.EKO.edit(op_path) as operators: + n_ekos = len(op_paths) + with eko.EKO.edit(op_paths[0]) as operators_a: rich.print( rich.panel.Panel.fit("Computing ...", style="magenta", box=rich.box.SQUARE), f" {grid_path}\n", - f"+ {op_path}\n", + f"+ {op_paths}\n", f"= {fktable}\n", f"with max_as={max_as}, max_al={max_al}, xir={xir}, xif={xif}", f"min_as: {min_as}" if min_as is not None else "", ) - _grid, _fk, comp = evolve.evolve_grid( - grid, - operators, - fktable, - max_as, - max_al, - xir, - xif, - assumptions=assumptions, - comparison_pdf=pdf, - min_as=min_as, - ) + if n_ekos == 1: + _grid, _fk, comp = evolve.evolve_grid( + grid, + operators_a, + fktable, + max_as, + max_al, + xir, + xif, + assumptions=assumptions, + comparison_pdf1=pdf1, + comparison_pdf2=pdf2, + min_as=min_as, + ) + else: + with eko.EKO.edit(op_paths[1]) as operators_b: + _grid, _fk, comp = evolve.evolve_grid( + grid, + operators_a, + fktable, + max_as, + max_al, + xir, + xif, + operators_b=operators_b, + assumptions=assumptions, + comparison_pdf1=pdf1, + comparison_pdf2=pdf2, + min_as=min_as, + ) + if comp is not None: print(comp.to_string()) diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index 090b9026..2c445785 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -5,7 +5,7 @@ import pineappl -def compare(pine, fktable, max_as, max_al, pdf, xir, xif): +def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): """Build comparison table. Parameters @@ -18,12 +18,14 @@ def compare(pine, fktable, max_as, max_al, pdf, xir, xif): maximum power of strong coupling max_al : int maximum power of electro-weak coupling - pdf : str + pdf1 : str PDF set name xir : float renormalization scale variation xif : float factorization scale variation + pdf2: str or None + PDF set for the second convolution, if different from the first Returns ------- @@ -32,19 +34,53 @@ def compare(pine, fktable, max_as, max_al, pdf, xir, xif): """ import lhapdf # pylint: disable=import-error,import-outside-toplevel - pdfset = lhapdf.mkPDF(pdf, 0) - pdgid = int(pdfset.set().get_entry("Particle")) + pdfset1 = lhapdf.mkPDF(pdf1, 0) + pdgid1 = int(pdfset1.set().get_entry("Particle")) + + if pdf2 is not None: + pdfset2 = lhapdf.mkPDF(pdf1, 0) + pdgid2 = int(pdfset2.set().get_entry("Particle")) + else: + pdfset2 = pdfset1 + pdgid2 = pdgid1 + + try: + parton1 = pine.key_values()["convolution_particle_1"] + parton2 = pine.key_values()["convolution_particle_2"] + except KeyError: + parton1 = pine.key_values()["initial_state_1"] + parton2 = pine.key_values()["initial_state_2"] + hadronic = parton1 == parton2 + order_mask = pineappl.grid.Order.create_mask(pine.orders(), max_as, max_al, True) - before = np.array( - pine.convolve_with_one( - pdgid, - pdfset.xfxQ2, - pdfset.alphasQ2, - order_mask=order_mask, - xi=((xir, xif),), + if hadronic: + before = np.array( + pine.convolve_with_two( + pdgid1, + pdfset1.xfxQ2, + pdfset1.alphasQ2, + pdgid2, + pdfset2.xfxQ2, + pdfset2.alphasQ2, + order_mask=order_mask, + xi=((xir, xif),), + ) ) - ) - after = np.array(fktable.convolve_with_one(pdgid, pdfset.xfxQ2)) + after = np.array( + fktable.convolve_with_one(pdgid1, pdfset1.xfxQ2, pdgid2, pdfset2.xfxQ2) + ) + else: + before = np.array( + pine.convolve_with_one( + pdgid1, + pdfset1.xfxQ2, + pdfset1.alphasQ2, + order_mask=order_mask, + xi=((xir, xif),), + ) + ) + after = np.array(fktable.convolve_with_one(pdgid1, pdfset1.xfxQ2)) + df = pd.DataFrame() # add bin info for d in range(pine.bin_dimensions()): diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index f6d79a9e..a8c741b5 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -279,7 +279,8 @@ def evolve_grid( xif, operators_b=None, assumptions="Nf6Ind", - comparison_pdf=None, + comparison_pdf1=None, + comparison_pdf2=None, meta_data=None, min_as=None, ): @@ -305,8 +306,10 @@ def evolve_grid( additonal evolution operator if different from operators_a assumptions : str assumptions on the flavor dimension - comparison_pdf : None or str + comparison_pdf1 : None or str if given, a comparison table (with / without evolution) will be printed + comparison_pdf2 : None or str + PDF set for the second convolution if different from the first one meta_data : None or dict if given, additional meta data written to the FK table min_as: None or int @@ -421,12 +424,13 @@ def prepare(operator, items): fktable.set_key_value(k, v) # compare before/after comparison = None - if comparison_pdf is not None: + if comparison_pdf1 is not None: comparison = comparator.compare( - grid, fktable, max_as, max_al, comparison_pdf, xir, xif + grid, fktable, max_as, max_al, comparison_pdf1, xir, xif, comparison_pdf2 ) fktable.set_key_value("results_fk", comparison.to_string()) - fktable.set_key_value("results_fk_pdfset", comparison_pdf) + fktable.set_key_value("results_fk_pdfset1", comparison_pdf1) + fktable.set_key_value("results_fk_pdfset2", comparison_pdf2) # write fktable.write_lz4(str(fktable_path)) return grid, fktable, comparison From 915daf440928d4363be494507b93fd373e207164 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 23 Jul 2024 18:15:32 +0200 Subject: [PATCH 37/66] init fixes of compare --- benchmarks/bench_cli.py | 2 +- src/pineko/comparator.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/benchmarks/bench_cli.py b/benchmarks/bench_cli.py index 76547f99..fb6aed62 100644 --- a/benchmarks/bench_cli.py +++ b/benchmarks/bench_cli.py @@ -95,7 +95,7 @@ def benchmark_convolve_cli(test_files, tmp_path): runner = CliRunner() result = runner.invoke( command, - ["convolve", str(grid_path), str(eko_path), str(fk_path), "2", "0"], + ["convolve", str(grid_path), str(fk_path), "2", "0", str(eko_path)], ) assert "Optimizing for Nf6Ind" in result.output diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index 2c445785..94cec74f 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -56,18 +56,17 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): if hadronic: before = np.array( pine.convolve_with_two( - pdgid1, - pdfset1.xfxQ2, - pdfset1.alphasQ2, - pdgid2, - pdfset2.xfxQ2, - pdfset2.alphasQ2, + pdg_id1=pdgid1, + xfx1=pdfset1.xfxQ2, + pdg_id2=pdgid2, + xfx2=pdfset2.xfxQ2, + alphas=pdfset1.alphasQ2, order_mask=order_mask, xi=((xir, xif),), ) ) after = np.array( - fktable.convolve_with_one(pdgid1, pdfset1.xfxQ2, pdgid2, pdfset2.xfxQ2) + fktable.convolve_with_two(pdgid1, pdfset1.xfxQ2, pdgid2, pdfset2.xfxQ2) ) else: before = np.array( From c2cc150b6dd23e0909e17b87e8f46ad42a26716d Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 23 Jul 2024 18:40:41 +0200 Subject: [PATCH 38/66] make benchmarks passing --- benchmarks/bench_evolve.py | 2 +- benchmarks/bench_theory.py | 4 ++-- src/pineko/cli/theory_.py | 9 ++++++--- src/pineko/evolve.py | 4 ++-- src/pineko/theory.py | 25 ++++++++++++++++--------- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/benchmarks/bench_evolve.py b/benchmarks/bench_evolve.py index f6423560..79bdfee0 100644 --- a/benchmarks/bench_evolve.py +++ b/benchmarks/bench_evolve.py @@ -120,7 +120,7 @@ def benchmark_evolve_grid(tmp_path, lhapdf_path, test_files, test_pdf): 1.0, 1.0, assumptions=assumptions, - comparison_pdf="NNPDF40_nnlo_as_01180", + comparison_pdf1="NNPDF40_nnlo_as_01180", ) # check metadata is there - fixes https://github.com/NNPDF/pineko/issues/70 fk = pineappl.fk_table.FkTable.read(target_path) diff --git a/benchmarks/bench_theory.py b/benchmarks/bench_theory.py index f36d85cb..4f62a2c9 100644 --- a/benchmarks/bench_theory.py +++ b/benchmarks/bench_theory.py @@ -171,9 +171,9 @@ def benchmark_fk(test_files, test_configs): ) theory_obj_hera.opcard(grid_name, pathlib.Path(test_files / grid_path), tcard) - theory_obj_hera.fk(grid_name, grid_path, tcard, pdf=None) + theory_obj_hera.fk(grid_name, grid_path, tcard, pdf_a=None, pdf_b=None) # test overwrite function - theory_obj_hera.fk(grid_name, grid_path, tcard, pdf=None) + theory_obj_hera.fk(grid_name, grid_path, tcard, pdf_a=None, pdf_b=None) log_path = pathlib.Path(test_files / "logs/fk/400-HERA_NC_225GEV_EP_SIGMARED.log") if os.path.exists(log_path): os.remove(log_path) diff --git a/src/pineko/cli/theory_.py b/src/pineko/cli/theory_.py index 2c42170c..62f2c654 100644 --- a/src/pineko/cli/theory_.py +++ b/src/pineko/cli/theory_.py @@ -67,7 +67,10 @@ def inherit_ekos(source_theory_id, target_theory_id, datasets, overwrite): @theory_.command() @click.argument("theory_id", type=click.INT) @click.argument("datasets", type=click.STRING, nargs=-1) -@click.option("--pdf", "-p", default=None, help="PDF set used for comparison") +@click.option("--pdf1", "-p", default=None, help="PDF set used for comparison") +@click.option( + "--pdf2", default=None, help="Second PDF set used for comparison, if needed" +) @click.option("--silent", is_flag=True, help="Suppress logs with comparison") @click.option( "-cl", @@ -76,11 +79,11 @@ def inherit_ekos(source_theory_id, target_theory_id, datasets, overwrite): help="Erease previos logs (instead of appending)", ) @click.option("--overwrite", is_flag=True, help="Allow files to be overwritten") -def fks(theory_id, datasets, pdf, silent, clear_logs, overwrite): +def fks(theory_id, datasets, pdf1, pdf2, silent, clear_logs, overwrite): """Compute FK tables in all datasets.""" theory.TheoryBuilder( theory_id, datasets, silent=silent, clear_logs=clear_logs, overwrite=overwrite - ).fks(pdf) + ).fks(pdf1, pdf2) @theory_.command() diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index a8c741b5..4c3dc441 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -429,8 +429,8 @@ def prepare(operator, items): grid, fktable, max_as, max_al, comparison_pdf1, xir, xif, comparison_pdf2 ) fktable.set_key_value("results_fk", comparison.to_string()) - fktable.set_key_value("results_fk_pdfset1", comparison_pdf1) - fktable.set_key_value("results_fk_pdfset2", comparison_pdf2) + fktable.set_key_value("results_fk_pdfset1", str(comparison_pdf1)) + fktable.set_key_value("results_fk_pdfset2", str(comparison_pdf2)) # write fktable.write_lz4(str(fktable_path)) return grid, fktable, comparison diff --git a/src/pineko/theory.py b/src/pineko/theory.py index c5533399..9c21dd24 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -389,7 +389,7 @@ def ekos(self): self.ekos_path().mkdir(exist_ok=True) self.iterate(self.eko, tcard=tcard) - def fk(self, name, grid_path, tcard, pdf): + def fk(self, name, grid_path, tcard, pdf_a, pdf_b): """Compute a single FK table. Parameters @@ -400,13 +400,15 @@ def fk(self, name, grid_path, tcard, pdf): path to grid tcard : dict theory card - pdf : str + pdf_a : str + comparison PDF + pdf_b : str comparison PDF """ # activate logging paths = configs.configs["paths"] do_log = self.activate_logging( - paths["logs"]["fk"], f"{self.theory_id}-{name}-{pdf}.log" + paths["logs"]["fk"], f"{self.theory_id}-{name}-{pdf_a}-{pdf_b}.log" ) # Relevant for FONLL-B and FONLL-D: For FFN0 terms, PTO is lower than @@ -517,7 +519,7 @@ def fk(self, name, grid_path, tcard, pdf): xir=xir, xif=xif, assumptions=assumptions, - comparison_pdf=pdf, + comparison_pdf1=pdf_a, meta_data={"theory_card": json.dumps(tcard)}, ) else: @@ -532,7 +534,8 @@ def fk(self, name, grid_path, tcard, pdf): xif=xif, assumptions=assumptions, operators_b=operators_b, - comparison_pdf=pdf, + comparison_pdf1=pdf_a, + comparison_pdf2=pdf_b, meta_data={"theory_card": json.dumps(tcard)}, ) # Remove tmp ekos @@ -547,21 +550,25 @@ def fk(self, name, grid_path, tcard, pdf): time.perf_counter() - start_time, ) if do_log and comparison is not None: - logger.info("Comparison with %s:\n %s", pdf, comparison.to_string()) + logger.info( + "Comparison with %s %s:\n %s", pdf_a, pdf_b, comparison.to_string() + ) if fk_filename.exists(): rich.print(f"[green]Success:[/] Wrote FK table to {fk_filename}") - def fks(self, pdf): + def fks(self, pdf_a, pdf_b): """Compute all FK tables. Parameters ---------- - pdf : str + pdf_a : str comparison PDF + pdf_b : str + second comparison PDF if needed """ tcard = theory_card.load(self.theory_id) self.fks_path.mkdir(exist_ok=True) - self.iterate(self.fk, tcard=tcard, pdf=pdf) + self.iterate(self.fk, tcard=tcard, pdf_a=pdf_a, pdf_b=pdf_b) def construct_ren_sv_grids(self, flavors): """Construct renormalization scale variations terms for all the grids in a dataset.""" From a06d9ed7dbc7ac478f618a9a93686eb2c3c6db7c Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 23 Jul 2024 19:52:05 +0200 Subject: [PATCH 39/66] poetry lock --- poetry.lock | 868 ++++++++++++++++++++++++++++------------------------ 1 file changed, 467 insertions(+), 401 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6b8ca012..3d029830 100644 --- a/poetry.lock +++ b/poetry.lock @@ -35,13 +35,13 @@ files = [ [[package]] name = "astroid" -version = "3.2.2" +version = "3.2.4" description = "An abstract syntax tree for Python with inference support." optional = false python-versions = ">=3.8.0" files = [ - {file = "astroid-3.2.2-py3-none-any.whl", hash = "sha256:e8a0083b4bb28fcffb6207a3bfc9e5d0a68be951dd7e336d5dcf639c682388c0"}, - {file = "astroid-3.2.2.tar.gz", hash = "sha256:8ead48e31b92b2e217b6c9733a21afafe479d52d6e164dd25fb1a770c7c3cf94"}, + {file = "astroid-3.2.4-py3-none-any.whl", hash = "sha256:413658a61eeca6202a59231abb473f932038fbcbf1666587f66d482083413a25"}, + {file = "astroid-3.2.4.tar.gz", hash = "sha256:0e14202810b30da1b735827f78f5157be2bbd4a7a59b7707ca0bfc2fb4c0063a"}, ] [package.dependencies] @@ -115,13 +115,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "banana-hep" -version = "0.6.14" +version = "0.6.15" description = "Benchmark QCD physics" optional = false python-versions = "<3.13,>=3.9.0" files = [ - {file = "banana_hep-0.6.14-py3-none-any.whl", hash = "sha256:f21b721eb98040de27582adecf4814f3c3323a9164f3cb7d51d56a7a1e21e093"}, - {file = "banana_hep-0.6.14.tar.gz", hash = "sha256:15476feb8d5e086a432404b23f9b00ab312f3eb65287dfe856b947a0a8a4897f"}, + {file = "banana_hep-0.6.15-py3-none-any.whl", hash = "sha256:556626b060c178903e1993b45f6778e619896fd6345c4c3948744977affc0bbf"}, + {file = "banana_hep-0.6.15.tar.gz", hash = "sha256:96069215af1d56f76d80e428c679d399b30ceb357875d29b583706826e144e45"}, ] [package.dependencies] @@ -153,13 +153,13 @@ six = "*" [[package]] name = "certifi" -version = "2024.6.2" +version = "2024.7.4" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2024.6.2-py3-none-any.whl", hash = "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"}, - {file = "certifi-2024.6.2.tar.gz", hash = "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516"}, + {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"}, + {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"}, ] [[package]] @@ -376,63 +376,63 @@ test-no-images = ["pytest", "pytest-cov", "pytest-xdist", "wurlitzer"] [[package]] name = "coverage" -version = "7.5.3" +version = "7.6.0" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.5.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45"}, - {file = "coverage-7.5.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec"}, - {file = "coverage-7.5.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286"}, - {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc"}, - {file = "coverage-7.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d"}, - {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83"}, - {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d"}, - {file = "coverage-7.5.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c"}, - {file = "coverage-7.5.3-cp310-cp310-win32.whl", hash = "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84"}, - {file = "coverage-7.5.3-cp310-cp310-win_amd64.whl", hash = "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac"}, - {file = "coverage-7.5.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974"}, - {file = "coverage-7.5.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232"}, - {file = "coverage-7.5.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd"}, - {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807"}, - {file = "coverage-7.5.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb"}, - {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc"}, - {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8"}, - {file = "coverage-7.5.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614"}, - {file = "coverage-7.5.3-cp311-cp311-win32.whl", hash = "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9"}, - {file = "coverage-7.5.3-cp311-cp311-win_amd64.whl", hash = "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a"}, - {file = "coverage-7.5.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8"}, - {file = "coverage-7.5.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3"}, - {file = "coverage-7.5.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1"}, - {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db"}, - {file = "coverage-7.5.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd"}, - {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523"}, - {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"}, - {file = "coverage-7.5.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84"}, - {file = "coverage-7.5.3-cp312-cp312-win32.whl", hash = "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08"}, - {file = "coverage-7.5.3-cp312-cp312-win_amd64.whl", hash = "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb"}, - {file = "coverage-7.5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb"}, - {file = "coverage-7.5.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155"}, - {file = "coverage-7.5.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24"}, - {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98"}, - {file = "coverage-7.5.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d"}, - {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d"}, - {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce"}, - {file = "coverage-7.5.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0"}, - {file = "coverage-7.5.3-cp38-cp38-win32.whl", hash = "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485"}, - {file = "coverage-7.5.3-cp38-cp38-win_amd64.whl", hash = "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56"}, - {file = "coverage-7.5.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85"}, - {file = "coverage-7.5.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31"}, - {file = "coverage-7.5.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d"}, - {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341"}, - {file = "coverage-7.5.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7"}, - {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52"}, - {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303"}, - {file = "coverage-7.5.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd"}, - {file = "coverage-7.5.3-cp39-cp39-win32.whl", hash = "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d"}, - {file = "coverage-7.5.3-cp39-cp39-win_amd64.whl", hash = "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0"}, - {file = "coverage-7.5.3-pp38.pp39.pp310-none-any.whl", hash = "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884"}, - {file = "coverage-7.5.3.tar.gz", hash = "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f"}, + {file = "coverage-7.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dff044f661f59dace805eedb4a7404c573b6ff0cdba4a524141bc63d7be5c7fd"}, + {file = "coverage-7.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8659fd33ee9e6ca03950cfdcdf271d645cf681609153f218826dd9805ab585c"}, + {file = "coverage-7.6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7792f0ab20df8071d669d929c75c97fecfa6bcab82c10ee4adb91c7a54055463"}, + {file = "coverage-7.6.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d4b3cd1ca7cd73d229487fa5caca9e4bc1f0bca96526b922d61053ea751fe791"}, + {file = "coverage-7.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7e128f85c0b419907d1f38e616c4f1e9f1d1b37a7949f44df9a73d5da5cd53c"}, + {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a94925102c89247530ae1dab7dc02c690942566f22e189cbd53579b0693c0783"}, + {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:dcd070b5b585b50e6617e8972f3fbbee786afca71b1936ac06257f7e178f00f6"}, + {file = "coverage-7.6.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d50a252b23b9b4dfeefc1f663c568a221092cbaded20a05a11665d0dbec9b8fb"}, + {file = "coverage-7.6.0-cp310-cp310-win32.whl", hash = "sha256:0e7b27d04131c46e6894f23a4ae186a6a2207209a05df5b6ad4caee6d54a222c"}, + {file = "coverage-7.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:54dece71673b3187c86226c3ca793c5f891f9fc3d8aa183f2e3653da18566169"}, + {file = "coverage-7.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c7b525ab52ce18c57ae232ba6f7010297a87ced82a2383b1afd238849c1ff933"}, + {file = "coverage-7.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bea27c4269234e06f621f3fac3925f56ff34bc14521484b8f66a580aacc2e7d"}, + {file = "coverage-7.6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed8d1d1821ba5fc88d4a4f45387b65de52382fa3ef1f0115a4f7a20cdfab0e94"}, + {file = "coverage-7.6.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:01c322ef2bbe15057bc4bf132b525b7e3f7206f071799eb8aa6ad1940bcf5fb1"}, + {file = "coverage-7.6.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03cafe82c1b32b770a29fd6de923625ccac3185a54a5e66606da26d105f37dac"}, + {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:0d1b923fc4a40c5832be4f35a5dab0e5ff89cddf83bb4174499e02ea089daf57"}, + {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4b03741e70fb811d1a9a1d75355cf391f274ed85847f4b78e35459899f57af4d"}, + {file = "coverage-7.6.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a73d18625f6a8a1cbb11eadc1d03929f9510f4131879288e3f7922097a429f63"}, + {file = "coverage-7.6.0-cp311-cp311-win32.whl", hash = "sha256:65fa405b837060db569a61ec368b74688f429b32fa47a8929a7a2f9b47183713"}, + {file = "coverage-7.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:6379688fb4cfa921ae349c76eb1a9ab26b65f32b03d46bb0eed841fd4cb6afb1"}, + {file = "coverage-7.6.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f7db0b6ae1f96ae41afe626095149ecd1b212b424626175a6633c2999eaad45b"}, + {file = "coverage-7.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:bbdf9a72403110a3bdae77948b8011f644571311c2fb35ee15f0f10a8fc082e8"}, + {file = "coverage-7.6.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cc44bf0315268e253bf563f3560e6c004efe38f76db03a1558274a6e04bf5d5"}, + {file = "coverage-7.6.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da8549d17489cd52f85a9829d0e1d91059359b3c54a26f28bec2c5d369524807"}, + {file = "coverage-7.6.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0086cd4fc71b7d485ac93ca4239c8f75732c2ae3ba83f6be1c9be59d9e2c6382"}, + {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1fad32ee9b27350687035cb5fdf9145bc9cf0a094a9577d43e909948ebcfa27b"}, + {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:044a0985a4f25b335882b0966625270a8d9db3d3409ddc49a4eb00b0ef5e8cee"}, + {file = "coverage-7.6.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:76d5f82213aa78098b9b964ea89de4617e70e0d43e97900c2778a50856dac605"}, + {file = "coverage-7.6.0-cp312-cp312-win32.whl", hash = "sha256:3c59105f8d58ce500f348c5b56163a4113a440dad6daa2294b5052a10db866da"}, + {file = "coverage-7.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:ca5d79cfdae420a1d52bf177de4bc2289c321d6c961ae321503b2ca59c17ae67"}, + {file = "coverage-7.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d39bd10f0ae453554798b125d2f39884290c480f56e8a02ba7a6ed552005243b"}, + {file = "coverage-7.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:beb08e8508e53a568811016e59f3234d29c2583f6b6e28572f0954a6b4f7e03d"}, + {file = "coverage-7.6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b2e16f4cd2bc4d88ba30ca2d3bbf2f21f00f382cf4e1ce3b1ddc96c634bc48ca"}, + {file = "coverage-7.6.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6616d1c9bf1e3faea78711ee42a8b972367d82ceae233ec0ac61cc7fec09fa6b"}, + {file = "coverage-7.6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad4567d6c334c46046d1c4c20024de2a1c3abc626817ae21ae3da600f5779b44"}, + {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d17c6a415d68cfe1091d3296ba5749d3d8696e42c37fca5d4860c5bf7b729f03"}, + {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:9146579352d7b5f6412735d0f203bbd8d00113a680b66565e205bc605ef81bc6"}, + {file = "coverage-7.6.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:cdab02a0a941af190df8782aafc591ef3ad08824f97850b015c8c6a8b3877b0b"}, + {file = "coverage-7.6.0-cp38-cp38-win32.whl", hash = "sha256:df423f351b162a702c053d5dddc0fc0ef9a9e27ea3f449781ace5f906b664428"}, + {file = "coverage-7.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:f2501d60d7497fd55e391f423f965bbe9e650e9ffc3c627d5f0ac516026000b8"}, + {file = "coverage-7.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7221f9ac9dad9492cecab6f676b3eaf9185141539d5c9689d13fd6b0d7de840c"}, + {file = "coverage-7.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ddaaa91bfc4477d2871442bbf30a125e8fe6b05da8a0015507bfbf4718228ab2"}, + {file = "coverage-7.6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4cbe651f3904e28f3a55d6f371203049034b4ddbce65a54527a3f189ca3b390"}, + {file = "coverage-7.6.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:831b476d79408ab6ccfadaaf199906c833f02fdb32c9ab907b1d4aa0713cfa3b"}, + {file = "coverage-7.6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46c3d091059ad0b9c59d1034de74a7f36dcfa7f6d3bde782c49deb42438f2450"}, + {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:4d5fae0a22dc86259dee66f2cc6c1d3e490c4a1214d7daa2a93d07491c5c04b6"}, + {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:07ed352205574aad067482e53dd606926afebcb5590653121063fbf4e2175166"}, + {file = "coverage-7.6.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:49c76cdfa13015c4560702574bad67f0e15ca5a2872c6a125f6327ead2b731dd"}, + {file = "coverage-7.6.0-cp39-cp39-win32.whl", hash = "sha256:482855914928c8175735a2a59c8dc5806cf7d8f032e4820d52e845d1f731dca2"}, + {file = "coverage-7.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:543ef9179bc55edfd895154a51792b01c017c87af0ebaae092720152e19e42ca"}, + {file = "coverage-7.6.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:6fe885135c8a479d3e37a7aae61cbd3a0fb2deccb4dda3c25f92a49189f766d6"}, + {file = "coverage-7.6.0.tar.gz", hash = "sha256:289cc803fa1dc901f84701ac10c9ee873619320f2f9aff38794db4a4a0268d51"}, ] [package.dependencies] @@ -458,32 +458,32 @@ tests = ["pytest", "pytest-cov", "pytest-xdist"] [[package]] name = "dask" -version = "2024.6.0" +version = "2024.7.1" description = "Parallel PyData with Task Scheduling" optional = true python-versions = ">=3.9" files = [ - {file = "dask-2024.6.0-py3-none-any.whl", hash = "sha256:de0ced6cd46dbc6c01120c8870457af46d667940805a4be063a74dd467466804"}, - {file = "dask-2024.6.0.tar.gz", hash = "sha256:6882ce7e485336d707e540080ed48e01f9c09485d52a2928ea05f9a9e44bb433"}, + {file = "dask-2024.7.1-py3-none-any.whl", hash = "sha256:dd046840050376c317de90629db5c6197adda820176cf3e2df10c3219d11951f"}, + {file = "dask-2024.7.1.tar.gz", hash = "sha256:dbaef2d50efee841a9d981a218cfeb50392fc9a95e0403b6d680450e4f50d531"}, ] [package.dependencies] click = ">=8.1" cloudpickle = ">=1.5.0" -distributed = {version = "2024.6.0", optional = true, markers = "extra == \"distributed\""} +distributed = {version = "2024.7.1", optional = true, markers = "extra == \"distributed\""} fsspec = ">=2021.09.0" importlib-metadata = {version = ">=4.13.0", markers = "python_version < \"3.12\""} packaging = ">=20.0" -partd = ">=1.2.0" +partd = ">=1.4.0" pyyaml = ">=5.3.1" toolz = ">=0.10.0" [package.extras] array = ["numpy (>=1.21)"] complete = ["dask[array,dataframe,diagnostics,distributed]", "lz4 (>=4.3.2)", "pyarrow (>=7.0)", "pyarrow-hotfix"] -dataframe = ["dask-expr (>=1.1,<1.2)", "dask[array]", "pandas (>=1.3)"] +dataframe = ["dask-expr (>=1.1,<1.2)", "dask[array]", "pandas (>=2.0)"] diagnostics = ["bokeh (>=2.4.2)", "jinja2 (>=2.10.3)"] -distributed = ["distributed (==2024.6.0)"] +distributed = ["distributed (==2024.7.1)"] test = ["pandas[test]", "pre-commit", "pytest", "pytest-cov", "pytest-rerunfailures", "pytest-timeout", "pytest-xdist"] [[package]] @@ -514,19 +514,19 @@ profile = ["gprof2dot (>=2022.7.29)"] [[package]] name = "distributed" -version = "2024.6.0" +version = "2024.7.1" description = "Distributed scheduler for Dask" optional = true python-versions = ">=3.9" files = [ - {file = "distributed-2024.6.0-py3-none-any.whl", hash = "sha256:abe45c53754a7bcd36b7cbb821e1246db5d2b5ebe76c3bd18de1167dcd94d7d6"}, - {file = "distributed-2024.6.0.tar.gz", hash = "sha256:9ed0f822f0159c305415d44ba9a937557f2f03f8d78d539324ef3daf82a17b7b"}, + {file = "distributed-2024.7.1-py3-none-any.whl", hash = "sha256:d5ac38d9682c191e6582c86ebf37c10d7adb60bf4a95048a05ae4fb0866119bc"}, + {file = "distributed-2024.7.1.tar.gz", hash = "sha256:7bce7fa745163b55bdd67fd632b3edf57b31827640390b92d0ee3f73436429d3"}, ] [package.dependencies] click = ">=8.0" cloudpickle = ">=1.5.0" -dask = "2024.6.0" +dask = "2024.7.1" jinja2 = ">=2.10.3" locket = ">=1.0.0" msgpack = ">=1.0.0" @@ -553,13 +553,13 @@ files = [ [[package]] name = "eko" -version = "0.14.3" +version = "0.14.6" description = "Evolution Kernel Operators" optional = false python-versions = "<3.13,>=3.9" files = [ - {file = "eko-0.14.3-py3-none-any.whl", hash = "sha256:6f8e46ae2b3aa04108f2b0f17e58bb789b3e53ba8fccf87fb810f8ded35b692c"}, - {file = "eko-0.14.3.tar.gz", hash = "sha256:1c5829baefe88c8e1424a1ec963c0cfde4dc1a6abfa439db2a1a4aca9794ba8d"}, + {file = "eko-0.14.6-py3-none-any.whl", hash = "sha256:93ec555391911b89ea247ba92a7eb71618f0d3f5ec4b9fbb2637b20e12e5bf5a"}, + {file = "eko-0.14.6.tar.gz", hash = "sha256:6d7242ec4b32d0cb86fdc75dfabc4434fffbe14d3c26343016d51dc8ac33331c"}, ] [package.dependencies] @@ -575,13 +575,13 @@ mark = ["banana-hep (>=0.6.12,<0.7.0)", "matplotlib (>=3.5.1,<4.0.0)", "pandas ( [[package]] name = "exceptiongroup" -version = "1.2.1" +version = "1.2.2" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, - {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, + {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"}, + {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"}, ] [package.extras] @@ -629,53 +629,53 @@ files = [ [[package]] name = "fonttools" -version = "4.53.0" +version = "4.53.1" description = "Tools to manipulate font files" optional = false python-versions = ">=3.8" files = [ - {file = "fonttools-4.53.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:52a6e0a7a0bf611c19bc8ec8f7592bdae79c8296c70eb05917fd831354699b20"}, - {file = "fonttools-4.53.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:099634631b9dd271d4a835d2b2a9e042ccc94ecdf7e2dd9f7f34f7daf333358d"}, - {file = "fonttools-4.53.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e40013572bfb843d6794a3ce076c29ef4efd15937ab833f520117f8eccc84fd6"}, - {file = "fonttools-4.53.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:715b41c3e231f7334cbe79dfc698213dcb7211520ec7a3bc2ba20c8515e8a3b5"}, - {file = "fonttools-4.53.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:74ae2441731a05b44d5988d3ac2cf784d3ee0a535dbed257cbfff4be8bb49eb9"}, - {file = "fonttools-4.53.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:95db0c6581a54b47c30860d013977b8a14febc206c8b5ff562f9fe32738a8aca"}, - {file = "fonttools-4.53.0-cp310-cp310-win32.whl", hash = "sha256:9cd7a6beec6495d1dffb1033d50a3f82dfece23e9eb3c20cd3c2444d27514068"}, - {file = "fonttools-4.53.0-cp310-cp310-win_amd64.whl", hash = "sha256:daaef7390e632283051e3cf3e16aff2b68b247e99aea916f64e578c0449c9c68"}, - {file = "fonttools-4.53.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a209d2e624ba492df4f3bfad5996d1f76f03069c6133c60cd04f9a9e715595ec"}, - {file = "fonttools-4.53.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4f520d9ac5b938e6494f58a25c77564beca7d0199ecf726e1bd3d56872c59749"}, - {file = "fonttools-4.53.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eceef49f457253000e6a2d0f7bd08ff4e9fe96ec4ffce2dbcb32e34d9c1b8161"}, - {file = "fonttools-4.53.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa1f3e34373aa16045484b4d9d352d4c6b5f9f77ac77a178252ccbc851e8b2ee"}, - {file = "fonttools-4.53.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:28d072169fe8275fb1a0d35e3233f6df36a7e8474e56cb790a7258ad822b6fd6"}, - {file = "fonttools-4.53.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4a2a6ba400d386e904fd05db81f73bee0008af37799a7586deaa4aef8cd5971e"}, - {file = "fonttools-4.53.0-cp311-cp311-win32.whl", hash = "sha256:bb7273789f69b565d88e97e9e1da602b4ee7ba733caf35a6c2affd4334d4f005"}, - {file = "fonttools-4.53.0-cp311-cp311-win_amd64.whl", hash = "sha256:9fe9096a60113e1d755e9e6bda15ef7e03391ee0554d22829aa506cdf946f796"}, - {file = "fonttools-4.53.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:d8f191a17369bd53a5557a5ee4bab91d5330ca3aefcdf17fab9a497b0e7cff7a"}, - {file = "fonttools-4.53.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:93156dd7f90ae0a1b0e8871032a07ef3178f553f0c70c386025a808f3a63b1f4"}, - {file = "fonttools-4.53.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bff98816cb144fb7b85e4b5ba3888a33b56ecef075b0e95b95bcd0a5fbf20f06"}, - {file = "fonttools-4.53.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:973d030180eca8255b1bce6ffc09ef38a05dcec0e8320cc9b7bcaa65346f341d"}, - {file = "fonttools-4.53.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c4ee5a24e281fbd8261c6ab29faa7fd9a87a12e8c0eed485b705236c65999109"}, - {file = "fonttools-4.53.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bd5bc124fae781a4422f61b98d1d7faa47985f663a64770b78f13d2c072410c2"}, - {file = "fonttools-4.53.0-cp312-cp312-win32.whl", hash = "sha256:a239afa1126b6a619130909c8404070e2b473dd2b7fc4aacacd2e763f8597fea"}, - {file = "fonttools-4.53.0-cp312-cp312-win_amd64.whl", hash = "sha256:45b4afb069039f0366a43a5d454bc54eea942bfb66b3fc3e9a2c07ef4d617380"}, - {file = "fonttools-4.53.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:93bc9e5aaa06ff928d751dc6be889ff3e7d2aa393ab873bc7f6396a99f6fbb12"}, - {file = "fonttools-4.53.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2367d47816cc9783a28645bc1dac07f8ffc93e0f015e8c9fc674a5b76a6da6e4"}, - {file = "fonttools-4.53.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:907fa0b662dd8fc1d7c661b90782ce81afb510fc4b7aa6ae7304d6c094b27bce"}, - {file = "fonttools-4.53.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e0ad3c6ea4bd6a289d958a1eb922767233f00982cf0fe42b177657c86c80a8f"}, - {file = "fonttools-4.53.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:73121a9b7ff93ada888aaee3985a88495489cc027894458cb1a736660bdfb206"}, - {file = "fonttools-4.53.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:ee595d7ba9bba130b2bec555a40aafa60c26ce68ed0cf509983e0f12d88674fd"}, - {file = "fonttools-4.53.0-cp38-cp38-win32.whl", hash = "sha256:fca66d9ff2ac89b03f5aa17e0b21a97c21f3491c46b583bb131eb32c7bab33af"}, - {file = "fonttools-4.53.0-cp38-cp38-win_amd64.whl", hash = "sha256:31f0e3147375002aae30696dd1dc596636abbd22fca09d2e730ecde0baad1d6b"}, - {file = "fonttools-4.53.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7d6166192dcd925c78a91d599b48960e0a46fe565391c79fe6de481ac44d20ac"}, - {file = "fonttools-4.53.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ef50ec31649fbc3acf6afd261ed89d09eb909b97cc289d80476166df8438524d"}, - {file = "fonttools-4.53.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f193f060391a455920d61684a70017ef5284ccbe6023bb056e15e5ac3de11d1"}, - {file = "fonttools-4.53.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba9f09ff17f947392a855e3455a846f9855f6cf6bec33e9a427d3c1d254c712f"}, - {file = "fonttools-4.53.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:0c555e039d268445172b909b1b6bdcba42ada1cf4a60e367d68702e3f87e5f64"}, - {file = "fonttools-4.53.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a4788036201c908079e89ae3f5399b33bf45b9ea4514913f4dbbe4fac08efe0"}, - {file = "fonttools-4.53.0-cp39-cp39-win32.whl", hash = "sha256:d1a24f51a3305362b94681120c508758a88f207fa0a681c16b5a4172e9e6c7a9"}, - {file = "fonttools-4.53.0-cp39-cp39-win_amd64.whl", hash = "sha256:1e677bfb2b4bd0e5e99e0f7283e65e47a9814b0486cb64a41adf9ef110e078f2"}, - {file = "fonttools-4.53.0-py3-none-any.whl", hash = "sha256:6b4f04b1fbc01a3569d63359f2227c89ab294550de277fd09d8fca6185669fa4"}, - {file = "fonttools-4.53.0.tar.gz", hash = "sha256:c93ed66d32de1559b6fc348838c7572d5c0ac1e4a258e76763a5caddd8944002"}, + {file = "fonttools-4.53.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0679a30b59d74b6242909945429dbddb08496935b82f91ea9bf6ad240ec23397"}, + {file = "fonttools-4.53.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e8bf06b94694251861ba7fdeea15c8ec0967f84c3d4143ae9daf42bbc7717fe3"}, + {file = "fonttools-4.53.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b96cd370a61f4d083c9c0053bf634279b094308d52fdc2dd9a22d8372fdd590d"}, + {file = "fonttools-4.53.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1c7c5aa18dd3b17995898b4a9b5929d69ef6ae2af5b96d585ff4005033d82f0"}, + {file = "fonttools-4.53.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:e013aae589c1c12505da64a7d8d023e584987e51e62006e1bb30d72f26522c41"}, + {file = "fonttools-4.53.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:9efd176f874cb6402e607e4cc9b4a9cd584d82fc34a4b0c811970b32ba62501f"}, + {file = "fonttools-4.53.1-cp310-cp310-win32.whl", hash = "sha256:c8696544c964500aa9439efb6761947393b70b17ef4e82d73277413f291260a4"}, + {file = "fonttools-4.53.1-cp310-cp310-win_amd64.whl", hash = "sha256:8959a59de5af6d2bec27489e98ef25a397cfa1774b375d5787509c06659b3671"}, + {file = "fonttools-4.53.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:da33440b1413bad53a8674393c5d29ce64d8c1a15ef8a77c642ffd900d07bfe1"}, + {file = "fonttools-4.53.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5ff7e5e9bad94e3a70c5cd2fa27f20b9bb9385e10cddab567b85ce5d306ea923"}, + {file = "fonttools-4.53.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6e7170d675d12eac12ad1a981d90f118c06cf680b42a2d74c6c931e54b50719"}, + {file = "fonttools-4.53.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bee32ea8765e859670c4447b0817514ca79054463b6b79784b08a8df3a4d78e3"}, + {file = "fonttools-4.53.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6e08f572625a1ee682115223eabebc4c6a2035a6917eac6f60350aba297ccadb"}, + {file = "fonttools-4.53.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b21952c092ffd827504de7e66b62aba26fdb5f9d1e435c52477e6486e9d128b2"}, + {file = "fonttools-4.53.1-cp311-cp311-win32.whl", hash = "sha256:9dfdae43b7996af46ff9da520998a32b105c7f098aeea06b2226b30e74fbba88"}, + {file = "fonttools-4.53.1-cp311-cp311-win_amd64.whl", hash = "sha256:d4d0096cb1ac7a77b3b41cd78c9b6bc4a400550e21dc7a92f2b5ab53ed74eb02"}, + {file = "fonttools-4.53.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:d92d3c2a1b39631a6131c2fa25b5406855f97969b068e7e08413325bc0afba58"}, + {file = "fonttools-4.53.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3b3c8ebafbee8d9002bd8f1195d09ed2bd9ff134ddec37ee8f6a6375e6a4f0e8"}, + {file = "fonttools-4.53.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32f029c095ad66c425b0ee85553d0dc326d45d7059dbc227330fc29b43e8ba60"}, + {file = "fonttools-4.53.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10f5e6c3510b79ea27bb1ebfcc67048cde9ec67afa87c7dd7efa5c700491ac7f"}, + {file = "fonttools-4.53.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f677ce218976496a587ab17140da141557beb91d2a5c1a14212c994093f2eae2"}, + {file = "fonttools-4.53.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9e6ceba2a01b448e36754983d376064730690401da1dd104ddb543519470a15f"}, + {file = "fonttools-4.53.1-cp312-cp312-win32.whl", hash = "sha256:791b31ebbc05197d7aa096bbc7bd76d591f05905d2fd908bf103af4488e60670"}, + {file = "fonttools-4.53.1-cp312-cp312-win_amd64.whl", hash = "sha256:6ed170b5e17da0264b9f6fae86073be3db15fa1bd74061c8331022bca6d09bab"}, + {file = "fonttools-4.53.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:c818c058404eb2bba05e728d38049438afd649e3c409796723dfc17cd3f08749"}, + {file = "fonttools-4.53.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:651390c3b26b0c7d1f4407cad281ee7a5a85a31a110cbac5269de72a51551ba2"}, + {file = "fonttools-4.53.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e54f1bba2f655924c1138bbc7fa91abd61f45c68bd65ab5ed985942712864bbb"}, + {file = "fonttools-4.53.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9cd19cf4fe0595ebdd1d4915882b9440c3a6d30b008f3cc7587c1da7b95be5f"}, + {file = "fonttools-4.53.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:2af40ae9cdcb204fc1d8f26b190aa16534fcd4f0df756268df674a270eab575d"}, + {file = "fonttools-4.53.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:35250099b0cfb32d799fb5d6c651220a642fe2e3c7d2560490e6f1d3f9ae9169"}, + {file = "fonttools-4.53.1-cp38-cp38-win32.whl", hash = "sha256:f08df60fbd8d289152079a65da4e66a447efc1d5d5a4d3f299cdd39e3b2e4a7d"}, + {file = "fonttools-4.53.1-cp38-cp38-win_amd64.whl", hash = "sha256:7b6b35e52ddc8fb0db562133894e6ef5b4e54e1283dff606fda3eed938c36fc8"}, + {file = "fonttools-4.53.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:75a157d8d26c06e64ace9df037ee93a4938a4606a38cb7ffaf6635e60e253b7a"}, + {file = "fonttools-4.53.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4824c198f714ab5559c5be10fd1adf876712aa7989882a4ec887bf1ef3e00e31"}, + {file = "fonttools-4.53.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:becc5d7cb89c7b7afa8321b6bb3dbee0eec2b57855c90b3e9bf5fb816671fa7c"}, + {file = "fonttools-4.53.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84ec3fb43befb54be490147b4a922b5314e16372a643004f182babee9f9c3407"}, + {file = "fonttools-4.53.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:73379d3ffdeecb376640cd8ed03e9d2d0e568c9d1a4e9b16504a834ebadc2dfb"}, + {file = "fonttools-4.53.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:02569e9a810f9d11f4ae82c391ebc6fb5730d95a0657d24d754ed7763fb2d122"}, + {file = "fonttools-4.53.1-cp39-cp39-win32.whl", hash = "sha256:aae7bd54187e8bf7fd69f8ab87b2885253d3575163ad4d669a262fe97f0136cb"}, + {file = "fonttools-4.53.1-cp39-cp39-win_amd64.whl", hash = "sha256:e5b708073ea3d684235648786f5f6153a48dc8762cdfe5563c57e80787c29fbb"}, + {file = "fonttools-4.53.1-py3-none-any.whl", hash = "sha256:f1f8758a2ad110bd6432203a344269f445a2907dc24ef6bccfd0ac4e14e0d71d"}, + {file = "fonttools-4.53.1.tar.gz", hash = "sha256:e128778a8e9bc11159ce5447f76766cefbd876f44bd79aff030287254e4752c4"}, ] [package.extras] @@ -694,13 +694,13 @@ woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"] [[package]] name = "fsspec" -version = "2024.6.0" +version = "2024.6.1" description = "File-system specification" optional = true python-versions = ">=3.8" files = [ - {file = "fsspec-2024.6.0-py3-none-any.whl", hash = "sha256:58d7122eb8a1a46f7f13453187bfea4972d66bf01618d37366521b1998034cee"}, - {file = "fsspec-2024.6.0.tar.gz", hash = "sha256:f579960a56e6d8038a9efc8f9c77279ec12e6299aa86b0769a7e9c46b94527c2"}, + {file = "fsspec-2024.6.1-py3-none-any.whl", hash = "sha256:3cb443f8bcd2efb31295a5b9fdb02aee81d8452c80d28f97a6d0959e6cee101e"}, + {file = "fsspec-2024.6.1.tar.gz", hash = "sha256:fad7d7e209dd4c1208e3bbfda706620e0da5142bebbd9c384afb95b07e798e49"}, ] [package.extras] @@ -744,13 +744,13 @@ files = [ [[package]] name = "gast" -version = "0.5.4" +version = "0.6.0" description = "Python AST that abstracts the underlying Python version" optional = true -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" files = [ - {file = "gast-0.5.4-py3-none-any.whl", hash = "sha256:6fc4fa5fa10b72fb8aab4ae58bcb023058386e67b6fa2e3e34cec5c769360316"}, - {file = "gast-0.5.4.tar.gz", hash = "sha256:9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97"}, + {file = "gast-0.6.0-py3-none-any.whl", hash = "sha256:52b182313f7330389f72b069ba00f174cfe2a06411099547288839c6cbafbd54"}, + {file = "gast-0.6.0.tar.gz", hash = "sha256:88fc5300d32c7ac6ca7b515310862f71e6fdf2c029bbec7c66c0f5dd47b6b1fb"}, ] [[package]] @@ -841,61 +841,61 @@ test = ["objgraph", "psutil"] [[package]] name = "grpcio" -version = "1.64.1" +version = "1.65.1" description = "HTTP/2-based RPC framework" optional = true python-versions = ">=3.8" files = [ - {file = "grpcio-1.64.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:55697ecec192bc3f2f3cc13a295ab670f51de29884ca9ae6cd6247df55df2502"}, - {file = "grpcio-1.64.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:3b64ae304c175671efdaa7ec9ae2cc36996b681eb63ca39c464958396697daff"}, - {file = "grpcio-1.64.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:bac71b4b28bc9af61efcdc7630b166440bbfbaa80940c9a697271b5e1dabbc61"}, - {file = "grpcio-1.64.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c024ffc22d6dc59000faf8ad781696d81e8e38f4078cb0f2630b4a3cf231a90"}, - {file = "grpcio-1.64.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7cd5c1325f6808b8ae31657d281aadb2a51ac11ab081ae335f4f7fc44c1721d"}, - {file = "grpcio-1.64.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:0a2813093ddb27418a4c99f9b1c223fab0b053157176a64cc9db0f4557b69bd9"}, - {file = "grpcio-1.64.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2981c7365a9353f9b5c864595c510c983251b1ab403e05b1ccc70a3d9541a73b"}, - {file = "grpcio-1.64.1-cp310-cp310-win32.whl", hash = "sha256:1262402af5a511c245c3ae918167eca57342c72320dffae5d9b51840c4b2f86d"}, - {file = "grpcio-1.64.1-cp310-cp310-win_amd64.whl", hash = "sha256:19264fc964576ddb065368cae953f8d0514ecc6cb3da8903766d9fb9d4554c33"}, - {file = "grpcio-1.64.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:58b1041e7c870bb30ee41d3090cbd6f0851f30ae4eb68228955d973d3efa2e61"}, - {file = "grpcio-1.64.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:bbc5b1d78a7822b0a84c6f8917faa986c1a744e65d762ef6d8be9d75677af2ca"}, - {file = "grpcio-1.64.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:5841dd1f284bd1b3d8a6eca3a7f062b06f1eec09b184397e1d1d43447e89a7ae"}, - {file = "grpcio-1.64.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8caee47e970b92b3dd948371230fcceb80d3f2277b3bf7fbd7c0564e7d39068e"}, - {file = "grpcio-1.64.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:73819689c169417a4f978e562d24f2def2be75739c4bed1992435d007819da1b"}, - {file = "grpcio-1.64.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6503b64c8b2dfad299749cad1b595c650c91e5b2c8a1b775380fcf8d2cbba1e9"}, - {file = "grpcio-1.64.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1de403fc1305fd96cfa75e83be3dee8538f2413a6b1685b8452301c7ba33c294"}, - {file = "grpcio-1.64.1-cp311-cp311-win32.whl", hash = "sha256:d4d29cc612e1332237877dfa7fe687157973aab1d63bd0f84cf06692f04c0367"}, - {file = "grpcio-1.64.1-cp311-cp311-win_amd64.whl", hash = "sha256:5e56462b05a6f860b72f0fa50dca06d5b26543a4e88d0396259a07dc30f4e5aa"}, - {file = "grpcio-1.64.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:4657d24c8063e6095f850b68f2d1ba3b39f2b287a38242dcabc166453e950c59"}, - {file = "grpcio-1.64.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:62b4e6eb7bf901719fce0ca83e3ed474ae5022bb3827b0a501e056458c51c0a1"}, - {file = "grpcio-1.64.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:ee73a2f5ca4ba44fa33b4d7d2c71e2c8a9e9f78d53f6507ad68e7d2ad5f64a22"}, - {file = "grpcio-1.64.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:198908f9b22e2672a998870355e226a725aeab327ac4e6ff3a1399792ece4762"}, - {file = "grpcio-1.64.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39b9d0acaa8d835a6566c640f48b50054f422d03e77e49716d4c4e8e279665a1"}, - {file = "grpcio-1.64.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:5e42634a989c3aa6049f132266faf6b949ec2a6f7d302dbb5c15395b77d757eb"}, - {file = "grpcio-1.64.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b1a82e0b9b3022799c336e1fc0f6210adc019ae84efb7321d668129d28ee1efb"}, - {file = "grpcio-1.64.1-cp312-cp312-win32.whl", hash = "sha256:55260032b95c49bee69a423c2f5365baa9369d2f7d233e933564d8a47b893027"}, - {file = "grpcio-1.64.1-cp312-cp312-win_amd64.whl", hash = "sha256:c1a786ac592b47573a5bb7e35665c08064a5d77ab88a076eec11f8ae86b3e3f6"}, - {file = "grpcio-1.64.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:a011ac6c03cfe162ff2b727bcb530567826cec85eb8d4ad2bfb4bd023287a52d"}, - {file = "grpcio-1.64.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4d6dab6124225496010bd22690f2d9bd35c7cbb267b3f14e7a3eb05c911325d4"}, - {file = "grpcio-1.64.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a5e771d0252e871ce194d0fdcafd13971f1aae0ddacc5f25615030d5df55c3a2"}, - {file = "grpcio-1.64.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2c3c1b90ab93fed424e454e93c0ed0b9d552bdf1b0929712b094f5ecfe7a23ad"}, - {file = "grpcio-1.64.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20405cb8b13fd779135df23fabadc53b86522d0f1cba8cca0e87968587f50650"}, - {file = "grpcio-1.64.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:0cc79c982ccb2feec8aad0e8fb0d168bcbca85bc77b080d0d3c5f2f15c24ea8f"}, - {file = "grpcio-1.64.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a3a035c37ce7565b8f4f35ff683a4db34d24e53dc487e47438e434eb3f701b2a"}, - {file = "grpcio-1.64.1-cp38-cp38-win32.whl", hash = "sha256:1257b76748612aca0f89beec7fa0615727fd6f2a1ad580a9638816a4b2eb18fd"}, - {file = "grpcio-1.64.1-cp38-cp38-win_amd64.whl", hash = "sha256:0a12ddb1678ebc6a84ec6b0487feac020ee2b1659cbe69b80f06dbffdb249122"}, - {file = "grpcio-1.64.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:75dbbf415026d2862192fe1b28d71f209e2fd87079d98470db90bebe57b33179"}, - {file = "grpcio-1.64.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e3d9f8d1221baa0ced7ec7322a981e28deb23749c76eeeb3d33e18b72935ab62"}, - {file = "grpcio-1.64.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:5f8b75f64d5d324c565b263c67dbe4f0af595635bbdd93bb1a88189fc62ed2e5"}, - {file = "grpcio-1.64.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c84ad903d0d94311a2b7eea608da163dace97c5fe9412ea311e72c3684925602"}, - {file = "grpcio-1.64.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:940e3ec884520155f68a3b712d045e077d61c520a195d1a5932c531f11883489"}, - {file = "grpcio-1.64.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f10193c69fc9d3d726e83bbf0f3d316f1847c3071c8c93d8090cf5f326b14309"}, - {file = "grpcio-1.64.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ac15b6c2c80a4d1338b04d42a02d376a53395ddf0ec9ab157cbaf44191f3ffdd"}, - {file = "grpcio-1.64.1-cp39-cp39-win32.whl", hash = "sha256:03b43d0ccf99c557ec671c7dede64f023c7da9bb632ac65dbc57f166e4970040"}, - {file = "grpcio-1.64.1-cp39-cp39-win_amd64.whl", hash = "sha256:ed6091fa0adcc7e4ff944090cf203a52da35c37a130efa564ded02b7aff63bcd"}, - {file = "grpcio-1.64.1.tar.gz", hash = "sha256:8d51dd1c59d5fa0f34266b80a3805ec29a1f26425c2a54736133f6d87fc4968a"}, -] - -[package.extras] -protobuf = ["grpcio-tools (>=1.64.1)"] + {file = "grpcio-1.65.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:3dc5f928815b8972fb83b78d8db5039559f39e004ec93ebac316403fe031a062"}, + {file = "grpcio-1.65.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:8333ca46053c35484c9f2f7e8d8ec98c1383a8675a449163cea31a2076d93de8"}, + {file = "grpcio-1.65.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:7af64838b6e615fff0ec711960ed9b6ee83086edfa8c32670eafb736f169d719"}, + {file = "grpcio-1.65.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dbb64b4166362d9326f7efbf75b1c72106c1aa87f13a8c8b56a1224fac152f5c"}, + {file = "grpcio-1.65.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8422dc13ad93ec8caa2612b5032a2b9cd6421c13ed87f54db4a3a2c93afaf77"}, + {file = "grpcio-1.65.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:4effc0562b6c65d4add6a873ca132e46ba5e5a46f07c93502c37a9ae7f043857"}, + {file = "grpcio-1.65.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a6c71575a2fedf259724981fd73a18906513d2f306169c46262a5bae956e6364"}, + {file = "grpcio-1.65.1-cp310-cp310-win32.whl", hash = "sha256:34966cf526ef0ea616e008d40d989463e3db157abb213b2f20c6ce0ae7928875"}, + {file = "grpcio-1.65.1-cp310-cp310-win_amd64.whl", hash = "sha256:ca931de5dd6d9eb94ff19a2c9434b23923bce6f767179fef04dfa991f282eaad"}, + {file = "grpcio-1.65.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:bbb46330cc643ecf10bd9bd4ca8e7419a14b6b9dedd05f671c90fb2c813c6037"}, + {file = "grpcio-1.65.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d827a6fb9215b961eb73459ad7977edb9e748b23e3407d21c845d1d8ef6597e5"}, + {file = "grpcio-1.65.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:6e71aed8835f8d9fbcb84babc93a9da95955d1685021cceb7089f4f1e717d719"}, + {file = "grpcio-1.65.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a1c84560b3b2d34695c9ba53ab0264e2802721c530678a8f0a227951f453462"}, + {file = "grpcio-1.65.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27adee2338d697e71143ed147fe286c05810965d5d30ec14dd09c22479bfe48a"}, + {file = "grpcio-1.65.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f62652ddcadc75d0e7aa629e96bb61658f85a993e748333715b4ab667192e4e8"}, + {file = "grpcio-1.65.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:71a05fd814700dd9cb7d9a507f2f6a1ef85866733ccaf557eedacec32d65e4c2"}, + {file = "grpcio-1.65.1-cp311-cp311-win32.whl", hash = "sha256:b590f1ad056294dfaeac0b7e1b71d3d5ace638d8dd1f1147ce4bd13458783ba8"}, + {file = "grpcio-1.65.1-cp311-cp311-win_amd64.whl", hash = "sha256:12e9bdf3b5fd48e5fbe5b3da382ad8f97c08b47969f3cca81dd9b36b86ed39e2"}, + {file = "grpcio-1.65.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:54cb822e177374b318b233e54b6856c692c24cdbd5a3ba5335f18a47396bac8f"}, + {file = "grpcio-1.65.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:aaf3c54419a28d45bd1681372029f40e5bfb58e5265e3882eaf21e4a5f81a119"}, + {file = "grpcio-1.65.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:557de35bdfbe8bafea0a003dbd0f4da6d89223ac6c4c7549d78e20f92ead95d9"}, + {file = "grpcio-1.65.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8bfd95ef3b097f0cc86ade54eafefa1c8ed623aa01a26fbbdcd1a3650494dd11"}, + {file = "grpcio-1.65.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e6a8f3d6c41e6b642870afe6cafbaf7b61c57317f9ec66d0efdaf19db992b90"}, + {file = "grpcio-1.65.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:1faaf7355ceed07ceaef0b9dcefa4c98daf1dd8840ed75c2de128c3f4a4d859d"}, + {file = "grpcio-1.65.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:60f1f38eed830488ad2a1b11579ef0f345ff16fffdad1d24d9fbc97ba31804ff"}, + {file = "grpcio-1.65.1-cp312-cp312-win32.whl", hash = "sha256:e75acfa52daf5ea0712e8aa82f0003bba964de7ae22c26d208cbd7bc08500177"}, + {file = "grpcio-1.65.1-cp312-cp312-win_amd64.whl", hash = "sha256:ff5a84907e51924973aa05ed8759210d8cdae7ffcf9e44fd17646cf4a902df59"}, + {file = "grpcio-1.65.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:1fbd6331f18c3acd7e09d17fd840c096f56eaf0ef830fbd50af45ae9dc8dfd83"}, + {file = "grpcio-1.65.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:de5b6be29116e094c5ef9d9e4252e7eb143e3d5f6bd6d50a78075553ab4930b0"}, + {file = "grpcio-1.65.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:e4a3cdba62b2d6aeae6027ae65f350de6dc082b72e6215eccf82628e79efe9ba"}, + {file = "grpcio-1.65.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:941c4869aa229d88706b78187d60d66aca77fe5c32518b79e3c3e03fc26109a2"}, + {file = "grpcio-1.65.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f40cebe5edb518d78b8131e87cb83b3ee688984de38a232024b9b44e74ee53d3"}, + {file = "grpcio-1.65.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2ca684ba331fb249d8a1ce88db5394e70dbcd96e58d8c4b7e0d7b141a453dce9"}, + {file = "grpcio-1.65.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8558f0083ddaf5de64a59c790bffd7568e353914c0c551eae2955f54ee4b857f"}, + {file = "grpcio-1.65.1-cp38-cp38-win32.whl", hash = "sha256:8d8143a3e3966f85dce6c5cc45387ec36552174ba5712c5dc6fcc0898fb324c0"}, + {file = "grpcio-1.65.1-cp38-cp38-win_amd64.whl", hash = "sha256:76e81a86424d6ca1ce7c16b15bdd6a964a42b40544bf796a48da241fdaf61153"}, + {file = "grpcio-1.65.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:cb5175f45c980ff418998723ea1b3869cce3766d2ab4e4916fbd3cedbc9d0ed3"}, + {file = "grpcio-1.65.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b12c1aa7b95abe73b3e04e052c8b362655b41c7798da69f1eaf8d186c7d204df"}, + {file = "grpcio-1.65.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:3019fb50128b21a5e018d89569ffaaaa361680e1346c2f261bb84a91082eb3d3"}, + {file = "grpcio-1.65.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ae15275ed98ea267f64ee9ddedf8ecd5306a5b5bb87972a48bfe24af24153e8"}, + {file = "grpcio-1.65.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f096ffb881f37e8d4f958b63c74bfc400c7cebd7a944b027357cd2fb8d91a57"}, + {file = "grpcio-1.65.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2f56b5a68fdcf17a0a1d524bf177218c3c69b3947cb239ea222c6f1867c3ab68"}, + {file = "grpcio-1.65.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:941596d419b9736ab548aa0feb5bbba922f98872668847bf0720b42d1d227b9e"}, + {file = "grpcio-1.65.1-cp39-cp39-win32.whl", hash = "sha256:5fd7337a823b890215f07d429f4f193d24b80d62a5485cf88ee06648591a0c57"}, + {file = "grpcio-1.65.1-cp39-cp39-win_amd64.whl", hash = "sha256:1bceeec568372cbebf554eae1b436b06c2ff24cfaf04afade729fb9035408c6c"}, + {file = "grpcio-1.65.1.tar.gz", hash = "sha256:3c492301988cd720cd145d84e17318d45af342e29ef93141228f9cd73222368b"}, +] + +[package.extras] +protobuf = ["grpcio-tools (>=1.65.1)"] [[package]] name = "h5py" @@ -981,22 +981,22 @@ files = [ [[package]] name = "importlib-metadata" -version = "7.1.0" +version = "8.1.0" description = "Read metadata from Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "importlib_metadata-7.1.0-py3-none-any.whl", hash = "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570"}, - {file = "importlib_metadata-7.1.0.tar.gz", hash = "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"}, + {file = "importlib_metadata-8.1.0-py3-none-any.whl", hash = "sha256:3cd29f739ed65973840b068e3132135ce954c254d48b5b640484467ef7ab3c8c"}, + {file = "importlib_metadata-8.1.0.tar.gz", hash = "sha256:fcdcb1d5ead7bdf3dd32657bb94ebe9d2aabfe89a19782ddc32da5041d6ebfb4"}, ] [package.dependencies] zipp = ">=0.5" [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] +test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] [[package]] name = "importlib-resources" @@ -1116,13 +1116,13 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "keras" -version = "3.3.3" +version = "3.4.1" description = "Multi-backend Keras." optional = true python-versions = ">=3.9" files = [ - {file = "keras-3.3.3-py3-none-any.whl", hash = "sha256:260df9ef71c6b89eb6816ce1c60f139c38ccdddd16f24e7005d2be127cdef8e4"}, - {file = "keras-3.3.3.tar.gz", hash = "sha256:f2fdffc8434fd77045cf8fb21816dbaa2308d5f76974ca924b2f60b40433b1a0"}, + {file = "keras-3.4.1-py3-none-any.whl", hash = "sha256:15599c51e2090c12f39de6db6489a0cf265ddf6653f0731b82db5af2bfa19105"}, + {file = "keras-3.4.1.tar.gz", hash = "sha256:34cd9aeaa008914715149234c215657ca758e1b473bd2aab2e211ac967d1f8fe"}, ] [package.dependencies] @@ -1132,6 +1132,7 @@ ml-dtypes = "*" namex = "*" numpy = "*" optree = "*" +packaging = "*" rich = "*" [[package]] @@ -1568,28 +1569,28 @@ files = [ [[package]] name = "ml-dtypes" -version = "0.3.2" +version = "0.4.0" description = "" optional = true python-versions = ">=3.9" files = [ - {file = "ml_dtypes-0.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7afde548890a92b41c0fed3a6c525f1200a5727205f73dc21181a2726571bb53"}, - {file = "ml_dtypes-0.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1a746fe5fb9cd974a91070174258f0be129c592b93f9ce7df6cc336416c3fbd"}, - {file = "ml_dtypes-0.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961134ea44c7b8ca63eda902a44b58cd8bd670e21d62e255c81fba0a8e70d9b7"}, - {file = "ml_dtypes-0.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:6b35c4e8ca957c877ac35c79ffa77724ecc3702a1e4b18b08306c03feae597bb"}, - {file = "ml_dtypes-0.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:763697ab8a88d47443997a7cdf3aac7340049aed45f7521f6b0ec8a0594821fe"}, - {file = "ml_dtypes-0.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b89b194e9501a92d289c1ffd411380baf5daafb9818109a4f49b0a1b6dce4462"}, - {file = "ml_dtypes-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c34f2ba9660b21fe1034b608308a01be82bbef2a92fb8199f24dc6bad0d5226"}, - {file = "ml_dtypes-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:6604877d567a29bfe7cc02969ae0f2425260e5335505cf5e7fefc3e5465f5655"}, - {file = "ml_dtypes-0.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:93b78f53431c93953f7850bb1b925a17f0ab5d97527e38a7e865b5b4bc5cfc18"}, - {file = "ml_dtypes-0.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a17ef2322e60858d93584e9c52a5be7dd6236b056b7fa1ec57f1bb6ba043e33"}, - {file = "ml_dtypes-0.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8505946df1665db01332d885c2020b4cb9e84a8b1241eb4ba69d59591f65855"}, - {file = "ml_dtypes-0.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:f47619d978ab1ae7dfdc4052ea97c636c6263e1f19bd1be0e42c346b98d15ff4"}, - {file = "ml_dtypes-0.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c7b3fb3d4f6b39bcd4f6c4b98f406291f0d681a895490ee29a0f95bab850d53c"}, - {file = "ml_dtypes-0.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a4c3fcbf86fa52d0204f07cfd23947ef05b4ad743a1a988e163caa34a201e5e"}, - {file = "ml_dtypes-0.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91f8783fd1f2c23fd3b9ee5ad66b785dafa58ba3cdb050c4458021fa4d1eb226"}, - {file = "ml_dtypes-0.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:7ba8e1fafc7fff3e643f453bffa7d082df1678a73286ce8187d3e825e776eb94"}, - {file = "ml_dtypes-0.3.2.tar.gz", hash = "sha256:533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967"}, + {file = "ml_dtypes-0.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:93afe37f3a879d652ec9ef1fc47612388890660a2657fbb5747256c3b818fd81"}, + {file = "ml_dtypes-0.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2bb83fd064db43e67e67d021e547698af4c8d5c6190f2e9b1c53c09f6ff5531d"}, + {file = "ml_dtypes-0.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03e7cda6ef164eed0abb31df69d2c00c3a5ab3e2610b6d4c42183a43329c72a5"}, + {file = "ml_dtypes-0.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:a15d96d090aebb55ee85173d1775ae325a001aab607a76c8ea0b964ccd6b5364"}, + {file = "ml_dtypes-0.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:bdf689be7351cc3c95110c910c1b864002f113e682e44508910c849e144f3df1"}, + {file = "ml_dtypes-0.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c83e4d443962d891d51669ff241d5aaad10a8d3d37a81c5532a45419885d591c"}, + {file = "ml_dtypes-0.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e1e2f4237b459a63c97c2c9f449baa637d7e4c20addff6a9bac486f22432f3b6"}, + {file = "ml_dtypes-0.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:75b4faf99d0711b81f393db36d210b4255fd419f6f790bc6c1b461f95ffb7a9e"}, + {file = "ml_dtypes-0.4.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:ee9f91d4c4f9959a7e1051c141dc565f39e54435618152219769e24f5e9a4d06"}, + {file = "ml_dtypes-0.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad6849a2db386b38e4d54fe13eb3293464561780531a918f8ef4c8169170dd49"}, + {file = "ml_dtypes-0.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eaa32979ebfde3a0d7c947cafbf79edc1ec77ac05ad0780ee86c1d8df70f2259"}, + {file = "ml_dtypes-0.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:3b67ec73a697c88c1122038e0de46520e48dc2ec876d42cf61bc5efe3c0b7675"}, + {file = "ml_dtypes-0.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:41affb38fdfe146e3db226cf2953021184d6f0c4ffab52136613e9601706e368"}, + {file = "ml_dtypes-0.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43cf4356a0fe2eeac6d289018d0734e17a403bdf1fd911953c125dd0358edcc0"}, + {file = "ml_dtypes-0.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f1724ddcdf5edbaf615a62110af47407f1719b8d02e68ccee60683acb5f74da1"}, + {file = "ml_dtypes-0.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:723af6346447268a3cf0b7356e963d80ecb5732b5279b2aa3fa4b9fc8297c85e"}, + {file = "ml_dtypes-0.4.0.tar.gz", hash = "sha256:eaf197e72f4f7176a19fe3cb8b61846b38c6757607e7bf9cd4b1d84cd3e74deb"}, ] [package.dependencies] @@ -1712,7 +1713,7 @@ hyperopt = "*" matplotlib = ">=3.3.0,<3.8" numpy = "*" pandas = "*" -pineappl = "^0.7.0" +pineappl = "^0.8.2" prompt_toolkit = "*" psutil = "*" pymongo = "<4" @@ -1731,7 +1732,7 @@ tests = ["hypothesis", "pytest", "pytest-mpl"] type = "git" url = "https://github.com/NNPDF/nnpdf" reference = "HEAD" -resolved_reference = "761ab4c99f0fe2ef944b08090b238725def51532" +resolved_reference = "840ac3e2775929353c7e44be20fd494ff7fb1c10" [[package]] name = "numba" @@ -1832,60 +1833,89 @@ tests = ["pytest", "pytest-cov", "pytest-pep8"] [[package]] name = "optree" -version = "0.11.0" +version = "0.12.1" description = "Optimized PyTree Utilities." optional = true python-versions = ">=3.7" files = [ - {file = "optree-0.11.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fa9ed745d4cbac5e15df70339b30867ba033542b87f7b734f4cacae5ec73ba00"}, - {file = "optree-0.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f53951bfb640417558568284a8949d67bcdbf21fa0113107e20bd9403aa20b2b"}, - {file = "optree-0.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0df9a3923725aabb112ec7f10c74fa96b6c640da1cd30e7bc62fd4b03ef02875"}, - {file = "optree-0.11.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:979ffc2b96f16595c219fb7a89597dd2fa00ac47a3b411fdcf8ae6821da52290"}, - {file = "optree-0.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:228b97e8c991739b10c8548c118747ba32ee765f88236342e492bf9648afc0bc"}, - {file = "optree-0.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:a91840f9d45e7c01f151ba1815ae32b4c3c21e4290298772ee4b13314f729856"}, - {file = "optree-0.11.0-cp310-cp310-win_arm64.whl", hash = "sha256:31d444684ebd8c9f09a3d806fb3277843138ef9952b7a2954908e440e3b22519"}, - {file = "optree-0.11.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a5f37bcfe4e363e3bb8d36c5698fb829546956b2fe88951994387162a1859625"}, - {file = "optree-0.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6e8c3757088cd7fce666f2a5e031b65d7898e210452380d2657c0fc0a7ec9932"}, - {file = "optree-0.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:39bed744a61e2f795e172d2853779ac59b8dea236982dc160ea22063afc99ca3"}, - {file = "optree-0.11.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e250144eacdd5813dec0b18d91df0229197e3be402db42fd8e254ec90ea343d"}, - {file = "optree-0.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc17f9d085cd75a2de4f299a9c5e3c3520138eac7596061e581230b03862b44d"}, - {file = "optree-0.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:a64df43fce2d8eeafd7db6e27447c56b3fa64842df847819684b3b1cc254c016"}, - {file = "optree-0.11.0-cp311-cp311-win_arm64.whl", hash = "sha256:d666099a78f7bf31bf3a520d6871ddcae65484bcff095fc4271a391553b09c75"}, - {file = "optree-0.11.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:9bf322ad14f907ad4660ca286e731e750546d54934a94cc5ba7efe8860c60ab4"}, - {file = "optree-0.11.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:64c2e00fe508f50a42c50838df0d1f5be0dce5b4bef2373db8ad72b860211015"}, - {file = "optree-0.11.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:738e8bf4158e9c11cd051d89c2e453aeacf80ff8719ebc3251069015646554d0"}, - {file = "optree-0.11.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0db6968394096223881053dffdcaf2b8e220fd85db904f14aa931e4dc422c046"}, - {file = "optree-0.11.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e5df0e8aaca124cc1ffca311786cc909810f3c046de090729cdafbf910082f8"}, - {file = "optree-0.11.0-cp312-cp312-win_amd64.whl", hash = "sha256:ee208f0bec6436085a9fa3ae98af54bfcb8822086894fc1ade283e80a6f11fd7"}, - {file = "optree-0.11.0-cp312-cp312-win_arm64.whl", hash = "sha256:26b1230f9b75b579923a4f837c7c13db8b8d815cf68ce5af31dda5d818a877b2"}, - {file = "optree-0.11.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6cdd625dab2dff5374ff9c6792e8702fced8f0ea713ce959fc8f95499b5ecb2f"}, - {file = "optree-0.11.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:234a4f8f97a1217f13390df7ac416771689749d9a1c8eda31bf8622cd333219e"}, - {file = "optree-0.11.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a406eee5acd3fd4875fa44c3972d29ae6d4329e7296e9219986fe6ff8e92ea0"}, - {file = "optree-0.11.0-cp37-cp37m-win_amd64.whl", hash = "sha256:63e020a34b7168b5d0701a265c7c95b07984ff699d4894b20fa601282be88f20"}, - {file = "optree-0.11.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e2d47bd28eff690eb2f7432e490265a291b04d6d346cf7b586491b2e2337bf97"}, - {file = "optree-0.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2bc08fb9691f43afc3a01119dead6b823ce3d7239e42fc3e47d4028eed50a6a2"}, - {file = "optree-0.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3cdc9fac9888d9eff11128ccfc4d4c10309163e372f312f7942ecee8df3d7824"}, - {file = "optree-0.11.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2b3bb59324d635f2015bb3e237fd772b1fd548eee6cc80e008fbe0f092e9228d"}, - {file = "optree-0.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b201a9405e250cf5770955863af2a236e382bdf5e4e086897ff03c41418c39da"}, - {file = "optree-0.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:162ed3ff2eb3f1c358e131e72c025f2b93d69b906e9057a811d014032ec71dc8"}, - {file = "optree-0.11.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:00a63f10d4a476e8e9aa2988daba9b2e88cb369c5aacc12545957d7d00bcd1a7"}, - {file = "optree-0.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:418850ceff364f51a6d81f32a1efd06a4e2d8df79a162e892685bc20c0aedd72"}, - {file = "optree-0.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b8126d81ecb2c9e3554420834014ba343251f564c905ee3bef09d205b924b0c0"}, - {file = "optree-0.11.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4144126dd3c2ece2d2dd1d5e0b39fb91adf1c46f660c2c5a2df7f80666989d5d"}, - {file = "optree-0.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9d236bc1491a5e366921b95fecc05aa6ff55989a81f2242cd11121b82c24503"}, - {file = "optree-0.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:b26ac807d8993b7e43081b4b7bbb0378b4e5f3e6525daf923c470bc176cc3327"}, - {file = "optree-0.11.0-cp39-cp39-win_arm64.whl", hash = "sha256:9d9d644e5448db9f32e2497487aca3bb2d3f92cbb50429a411ccda3f1f0968f3"}, - {file = "optree-0.11.0.tar.gz", hash = "sha256:8e6a46e95c3ea8546055087d6fe52a1dcd56de5182365f1469106cc72cdf3307"}, + {file = "optree-0.12.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:349aafac463642979f7fe7ca3aa9e2fa8a5a0f81ef7af6946a075b797673e600"}, + {file = "optree-0.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e8046cbbcd5f7494ba7c6811e44a6d2867216f2bdb7cef980a9a62e31d39270c"}, + {file = "optree-0.12.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b43c09cf9dd28aed2efc163f4bb4808d7fad54250812960bf349399ba6972e16"}, + {file = "optree-0.12.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5c2f2e0e3978558bc8f7df8c5a999674097dd0dc71363210783eb8d7a6da8ef9"}, + {file = "optree-0.12.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3e323744d083bd8b4648c9ff2383f01bfbc33098656d56fdd984b2263ef905f3"}, + {file = "optree-0.12.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:80e0d4eba4a65d4c6f2002ed949142a40933b8185523894659c26c34693c4086"}, + {file = "optree-0.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efffa3814ab8e3aaf7bf88495e4b6d263de9689d6f02dfa4490f8f64736806ac"}, + {file = "optree-0.12.1-cp310-cp310-win32.whl", hash = "sha256:4ee926120887404e92877c99714b960bc29f572e8db69fd2e934022d80452f91"}, + {file = "optree-0.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:a11e58d7c0a71a48d74ca0a6715f4c0932c6f9409ba93d600e3326df4cf778ae"}, + {file = "optree-0.12.1-cp310-cp310-win_arm64.whl", hash = "sha256:509bddd38dae8c4e8d6b988f514b7a9fe803ca916b11af67b40520f0b1eeeaef"}, + {file = "optree-0.12.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:06d6ef39b3ef9920d6cdb6d3d1d2804a37092d24dc406c4cb9b46cd6c9a44e89"}, + {file = "optree-0.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ce7cb233e87a2dc127b8ec82bd61f098e6ff1e57d0a09dc110a17b38bfd73034"}, + {file = "optree-0.12.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:35ca77b810cf5959e6930d56534ecbecc4300f5e5fa14b977030265c1c8eab6c"}, + {file = "optree-0.12.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2de1297b2bf019379ab86103e31caa97c8a08628f0c8b58cd7709f9048c589eb"}, + {file = "optree-0.12.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:404cf2decd8fb6a1a8f6fef623c98873cdf7ae086aeb8909d104cd321d829ba0"}, + {file = "optree-0.12.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c987931bd31d0f28cbff28925a875639170534a36ce178a40020aca0769d9549"}, + {file = "optree-0.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e124f30daf79d51b1bbbda7e74d01e637fa47aff4aa64cb082b88057535daa64"}, + {file = "optree-0.12.1-cp311-cp311-win32.whl", hash = "sha256:d913122454d0e3f10dc25a1b598eaf588d225372f41ece3ad4d508bddd363e4d"}, + {file = "optree-0.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d4d8e024b841f99907b2340fee7ac9994fbe300383a9af6c93578d12861a969"}, + {file = "optree-0.12.1-cp311-cp311-win_arm64.whl", hash = "sha256:e20b5569369a5f1e8faa2604799b91a1941fe17b5de8afc84c8c23ff66d8e585"}, + {file = "optree-0.12.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:411a21eca034ddb98eb80e6c4bf552fc46b8d8ab7c4d250446d74d31a251a684"}, + {file = "optree-0.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a67842cd1c5c83d74863872f06fe6ed64e44279c0378267a9805567fe3c38591"}, + {file = "optree-0.12.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9280452c11da0872ec57be5d8f153207d6303b3cbf26115b2bf6d2b8157a5343"}, + {file = "optree-0.12.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2027217c3acaf44e5f5aabe01ba0cbf33066f3f6df870881ddf597965f80db0"}, + {file = "optree-0.12.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f65a31d7cfab2fed2bc29ab6eabcf4205dec6e0ee3cfb7006336c4f76d78fb0e"}, + {file = "optree-0.12.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fc1ec38d1ec43bb8358ab058c3220a70b7bfb56f2bb625f41cb09d117a0d6150"}, + {file = "optree-0.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24d74a9d97d7bdbdbb30356850f204950c39ab8fad7f273ed29d1feda19060b2"}, + {file = "optree-0.12.1-cp312-cp312-win32.whl", hash = "sha256:154738def491199d3fbcd919437315728e0a1caeaf4ec06688c76ef9d56e5ed6"}, + {file = "optree-0.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:1d76905bced5cf569d23dc4890341fae2fa257cce58a492a1603afcdc5969ae7"}, + {file = "optree-0.12.1-cp312-cp312-win_arm64.whl", hash = "sha256:42025da0bac19cc6de756fe64511f15baffb3fa7d8402e54aab035c02903eb5c"}, + {file = "optree-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:afa0051335c6032ee4dfc212952dcfb3b23fe59bcd70f56d25a214e7585cd62c"}, + {file = "optree-0.12.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0460f025bf1c08f2c008b5e3628d849fcb5810345222e57879cd248fec7f9f7"}, + {file = "optree-0.12.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6b98b80b1259e9817aca701beba616ce33e43e856e7d644f7e0f582b8e45565"}, + {file = "optree-0.12.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7e79eedd9406c59d542482768e490795dc6b6f1a014c7852d29d9fd61749bf94"}, + {file = "optree-0.12.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:562036d3de15204ed1a88d9fc262a7e1c20964d22ef132069e20dbd88215f983"}, + {file = "optree-0.12.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aadb26d68f1d7871507f84846d8844aa94f47402d5277ce19cfe5102bb5df9e9"}, + {file = "optree-0.12.1-cp37-cp37m-win32.whl", hash = "sha256:a55a79c1c72f73259532e4cbe9ff65bed9663064747db02591fb4714fe742d2e"}, + {file = "optree-0.12.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1f8baf0ad6b58843d24fa8caf079cf1f0c33cc3658263cff960b5c1d0cc53bc8"}, + {file = "optree-0.12.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7a71dd58522cd6258b61b639092ac7a2631d881f039ef968b31dfd555e513591"}, + {file = "optree-0.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:da37e6cc669a9840844722edb3f8dd5b4f07e99b0e8c9196089cb49af70c7b75"}, + {file = "optree-0.12.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb968d3cc1db8944f220f1a67c9db043b86b47ace90ce3cfd23f3e6500baeb65"}, + {file = "optree-0.12.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50893bd088bdb3e2f07ee481dafd848b483bea1a19cc978f2309139314e5bc7d"}, + {file = "optree-0.12.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba6aed8b9684c5804a5e2d6b246c3b4a68bab793b6829d369ba1c53734852a0c"}, + {file = "optree-0.12.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:646842f8a2de2caaacc32a8c91f8031a93eda145ac9c915bb0fd2ad5249c14b7"}, + {file = "optree-0.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:606983f4696d81128e205a1c34d0c9f3fe6ae12f6c26ed5e8ab3722d6f378ec2"}, + {file = "optree-0.12.1-cp38-cp38-win32.whl", hash = "sha256:fd3ead0c64d22d692284d96c27d5091e682b002ffe5a52afacc9f1fcc8ae3180"}, + {file = "optree-0.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:bd207b43e71fb3f8c315e2e4a5444f48317b2108889e96279d5426bca730a47e"}, + {file = "optree-0.12.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:9c473988b2d8fd7edc3958e6c7cb1d3f92afb7bcaff53b76a8f41cf4f3a24709"}, + {file = "optree-0.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5f24b0a8b181a90a778cadc942a79336d29f0c164704d58cd20989bf7d0bea1c"}, + {file = "optree-0.12.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49d3cfec1a51463b63e11c889bb00207c4e040016833cd202871ad946116925"}, + {file = "optree-0.12.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1ca00bdfe4da8068c2773b7ac4c8c96d3f61b8d21eba6a8642dab23ee631b0d"}, + {file = "optree-0.12.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5bfe3d3e47e10b528f9324d446c871bfad7d0be8c2bd2a2fbc3ddf1600ae8558"}, + {file = "optree-0.12.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2a1a9905d2d917d5aff775283e0a59be2c6b529a219241c248d50b3ad51c6cce"}, + {file = "optree-0.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27ae426745931ae1c2ccd7a78b27f9b7402167e0600fa62e2ef1cd58727e7b94"}, + {file = "optree-0.12.1-cp39-cp39-win32.whl", hash = "sha256:4b32f39988bfe6e76eeefb335da529e614145f7f1dfa8583fbc4aca8a72f504b"}, + {file = "optree-0.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:6d90fb28d52725352858013cafe34d98d90ab1bb86b5d8dc29d420e9bbc5706b"}, + {file = "optree-0.12.1-cp39-cp39-win_arm64.whl", hash = "sha256:d313303a1ce36ea55c3a96fc375c5cc64a9ab814ab2677ce64e4a7d755a9b1d0"}, + {file = "optree-0.12.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:62d232a344c14b8e94fdd6de1acf2c0b05954b05d6bb346bddb13c38be37dc09"}, + {file = "optree-0.12.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88d01ce6f78f209cad8dc4cf2d3222d7056cac93612abfd6beb40ab43a131769"}, + {file = "optree-0.12.1-pp310-pypy310_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b890ba0a21049addf589c314c85e98a68d3dfc84e3954491e9ce60f60cb7b0e7"}, + {file = "optree-0.12.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47db001a224382493ae7a8df16e7a9668e971fc129970d137995421aa6b06f8f"}, + {file = "optree-0.12.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:409ef6f3656299923d722509849d83607bb3e5c621dcfe6aa90ace85665e9b54"}, + {file = "optree-0.12.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:8513d6dd71807abb1037a5b5bc66b45c21afb42e9c90961fa5e762cea3943ab2"}, + {file = "optree-0.12.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0950ee245db2c40824362def1efc15621a6492419628cec1fac0061818420f7"}, + {file = "optree-0.12.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cefd4f4c7596cdd4c95dca431bc41284a43ebd7056e739480f157789aa34579d"}, + {file = "optree-0.12.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23afe4aae42336bdf8cf4fba35c56593405bf8f8e163627f722205b3bf0d9310"}, + {file = "optree-0.12.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:1b2fe5c04c218698a53ed2d4b7372f1989df8cf0a61d616e6f384770d8a5fb1c"}, + {file = "optree-0.12.1.tar.gz", hash = "sha256:76a2240e7482355966a73c6c701e3d1f148420a77849c78d175d3b08bf06ff36"}, ] [package.dependencies] -typing-extensions = ">=4.0.0" +typing-extensions = ">=4.5.0" [package.extras] -benchmark = ["dm-tree (>=0.1,<0.2.0a0)", "jax[cpu] (>=0.4.6,<0.5.0a0)", "pandas", "tabulate", "termcolor", "torch (>=2.0,<2.1.0a0)", "torchvision"] +benchmark = ["dm-tree (>=0.1,<0.2.0a0)", "jax[cpu] (>=0.4.6,<0.5.0a0)", "pandas", "tabulate", "termcolor", "torch (>=2.0,<2.4.0a0)", "torchvision"] docs = ["docutils", "jax[cpu]", "numpy", "sphinx (>=5.2.1)", "sphinx-autoapi", "sphinx-autobuild", "sphinx-autodoc-typehints (>=1.19.2)", "sphinx-copybutton", "sphinx-rtd-theme", "sphinxcontrib-bibtex", "torch"] jax = ["jax"] -lint = ["black (>=22.6.0)", "cpplint", "doc8 (<1.0.0a0)", "flake8", "flake8-bugbear", "flake8-comprehensions", "flake8-docstrings", "flake8-pyi", "flake8-simplify", "isort (>=5.11.0)", "mypy (>=0.990)", "pre-commit", "pydocstyle", "pyenchant", "pylint[spelling] (>=2.15.0)", "ruff", "xdoctest"] +lint = ["black", "cpplint", "doc8", "flake8", "flake8-bugbear", "flake8-comprehensions", "flake8-docstrings", "flake8-pyi", "flake8-simplify", "isort", "mypy", "pre-commit", "pydocstyle", "pyenchant", "pylint[spelling]", "ruff", "xdoctest"] numpy = ["numpy"] test = ["pytest", "pytest-cov", "pytest-xdist"] torch = ["torch"] @@ -2142,84 +2172,95 @@ ptyprocess = ">=0.5" [[package]] name = "pillow" -version = "10.3.0" +version = "10.4.0" description = "Python Imaging Library (Fork)" optional = false python-versions = ">=3.8" files = [ - {file = "pillow-10.3.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:90b9e29824800e90c84e4022dd5cc16eb2d9605ee13f05d47641eb183cd73d45"}, - {file = "pillow-10.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a2c405445c79c3f5a124573a051062300936b0281fee57637e706453e452746c"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78618cdbccaa74d3f88d0ad6cb8ac3007f1a6fa5c6f19af64b55ca170bfa1edf"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:261ddb7ca91fcf71757979534fb4c128448b5b4c55cb6152d280312062f69599"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:ce49c67f4ea0609933d01c0731b34b8695a7a748d6c8d186f95e7d085d2fe475"}, - {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b14f16f94cbc61215115b9b1236f9c18403c15dd3c52cf629072afa9d54c1cbf"}, - {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d33891be6df59d93df4d846640f0e46f1a807339f09e79a8040bc887bdcd7ed3"}, - {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b50811d664d392f02f7761621303eba9d1b056fb1868c8cdf4231279645c25f5"}, - {file = "pillow-10.3.0-cp310-cp310-win32.whl", hash = "sha256:ca2870d5d10d8726a27396d3ca4cf7976cec0f3cb706debe88e3a5bd4610f7d2"}, - {file = "pillow-10.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:f0d0591a0aeaefdaf9a5e545e7485f89910c977087e7de2b6c388aec32011e9f"}, - {file = "pillow-10.3.0-cp310-cp310-win_arm64.whl", hash = "sha256:ccce24b7ad89adb5a1e34a6ba96ac2530046763912806ad4c247356a8f33a67b"}, - {file = "pillow-10.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795"}, - {file = "pillow-10.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdcbb4068117dfd9ce0138d068ac512843c52295ed996ae6dd1faf537b6dbc27"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:9e91179a242bbc99be65e139e30690e081fe6cb91a8e77faf4c409653de39451"}, - {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:1b87bd9d81d179bd8ab871603bd80d8645729939f90b71e62914e816a76fc6bd"}, - {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:81d09caa7b27ef4e61cb7d8fbf1714f5aec1c6b6c5270ee53504981e6e9121ad"}, - {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:048ad577748b9fa4a99a0548c64f2cb8d672d5bf2e643a739ac8faff1164238c"}, - {file = "pillow-10.3.0-cp311-cp311-win32.whl", hash = "sha256:7161ec49ef0800947dc5570f86568a7bb36fa97dd09e9827dc02b718c5643f09"}, - {file = "pillow-10.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d"}, - {file = "pillow-10.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:4e6f7d1c414191c1199f8996d3f2282b9ebea0945693fb67392c75a3a320941f"}, - {file = "pillow-10.3.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:e46f38133e5a060d46bd630faa4d9fa0202377495df1f068a8299fd78c84de84"}, - {file = "pillow-10.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:50b8eae8f7334ec826d6eeffaeeb00e36b5e24aa0b9df322c247539714c6df19"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d3bea1c75f8c53ee4d505c3e67d8c158ad4df0d83170605b50b64025917f338"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19aeb96d43902f0a783946a0a87dbdad5c84c936025b8419da0a0cd7724356b1"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:74d28c17412d9caa1066f7a31df8403ec23d5268ba46cd0ad2c50fb82ae40462"}, - {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:ff61bfd9253c3915e6d41c651d5f962da23eda633cf02262990094a18a55371a"}, - {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d886f5d353333b4771d21267c7ecc75b710f1a73d72d03ca06df49b09015a9ef"}, - {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4b5ec25d8b17217d635f8935dbc1b9aa5907962fae29dff220f2659487891cd3"}, - {file = "pillow-10.3.0-cp312-cp312-win32.whl", hash = "sha256:51243f1ed5161b9945011a7360e997729776f6e5d7005ba0c6879267d4c5139d"}, - {file = "pillow-10.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:412444afb8c4c7a6cc11a47dade32982439925537e483be7c0ae0cf96c4f6a0b"}, - {file = "pillow-10.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:798232c92e7665fe82ac085f9d8e8ca98826f8e27859d9a96b41d519ecd2e49a"}, - {file = "pillow-10.3.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:4eaa22f0d22b1a7e93ff0a596d57fdede2e550aecffb5a1ef1106aaece48e96b"}, - {file = "pillow-10.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cd5e14fbf22a87321b24c88669aad3a51ec052eb145315b3da3b7e3cc105b9a2"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1530e8f3a4b965eb6a7785cf17a426c779333eb62c9a7d1bbcf3ffd5bf77a4aa"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d512aafa1d32efa014fa041d38868fda85028e3f930a96f85d49c7d8ddc0383"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:339894035d0ede518b16073bdc2feef4c991ee991a29774b33e515f1d308e08d"}, - {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:aa7e402ce11f0885305bfb6afb3434b3cd8f53b563ac065452d9d5654c7b86fd"}, - {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0ea2a783a2bdf2a561808fe4a7a12e9aa3799b701ba305de596bc48b8bdfce9d"}, - {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c78e1b00a87ce43bb37642c0812315b411e856a905d58d597750eb79802aaaa3"}, - {file = "pillow-10.3.0-cp38-cp38-win32.whl", hash = "sha256:72d622d262e463dfb7595202d229f5f3ab4b852289a1cd09650362db23b9eb0b"}, - {file = "pillow-10.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:2034f6759a722da3a3dbd91a81148cf884e91d1b747992ca288ab88c1de15999"}, - {file = "pillow-10.3.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:2ed854e716a89b1afcedea551cd85f2eb2a807613752ab997b9974aaa0d56936"}, - {file = "pillow-10.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:dc1a390a82755a8c26c9964d457d4c9cbec5405896cba94cf51f36ea0d855002"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4203efca580f0dd6f882ca211f923168548f7ba334c189e9eab1178ab840bf60"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3102045a10945173d38336f6e71a8dc71bcaeed55c3123ad4af82c52807b9375"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:6fb1b30043271ec92dc65f6d9f0b7a830c210b8a96423074b15c7bc999975f57"}, - {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1dfc94946bc60ea375cc39cff0b8da6c7e5f8fcdc1d946beb8da5c216156ddd8"}, - {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b09b86b27a064c9624d0a6c54da01c1beaf5b6cadfa609cf63789b1d08a797b9"}, - {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3b2348a78bc939b4fed6552abfd2e7988e0f81443ef3911a4b8498ca084f6eb"}, - {file = "pillow-10.3.0-cp39-cp39-win32.whl", hash = "sha256:45ebc7b45406febf07fef35d856f0293a92e7417ae7933207e90bf9090b70572"}, - {file = "pillow-10.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:0ba26351b137ca4e0db0342d5d00d2e355eb29372c05afd544ebf47c0956ffeb"}, - {file = "pillow-10.3.0-cp39-cp39-win_arm64.whl", hash = "sha256:50fd3f6b26e3441ae07b7c979309638b72abc1a25da31a81a7fbd9495713ef4f"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6b02471b72526ab8a18c39cb7967b72d194ec53c1fd0a70b050565a0f366d355"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:8ab74c06ffdab957d7670c2a5a6e1a70181cd10b727cd788c4dd9005b6a8acd9"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:048eeade4c33fdf7e08da40ef402e748df113fd0b4584e32c4af74fe78baaeb2"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e2ec1e921fd07c7cda7962bad283acc2f2a9ccc1b971ee4b216b75fad6f0463"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c8e73e99da7db1b4cad7f8d682cf6abad7844da39834c288fbfa394a47bbced"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:16563993329b79513f59142a6b02055e10514c1a8e86dca8b48a893e33cf91e3"}, - {file = "pillow-10.3.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:dd78700f5788ae180b5ee8902c6aea5a5726bac7c364b202b4b3e3ba2d293170"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aff76a55a8aa8364d25400a210a65ff59d0168e0b4285ba6bf2bd83cf675ba32"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:b7bc2176354defba3edc2b9a777744462da2f8e921fbaf61e52acb95bafa9828"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:793b4e24db2e8742ca6423d3fde8396db336698c55cd34b660663ee9e45ed37f"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93480005693d247f8346bc8ee28c72a2191bdf1f6b5db469c096c0c867ac015"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c83341b89884e2b2e55886e8fbbf37c3fa5efd6c8907124aeb72f285ae5696e5"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1a1d1915db1a4fdb2754b9de292642a39a7fb28f1736699527bb649484fb966a"}, - {file = "pillow-10.3.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a0eaa93d054751ee9964afa21c06247779b90440ca41d184aeb5d410f20ff591"}, - {file = "pillow-10.3.0.tar.gz", hash = "sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d"}, -] - -[package.extras] -docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"] + {file = "pillow-10.4.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:4d9667937cfa347525b319ae34375c37b9ee6b525440f3ef48542fcf66f2731e"}, + {file = "pillow-10.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:543f3dc61c18dafb755773efc89aae60d06b6596a63914107f75459cf984164d"}, + {file = "pillow-10.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7928ecbf1ece13956b95d9cbcfc77137652b02763ba384d9ab508099a2eca856"}, + {file = "pillow-10.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4d49b85c4348ea0b31ea63bc75a9f3857869174e2bf17e7aba02945cd218e6f"}, + {file = "pillow-10.4.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:6c762a5b0997f5659a5ef2266abc1d8851ad7749ad9a6a5506eb23d314e4f46b"}, + {file = "pillow-10.4.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:a985e028fc183bf12a77a8bbf36318db4238a3ded7fa9df1b9a133f1cb79f8fc"}, + {file = "pillow-10.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:812f7342b0eee081eaec84d91423d1b4650bb9828eb53d8511bcef8ce5aecf1e"}, + {file = "pillow-10.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ac1452d2fbe4978c2eec89fb5a23b8387aba707ac72810d9490118817d9c0b46"}, + {file = "pillow-10.4.0-cp310-cp310-win32.whl", hash = "sha256:bcd5e41a859bf2e84fdc42f4edb7d9aba0a13d29a2abadccafad99de3feff984"}, + {file = "pillow-10.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:ecd85a8d3e79cd7158dec1c9e5808e821feea088e2f69a974db5edf84dc53141"}, + {file = "pillow-10.4.0-cp310-cp310-win_arm64.whl", hash = "sha256:ff337c552345e95702c5fde3158acb0625111017d0e5f24bf3acdb9cc16b90d1"}, + {file = "pillow-10.4.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:0a9ec697746f268507404647e531e92889890a087e03681a3606d9b920fbee3c"}, + {file = "pillow-10.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfe91cb65544a1321e631e696759491ae04a2ea11d36715eca01ce07284738be"}, + {file = "pillow-10.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5dc6761a6efc781e6a1544206f22c80c3af4c8cf461206d46a1e6006e4429ff3"}, + {file = "pillow-10.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e84b6cc6a4a3d76c153a6b19270b3526a5a8ed6b09501d3af891daa2a9de7d6"}, + {file = "pillow-10.4.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:bbc527b519bd3aa9d7f429d152fea69f9ad37c95f0b02aebddff592688998abe"}, + {file = "pillow-10.4.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:76a911dfe51a36041f2e756b00f96ed84677cdeb75d25c767f296c1c1eda1319"}, + {file = "pillow-10.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:59291fb29317122398786c2d44427bbd1a6d7ff54017075b22be9d21aa59bd8d"}, + {file = "pillow-10.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:416d3a5d0e8cfe4f27f574362435bc9bae57f679a7158e0096ad2beb427b8696"}, + {file = "pillow-10.4.0-cp311-cp311-win32.whl", hash = "sha256:7086cc1d5eebb91ad24ded9f58bec6c688e9f0ed7eb3dbbf1e4800280a896496"}, + {file = "pillow-10.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:cbed61494057c0f83b83eb3a310f0bf774b09513307c434d4366ed64f4128a91"}, + {file = "pillow-10.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:f5f0c3e969c8f12dd2bb7e0b15d5c468b51e5017e01e2e867335c81903046a22"}, + {file = "pillow-10.4.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:673655af3eadf4df6b5457033f086e90299fdd7a47983a13827acf7459c15d94"}, + {file = "pillow-10.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:866b6942a92f56300012f5fbac71f2d610312ee65e22f1aa2609e491284e5597"}, + {file = "pillow-10.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29dbdc4207642ea6aad70fbde1a9338753d33fb23ed6956e706936706f52dd80"}, + {file = "pillow-10.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf2342ac639c4cf38799a44950bbc2dfcb685f052b9e262f446482afaf4bffca"}, + {file = "pillow-10.4.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:f5b92f4d70791b4a67157321c4e8225d60b119c5cc9aee8ecf153aace4aad4ef"}, + {file = "pillow-10.4.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:86dcb5a1eb778d8b25659d5e4341269e8590ad6b4e8b44d9f4b07f8d136c414a"}, + {file = "pillow-10.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:780c072c2e11c9b2c7ca37f9a2ee8ba66f44367ac3e5c7832afcfe5104fd6d1b"}, + {file = "pillow-10.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:37fb69d905be665f68f28a8bba3c6d3223c8efe1edf14cc4cfa06c241f8c81d9"}, + {file = "pillow-10.4.0-cp312-cp312-win32.whl", hash = "sha256:7dfecdbad5c301d7b5bde160150b4db4c659cee2b69589705b6f8a0c509d9f42"}, + {file = "pillow-10.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:1d846aea995ad352d4bdcc847535bd56e0fd88d36829d2c90be880ef1ee4668a"}, + {file = "pillow-10.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:e553cad5179a66ba15bb18b353a19020e73a7921296a7979c4a2b7f6a5cd57f9"}, + {file = "pillow-10.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8bc1a764ed8c957a2e9cacf97c8b2b053b70307cf2996aafd70e91a082e70df3"}, + {file = "pillow-10.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:6209bb41dc692ddfee4942517c19ee81b86c864b626dbfca272ec0f7cff5d9fb"}, + {file = "pillow-10.4.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bee197b30783295d2eb680b311af15a20a8b24024a19c3a26431ff83eb8d1f70"}, + {file = "pillow-10.4.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1ef61f5dd14c300786318482456481463b9d6b91ebe5ef12f405afbba77ed0be"}, + {file = "pillow-10.4.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:297e388da6e248c98bc4a02e018966af0c5f92dfacf5a5ca22fa01cb3179bca0"}, + {file = "pillow-10.4.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:e4db64794ccdf6cb83a59d73405f63adbe2a1887012e308828596100a0b2f6cc"}, + {file = "pillow-10.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:bd2880a07482090a3bcb01f4265f1936a903d70bc740bfcb1fd4e8a2ffe5cf5a"}, + {file = "pillow-10.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4b35b21b819ac1dbd1233317adeecd63495f6babf21b7b2512d244ff6c6ce309"}, + {file = "pillow-10.4.0-cp313-cp313-win32.whl", hash = "sha256:551d3fd6e9dc15e4c1eb6fc4ba2b39c0c7933fa113b220057a34f4bb3268a060"}, + {file = "pillow-10.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:030abdbe43ee02e0de642aee345efa443740aa4d828bfe8e2eb11922ea6a21ea"}, + {file = "pillow-10.4.0-cp313-cp313-win_arm64.whl", hash = "sha256:5b001114dd152cfd6b23befeb28d7aee43553e2402c9f159807bf55f33af8a8d"}, + {file = "pillow-10.4.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8d4d5063501b6dd4024b8ac2f04962d661222d120381272deea52e3fc52d3736"}, + {file = "pillow-10.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7c1ee6f42250df403c5f103cbd2768a28fe1a0ea1f0f03fe151c8741e1469c8b"}, + {file = "pillow-10.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b15e02e9bb4c21e39876698abf233c8c579127986f8207200bc8a8f6bb27acf2"}, + {file = "pillow-10.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a8d4bade9952ea9a77d0c3e49cbd8b2890a399422258a77f357b9cc9be8d680"}, + {file = "pillow-10.4.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:43efea75eb06b95d1631cb784aa40156177bf9dd5b4b03ff38979e048258bc6b"}, + {file = "pillow-10.4.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:950be4d8ba92aca4b2bb0741285a46bfae3ca699ef913ec8416c1b78eadd64cd"}, + {file = "pillow-10.4.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d7480af14364494365e89d6fddc510a13e5a2c3584cb19ef65415ca57252fb84"}, + {file = "pillow-10.4.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:73664fe514b34c8f02452ffb73b7a92c6774e39a647087f83d67f010eb9a0cf0"}, + {file = "pillow-10.4.0-cp38-cp38-win32.whl", hash = "sha256:e88d5e6ad0d026fba7bdab8c3f225a69f063f116462c49892b0149e21b6c0a0e"}, + {file = "pillow-10.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:5161eef006d335e46895297f642341111945e2c1c899eb406882a6c61a4357ab"}, + {file = "pillow-10.4.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:0ae24a547e8b711ccaaf99c9ae3cd975470e1a30caa80a6aaee9a2f19c05701d"}, + {file = "pillow-10.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:298478fe4f77a4408895605f3482b6cc6222c018b2ce565c2b6b9c354ac3229b"}, + {file = "pillow-10.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:134ace6dc392116566980ee7436477d844520a26a4b1bd4053f6f47d096997fd"}, + {file = "pillow-10.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:930044bb7679ab003b14023138b50181899da3f25de50e9dbee23b61b4de2126"}, + {file = "pillow-10.4.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:c76e5786951e72ed3686e122d14c5d7012f16c8303a674d18cdcd6d89557fc5b"}, + {file = "pillow-10.4.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b2724fdb354a868ddf9a880cb84d102da914e99119211ef7ecbdc613b8c96b3c"}, + {file = "pillow-10.4.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:dbc6ae66518ab3c5847659e9988c3b60dc94ffb48ef9168656e0019a93dbf8a1"}, + {file = "pillow-10.4.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:06b2f7898047ae93fad74467ec3d28fe84f7831370e3c258afa533f81ef7f3df"}, + {file = "pillow-10.4.0-cp39-cp39-win32.whl", hash = "sha256:7970285ab628a3779aecc35823296a7869f889b8329c16ad5a71e4901a3dc4ef"}, + {file = "pillow-10.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:961a7293b2457b405967af9c77dcaa43cc1a8cd50d23c532e62d48ab6cdd56f5"}, + {file = "pillow-10.4.0-cp39-cp39-win_arm64.whl", hash = "sha256:32cda9e3d601a52baccb2856b8ea1fc213c90b340c542dcef77140dfa3278a9e"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:5b4815f2e65b30f5fbae9dfffa8636d992d49705723fe86a3661806e069352d4"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:8f0aef4ef59694b12cadee839e2ba6afeab89c0f39a3adc02ed51d109117b8da"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f4727572e2918acaa9077c919cbbeb73bd2b3ebcfe033b72f858fc9fbef0026"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff25afb18123cea58a591ea0244b92eb1e61a1fd497bf6d6384f09bc3262ec3e"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:dc3e2db6ba09ffd7d02ae9141cfa0ae23393ee7687248d46a7507b75d610f4f5"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:02a2be69f9c9b8c1e97cf2713e789d4e398c751ecfd9967c18d0ce304efbf885"}, + {file = "pillow-10.4.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:0755ffd4a0c6f267cccbae2e9903d95477ca2f77c4fcf3a3a09570001856c8a5"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:a02364621fe369e06200d4a16558e056fe2805d3468350df3aef21e00d26214b"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:1b5dea9831a90e9d0721ec417a80d4cbd7022093ac38a568db2dd78363b00908"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9b885f89040bb8c4a1573566bbb2f44f5c505ef6e74cec7ab9068c900047f04b"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87dd88ded2e6d74d31e1e0a99a726a6765cda32d00ba72dc37f0651f306daaa8"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:2db98790afc70118bd0255c2eeb465e9767ecf1f3c25f9a1abb8ffc8cfd1fe0a"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f7baece4ce06bade126fb84b8af1c33439a76d8a6fd818970215e0560ca28c27"}, + {file = "pillow-10.4.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cfdd747216947628af7b259d274771d84db2268ca062dd5faf373639d00113a3"}, + {file = "pillow-10.4.0.tar.gz", hash = "sha256:166c1cd4d24309b30d61f79f4a9114b7b2313d7450912277855ff5dfd7cd4a06"}, +] + +[package.extras] +docs = ["furo", "olefile", "sphinx (>=7.3)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph"] fpx = ["olefile"] mic = ["olefile"] tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] @@ -2228,27 +2269,56 @@ xmp = ["defusedxml"] [[package]] name = "pineappl" -version = "0.7.4" +version = "0.8.2" description = "Python bindings to PineAPPL" optional = false python-versions = ">=3.6" -files = [] -develop = false +files = [ + {file = "pineappl-0.8.2-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:c8d6c17c520ffd5f51bcec3e266a8071db9b8738aabb136aede0162c53804592"}, + {file = "pineappl-0.8.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e83106fe3f610d258d25c5e2b2d877b81a5c085f9535bf77bb08ff1dd100e884"}, + {file = "pineappl-0.8.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94cac45f70984e78be78d81312ad661fe67d214915b61d68f67dfc46320df625"}, + {file = "pineappl-0.8.2-cp310-none-win_amd64.whl", hash = "sha256:9b53eb233a1fdb8c51c7e83337ce922331c9963d9a2c2a5df5261a6c6fb2b63f"}, + {file = "pineappl-0.8.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:ae4848b1dbc2187d2a95d046a9ea5554896f5987c5cdc4407613da9571caa45b"}, + {file = "pineappl-0.8.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1c79268d27b9eb57d7f41c6932381db04cdaaf15d08898a1be0921698e60b043"}, + {file = "pineappl-0.8.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:430a588f57b3d04bf7c98e5e383b52c7938031b143e89b25d651232d7a1e3f7e"}, + {file = "pineappl-0.8.2-cp311-none-win_amd64.whl", hash = "sha256:2ae7ec709556578f172dde9d44ce3b240f6849da28ef670f5f1ec057f988f956"}, + {file = "pineappl-0.8.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:ac14c4febe9359c2835d14d3d0fa43c8bb2c0bdb8a47eb6fc34bc49cda95abe4"}, + {file = "pineappl-0.8.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7996af12896c3ddcbdcc484e3ab24494e2270cb3142aa7bb9db57736ada1bb26"}, + {file = "pineappl-0.8.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e3dc789ca14119189abc34800e445da0c254d7c0d883e6110173134f3d5c053"}, + {file = "pineappl-0.8.2-cp312-none-win_amd64.whl", hash = "sha256:616130d80cd916348d7f074605de91d63a52823d11ecc628732c5fa588e43099"}, + {file = "pineappl-0.8.2-cp37-cp37m-macosx_10_12_x86_64.whl", hash = "sha256:d78f4023bd2b326bd6aa9292bf7aed53d719b4f524014e047c59b47259ec42b5"}, + {file = "pineappl-0.8.2-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:08d77228ad49dbd4d8ea3125587400fbe0557ac9e25c6213d8385243d0864116"}, + {file = "pineappl-0.8.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cfac22c101c300bc818e88dac1ebdb6dc5c7fad47b1756dfe637875261fabd42"}, + {file = "pineappl-0.8.2-cp37-none-win_amd64.whl", hash = "sha256:b6b7a00506f47701960459e430f3f3ebbe57a44b9b2bada58b2132c8c7b8c29a"}, + {file = "pineappl-0.8.2-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:8c082e773e0022d247146ae727b789daee05fefadd24edf731f860461b292b6e"}, + {file = "pineappl-0.8.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bc0360c64a7ef0e0b6e72a400b898f53ec5f68a24afca058e097a5427edcac54"}, + {file = "pineappl-0.8.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32675c13d765179d09a6d2df2bb912cde08b1ff909ecb0b06a647d52ead7bf5f"}, + {file = "pineappl-0.8.2-cp38-none-win_amd64.whl", hash = "sha256:875e1841ccbf4d9d9121824579fbe68d1c81c321c986c014c98c8947a0194e68"}, + {file = "pineappl-0.8.2-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:64642a513e1f2aa7366f0c61ae1b555fd32f29b6dc93f9468686c7bc2f834692"}, + {file = "pineappl-0.8.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9ef3d1ba8a683169167b8325d1253f4758a96323e40fa4e232406b06ae2c4f68"}, + {file = "pineappl-0.8.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13d37ce012eb60a889f6c98609c25175c3199c0d25ff87fbdf17b21be41e3797"}, + {file = "pineappl-0.8.2-cp39-none-win_amd64.whl", hash = "sha256:fea0e9c28a1097709aa1814695decba14d4a6ce822b5389fe65a0b6be796d0f7"}, + {file = "pineappl-0.8.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:dd8e07807822c3a3ef84ba593af8241672a807f925194de50c2eb14b9d5761ec"}, + {file = "pineappl-0.8.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:003f105cfc42396e221ab7d4a32e65aef0bd4995461a5876dda23ba599a40861"}, + {file = "pineappl-0.8.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f351279f0b1ec3297699b317673abdca40070eb1cd3daa87091aef0815dc644b"}, + {file = "pineappl-0.8.2-pp37-pypy37_pp73-macosx_10_12_x86_64.whl", hash = "sha256:53d76f9bdb44f3a839f40cbafeca65ff7c412e4df19354ddaee0fbb8b7b0274b"}, + {file = "pineappl-0.8.2-pp37-pypy37_pp73-macosx_11_0_arm64.whl", hash = "sha256:1513d2d3136f3ef5f2841fcbfdad9dac49e92a78621178eeb0b86b328a3e7857"}, + {file = "pineappl-0.8.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:4fc10331d716ca77830932e3e9c77ce5d3a47e0ce9a267b60ceb8337a8d08741"}, + {file = "pineappl-0.8.2-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:aa9c2058d9db424ee229ed1e25cab6096b4c5c2d8c001d14e6b3a882d533ac84"}, + {file = "pineappl-0.8.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a021fb7830334be732ae70bb22b3f043c1518144be5d7ddc54153436ab19f88a"}, + {file = "pineappl-0.8.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:33a300487c4f46ddf12b98295e62e1fd8d62069dbdee592fe3d6b40df3b057ae"}, + {file = "pineappl-0.8.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7696282ee87d176f6c716cea1c283e2a1a5afdd88c5938a6ed006c4967386ea"}, + {file = "pineappl-0.8.2.tar.gz", hash = "sha256:20599304ce32ba046541b1790d2d19a7262dc9041b0ca219e69913a3b97beaf0"}, +] [package.dependencies] numpy = ">=1.16.0,<2.0.0" [package.extras] +cli = ["pineappl-cli"] docs = ["nbsphinx (>=0.9.2)", "sphinx (>=6.2.1)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-bibtex (>=2.5.0)"] test = ["pytest", "pytest-cov"] -[package.source] -type = "git" -url = "https://github.com/NNPDF/pineappl.git" -reference = "extend_eko_convolution" -resolved_reference = "e236b3c4dc8415577d0142bce450084d97a0231f" -subdirectory = "pineappl_py" - [[package]] name = "platformdirs" version = "4.2.2" @@ -2356,13 +2426,13 @@ files = [ [[package]] name = "pure-eval" -version = "0.2.2" +version = "0.2.3" description = "Safely evaluate AST nodes without side effects" optional = false python-versions = "*" files = [ - {file = "pure_eval-0.2.2-py3-none-any.whl", hash = "sha256:01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350"}, - {file = "pure_eval-0.2.2.tar.gz", hash = "sha256:2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3"}, + {file = "pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0"}, + {file = "pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42"}, ] [package.extras] @@ -2429,17 +2499,17 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pylint" -version = "3.2.3" +version = "3.2.6" description = "python code static checker" optional = false python-versions = ">=3.8.0" files = [ - {file = "pylint-3.2.3-py3-none-any.whl", hash = "sha256:b3d7d2708a3e04b4679e02d99e72329a8b7ee8afb8d04110682278781f889fa8"}, - {file = "pylint-3.2.3.tar.gz", hash = "sha256:02f6c562b215582386068d52a30f520d84fdbcf2a95fc7e855b816060d048b60"}, + {file = "pylint-3.2.6-py3-none-any.whl", hash = "sha256:03c8e3baa1d9fb995b12c1dbe00aa6c4bcef210c2a2634374aedeb22fb4a8f8f"}, + {file = "pylint-3.2.6.tar.gz", hash = "sha256:a5d01678349454806cff6d886fb072294f56a58c4761278c97fb557d708e1eb3"}, ] [package.dependencies] -astroid = ">=3.2.2,<=3.3.0-dev0" +astroid = ">=3.2.4,<=3.3.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} dill = [ {version = ">=0.2", markers = "python_version < \"3.11\""}, @@ -3119,13 +3189,13 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-htmlhelp" -version = "2.0.5" +version = "2.0.6" description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" optional = false python-versions = ">=3.9" files = [ - {file = "sphinxcontrib_htmlhelp-2.0.5-py3-none-any.whl", hash = "sha256:393f04f112b4d2f53d93448d4bce35842f62b307ccdc549ec1585e950bc35e04"}, - {file = "sphinxcontrib_htmlhelp-2.0.5.tar.gz", hash = "sha256:0dc87637d5de53dd5eec3a6a01753b1ccf99494bd756aafecd74b4fa9e729015"}, + {file = "sphinxcontrib_htmlhelp-2.0.6-py3-none-any.whl", hash = "sha256:1b9af5a2671a61410a868fce050cab7ca393c218e6205cbc7f590136f207395c"}, + {file = "sphinxcontrib_htmlhelp-2.0.6.tar.gz", hash = "sha256:c6597da06185f0e3b4dc952777a04200611ef563882e0c244d27a15ee22afa73"}, ] [package.extras] @@ -3163,19 +3233,19 @@ test = ["flake8", "mypy", "pytest"] [[package]] name = "sphinxcontrib-qthelp" -version = "1.0.7" +version = "1.0.8" description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents" optional = false python-versions = ">=3.9" files = [ - {file = "sphinxcontrib_qthelp-1.0.7-py3-none-any.whl", hash = "sha256:e2ae3b5c492d58fcbd73281fbd27e34b8393ec34a073c792642cd8e529288182"}, - {file = "sphinxcontrib_qthelp-1.0.7.tar.gz", hash = "sha256:053dedc38823a80a7209a80860b16b722e9e0209e32fea98c90e4e6624588ed6"}, + {file = "sphinxcontrib_qthelp-1.0.8-py3-none-any.whl", hash = "sha256:323d6acc4189af76dfe94edd2a27d458902319b60fcca2aeef3b2180c106a75f"}, + {file = "sphinxcontrib_qthelp-1.0.8.tar.gz", hash = "sha256:db3f8fa10789c7a8e76d173c23364bdf0ebcd9449969a9e6a3dd31b8b7469f03"}, ] [package.extras] lint = ["docutils-stubs", "flake8", "mypy"] standalone = ["Sphinx (>=5)"] -test = ["pytest"] +test = ["defusedxml (>=0.7.1)", "pytest"] [[package]] name = "sphinxcontrib-serializinghtml" @@ -3304,12 +3374,12 @@ files = [ [[package]] name = "tensorboard" -version = "2.16.2" +version = "2.17.0" description = "TensorBoard lets you watch Tensors Flow" optional = true python-versions = ">=3.9" files = [ - {file = "tensorboard-2.16.2-py3-none-any.whl", hash = "sha256:9f2b4e7dad86667615c0e5cd072f1ea8403fc032a299f0072d6f74855775cc45"}, + {file = "tensorboard-2.17.0-py3-none-any.whl", hash = "sha256:859a499a9b1fb68a058858964486627100b71fcb21646861c61d31846a6478fb"}, ] [package.dependencies] @@ -3317,7 +3387,7 @@ absl-py = ">=0.4" grpcio = ">=1.48.2" markdown = ">=2.6.8" numpy = ">=1.12.0" -protobuf = ">=3.19.6,<4.24.0 || >4.24.0" +protobuf = ">=3.19.6,<4.24.0 || >4.24.0,<5.0.0" setuptools = ">=41.0.0" six = ">1.9" tensorboard-data-server = ">=0.7.0,<0.8.0" @@ -3337,44 +3407,40 @@ files = [ [[package]] name = "tensorflow" -version = "2.16.1" +version = "2.17.0" description = "TensorFlow is an open source machine learning framework for everyone." optional = true python-versions = ">=3.9" files = [ - {file = "tensorflow-2.16.1-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:ab79f156dd746c2dae906e3b4c5daac3855742941752e5a2c28f094c56eed466"}, - {file = "tensorflow-2.16.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:8e376ab46fb1df18a1f927d77011d36ecf7b717a81cbfe4a941c7bf5236939b3"}, - {file = "tensorflow-2.16.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ae0554471d472b8095f8a5204d878389d0d4bc88f6ef6edcd477b952dff5cfab"}, - {file = "tensorflow-2.16.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e96047657c64459a36a0cc211a3d003df96c7be3f95a84f7b705715f5697270"}, - {file = "tensorflow-2.16.1-cp310-cp310-win_amd64.whl", hash = "sha256:21a3c6d76a39f52754c389326f6bef8aef3c26b5bc89ca365add4a69483e569e"}, - {file = "tensorflow-2.16.1-cp311-cp311-macosx_10_15_x86_64.whl", hash = "sha256:f8a5b83ca4bf1813da158f63479cfdf848c0761e5120258417b3a96074a489f5"}, - {file = "tensorflow-2.16.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:cc2065d1d27f9f89fea8a0fe8fdf6c437ae60987cd7f2928e0d00e532e79e44d"}, - {file = "tensorflow-2.16.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:617df9fa2d697c4bc22fa3ee87eb01d580ab1bd0438fea15c4ec2f2870c40bb0"}, - {file = "tensorflow-2.16.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:930c61100cce3a5cb63d30fe6776504405214e8398a26ca968222ecb8b8f9404"}, - {file = "tensorflow-2.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:093573a8eb93ef9511e7015b8de9659ed27156f2f05e6d1211f8f4cb76407ee1"}, - {file = "tensorflow-2.16.1-cp312-cp312-macosx_10_15_x86_64.whl", hash = "sha256:09cac3c6a8fbf85a9b95491b58086154dd00a09956ed31823bb45c6605f0e881"}, - {file = "tensorflow-2.16.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:bbf06d879070dfce2617c7d2bb19696bb1b2bcbb3b4ae009520e7166dd75dfc2"}, - {file = "tensorflow-2.16.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c612cdd436bb55b8dae1ecdd1d253496c95b006870b7165b8480c6606b8622aa"}, - {file = "tensorflow-2.16.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a123fbb5788ba30d1113ce01bb166ddf85056fcb40e287c32a929ebfa4aa061"}, - {file = "tensorflow-2.16.1-cp312-cp312-win_amd64.whl", hash = "sha256:1c5611e7357b7a4bc6dccc60750c91e27cdff82622fc917848f22add5ab8de26"}, - {file = "tensorflow-2.16.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:e9cf3fba7f389ff8b8342c5fbebb2529321e0ce9e03d7bcb3657ee0876686c36"}, - {file = "tensorflow-2.16.1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:42858b5d14159a2b9cc01c7f5a88e063b0601f20430cb358374005a67da38114"}, - {file = "tensorflow-2.16.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:92152aa77c402684e9066885515af6a45d88455c4453a818052c7369357078d8"}, - {file = "tensorflow-2.16.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03b946e73bf48d857928329b8b321b00b42fe1b4f774c6580666683b0629689f"}, - {file = "tensorflow-2.16.1-cp39-cp39-win_amd64.whl", hash = "sha256:8231a9d7bba92a51231dcdcc3073920ad7d22fa88c64c7e2ecb7f1feac9d5fcb"}, + {file = "tensorflow-2.17.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:515fe5ae8a9bc50312575412b08515f3ca66514c155078e0707bdffbea75d783"}, + {file = "tensorflow-2.17.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b36683ac28af20abc3a548c72bf4537b00df1b1f3dd39d59df3873fefaf26f15"}, + {file = "tensorflow-2.17.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:147c93ded4cb7e500a65d3c26d74744ff41660db7a8afe2b00d1d08bf329b4ec"}, + {file = "tensorflow-2.17.0-cp310-cp310-win_amd64.whl", hash = "sha256:e46090587f69e33637d17d7c3d94a790cac7d4bc5ff5ecbf3e71fdc6982fe96e"}, + {file = "tensorflow-2.17.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:e8d26d6c24ccfb139db1306599257ca8f5cfe254ef2d023bfb667f374a17a64d"}, + {file = "tensorflow-2.17.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca82f98ea38fa6c9e08ccc69eb6c2fab5b35b30a8999115b8b63b6f02fc69d9d"}, + {file = "tensorflow-2.17.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8339777b1b5ebd8ffadaa8196f786e65fbb081a371d8e87b52f24563392d8552"}, + {file = "tensorflow-2.17.0-cp311-cp311-win_amd64.whl", hash = "sha256:ef615c133cf4d592a073feda634ccbeb521a554be57de74f8c318d38febbeab5"}, + {file = "tensorflow-2.17.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:ee18b4fcd627c5e872eabb25092af6c808b6ec77948662c88fc5c89a60eb0211"}, + {file = "tensorflow-2.17.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:72adfef0ee39dd641627906fd7b244fcf21bdd8a87216a998ed74d9c74653aff"}, + {file = "tensorflow-2.17.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ad7bfea6afb4ded3928ca5b24df9fda876cea4904c103a5163fcc0c3483e7a4"}, + {file = "tensorflow-2.17.0-cp312-cp312-win_amd64.whl", hash = "sha256:278bc80642d799adf08dc4e04f291aab603bba7457d50c1f9bc191ebbca83f43"}, + {file = "tensorflow-2.17.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:97f89e95d68b4b46e1072243b9f315c3b340e27cc07b1e1988e2ca97ad844305"}, + {file = "tensorflow-2.17.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dde37cff74ed22b8fa2eea944805b001ae38e96adc989666422bdea34f4e2d47"}, + {file = "tensorflow-2.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ae8e6746deb2ec807b902ba26d62fcffb6a6b53555a1a5906ec00416c5e4175"}, + {file = "tensorflow-2.17.0-cp39-cp39-win_amd64.whl", hash = "sha256:8f80d11ad3766570deb6ff47d2bed2d166f51399ca08205e38ef024345571d6f"}, ] [package.dependencies] absl-py = ">=1.0.0" astunparse = ">=1.6.0" -flatbuffers = ">=23.5.26" +flatbuffers = ">=24.3.25" gast = ">=0.2.1,<0.5.0 || >0.5.0,<0.5.1 || >0.5.1,<0.5.2 || >0.5.2" google-pasta = ">=0.1.1" grpcio = ">=1.24.3,<2.0" h5py = ">=3.10.0" -keras = ">=3.0.0" +keras = ">=3.2.0" libclang = ">=13.0.0" -ml-dtypes = ">=0.3.1,<0.4.0" +ml-dtypes = ">=0.3.1,<0.5.0" numpy = [ {version = ">=1.23.5,<2.0.0", markers = "python_version <= \"3.11\""}, {version = ">=1.26.0,<2.0.0", markers = "python_version >= \"3.12\""}, @@ -3385,7 +3451,7 @@ protobuf = ">=3.20.3,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4 requests = ">=2.21.0,<3" setuptools = "*" six = ">=1.12.0" -tensorboard = ">=2.16,<2.17" +tensorboard = ">=2.17,<2.18" tensorflow-io-gcs-filesystem = {version = ">=0.23.1", markers = "python_version < \"3.12\""} termcolor = ">=1.1.0" typing-extensions = ">=3.6.6" @@ -3396,27 +3462,27 @@ and-cuda = ["nvidia-cublas-cu12 (==12.3.4.1)", "nvidia-cuda-cupti-cu12 (==12.3.1 [[package]] name = "tensorflow-io-gcs-filesystem" -version = "0.37.0" +version = "0.37.1" description = "TensorFlow IO" optional = true -python-versions = "<3.12,>=3.7" -files = [ - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:82cc4d8e26fb143fc814ac8ab95fede83363a315f5b62f8ae68312f1aca1cc6e"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:677d6d7c84a94a3b27ea5d16633ea09adadef09c2630480e8e94209558828b02"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e5d1ac4d2010e8cdf259918ba1500c942b51b7ed2e549f55b404c1fb52f695d"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2901bc4a91158fa0a10d37594c8a5efb1445dd5a041b1b5b90f782a5d1b15e"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:eab6e4c1daf7ddbfef608cd8e2102861021678dfb3f6a7fb3f613db9d6992919"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:4ec3c0d0a9d3676a2e74198e3dff66d74c7c34f974257f2176236d0703b31a0e"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:af0f79400656bb88bf326d2b8e63aef49c07a0ce8c14c3e2589a62e765d8c21f"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13bc337f2c2db63a39c81c8fd0ececc0c3d5fcf4ce229dfed0b0085a23dd60e9"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:57e7af9c81e79bf8fb552985dc8972ac90437d34bd4c1c9019a92a07eb12bc98"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:48a8e7aec651bea8db410f6426c6446a56d16a5ab32201a70d8d684c113137b7"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71ccf64a137efcb2be2627225b4e48110cbf34da39b23c5cc688fe803f2510f1"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03d5598b8007551f4e1391bf85a83a1865e3fa0789beef15a200efaa06a23fb5"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:8d3ad5f30b6dbe09baefdb80e9aa7ff3869c772928b865f8ffc8402be7675a43"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:95bb229e968fca943806c6ac04e81dc4966fc4a36ab83efaa061a4ecb3ea5e85"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8385f4fe447812bd8e2e11ef523cf02765319100e5d9e4a9b5a876d4440c900c"}, - {file = "tensorflow_io_gcs_filesystem-0.37.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:500ec871a8d59cf78992b7fd4750d86ea3d35e231fb0bea7a7eabcf73abfceeb"}, +python-versions = "<3.13,>=3.7" +files = [ + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:249c12b830165841411ba71e08215d0e94277a49c551e6dd5d72aab54fe5491b"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:257aab23470a0796978efc9c2bcf8b0bc80f22e6298612a4c0a50d3f4e88060c"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8febbfcc67c61e542a5ac1a98c7c20a91a5e1afc2e14b1ef0cb7c28bc3b6aa70"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9679b36e3a80921876f31685ab6f7270f3411a4cc51bc2847e80d0e4b5291e27"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:32c50ab4e29a23c1f91cd0f9ab8c381a0ab10f45ef5c5252e94965916041737c"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:b02f9c5f94fd62773954a04f69b68c4d576d076fd0db4ca25d5479f0fbfcdbad"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e1f2796b57e799a8ca1b75bf47c2aaa437c968408cc1a402a9862929e104cda"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ee7c8ee5fe2fd8cb6392669ef16e71841133041fee8a330eff519ad9b36e4556"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:ffebb6666a7bfc28005f4fbbb111a455b5e7d6cd3b12752b7050863ecb27d5cc"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:fe8dcc6d222258a080ac3dfcaaaa347325ce36a7a046277f6b3e19abc1efb3c5"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fbb33f1745f218464a59cecd9a18e32ca927b0f4d77abd8f8671b645cc1a182f"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:286389a203a5aee1a4fa2e53718c661091aa5fea797ff4fa6715ab8436b02e6c"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:ee5da49019670ed364f3e5fb86b46420841a6c3cb52a300553c63841671b3e6d"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:8943036bbf84e7a2be3705cb56f9c9df7c48c9e614bb941f0936c58e3ca89d6f"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:426de1173cb81fbd62becec2012fc00322a295326d90eb6c737fab636f182aed"}, + {file = "tensorflow_io_gcs_filesystem-0.37.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0df00891669390078a003cedbdd3b8e645c718b111917535fa1d7725e95cdb95"}, ] [package.extras] @@ -3453,13 +3519,13 @@ files = [ [[package]] name = "tomlkit" -version = "0.12.5" +version = "0.13.0" description = "Style preserving TOML library" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "tomlkit-0.12.5-py3-none-any.whl", hash = "sha256:af914f5a9c59ed9d0762c7b64d3b5d5df007448eb9cd2edc8a46b1eafead172f"}, - {file = "tomlkit-0.12.5.tar.gz", hash = "sha256:eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c"}, + {file = "tomlkit-0.13.0-py3-none-any.whl", hash = "sha256:7075d3042d03b80f603482d69bf0c8f345c2b30e41699fd8883227f89972b264"}, + {file = "tomlkit-0.13.0.tar.gz", hash = "sha256:08ad192699734149f5b97b45f1f18dad7eb1b6d16bc72ad0c2335772650d7b72"}, ] [[package]] @@ -3753,4 +3819,4 @@ nnpdf = ["lhapdf-management", "nnpdf"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "bf579e1d95d7f4c3a6d1799fb5316e2a806bf9f4dc863ecceb57c92e4d6c83cb" +content-hash = "476fc442066d4dd520a0a608d3aa9277d7134bc4abbbf81f1c70beb2737ae370" From 96ec8866375c830da056bf06eee163757c6df6f2 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 23 Jul 2024 20:04:40 +0200 Subject: [PATCH 40/66] fix in nfoll --- src/pineko/cli/fonll.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pineko/cli/fonll.py b/src/pineko/cli/fonll.py index 2fbeb4df..1f01f892 100644 --- a/src/pineko/cli/fonll.py +++ b/src/pineko/cli/fonll.py @@ -122,9 +122,12 @@ def ekos(theoryid, datasets, overwrite): @fonll_.command() @click.argument("theoryID", type=click.INT) @click.argument("datasets", type=click.STRING, nargs=-1) -@click.option("--pdf", "-p", default=None, help="PDF set used for comparison") +@click.option("--pdf1", "-p", default=None, help="PDF set used for comparison") +@click.option( + "--pdf2", default=None, help="Second PDF set used for comparison, if needed" +) @click.option("--overwrite", is_flag=True, help="Allow files to be overwritten") -def fks(theoryid, datasets, pdf, overwrite): +def fks(theoryid, datasets, pdf1, pdf2, overwrite): """Command to generate numerical FONLL FK tables. 1. Produce the 7 FK tables needed for numerical FONLL. @@ -138,7 +141,7 @@ def fks(theoryid, datasets, pdf, overwrite): silent=False, clear_logs=True, overwrite=overwrite, - ).fks(pdf) + ).fks(pdf1, pdf2) # combine for dataset in datasets: From 807fc028644655f35291d8719a7ad0631248ea8a Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Wed, 24 Jul 2024 09:28:01 +0200 Subject: [PATCH 41/66] make notation mor uniform --- benchmarks/bench_theory.py | 4 +-- src/pineko/cli/convolve.py | 10 +++---- src/pineko/evolve.py | 52 +++++++++++++++++------------------ src/pineko/theory.py | 56 +++++++++++++++++++------------------- 4 files changed, 60 insertions(+), 62 deletions(-) diff --git a/benchmarks/bench_theory.py b/benchmarks/bench_theory.py index 4f62a2c9..6ca39281 100644 --- a/benchmarks/bench_theory.py +++ b/benchmarks/bench_theory.py @@ -171,9 +171,9 @@ def benchmark_fk(test_files, test_configs): ) theory_obj_hera.opcard(grid_name, pathlib.Path(test_files / grid_path), tcard) - theory_obj_hera.fk(grid_name, grid_path, tcard, pdf_a=None, pdf_b=None) + theory_obj_hera.fk(grid_name, grid_path, tcard, pdf1=None, pdf2=None) # test overwrite function - theory_obj_hera.fk(grid_name, grid_path, tcard, pdf_a=None, pdf_b=None) + theory_obj_hera.fk(grid_name, grid_path, tcard, pdf1=None, pdf2=None) log_path = pathlib.Path(test_files / "logs/fk/400-HERA_NC_225GEV_EP_SIGMARED.log") if os.path.exists(log_path): os.remove(log_path) diff --git a/src/pineko/cli/convolve.py b/src/pineko/cli/convolve.py index e197b95d..2f91072a 100644 --- a/src/pineko/cli/convolve.py +++ b/src/pineko/cli/convolve.py @@ -68,7 +68,7 @@ def subcommand( """ grid = pineappl.grid.Grid.read(grid_path) n_ekos = len(op_paths) - with eko.EKO.edit(op_paths[0]) as operators_a: + with eko.EKO.edit(op_paths[0]) as operators1: rich.print( rich.panel.Panel.fit("Computing ...", style="magenta", box=rich.box.SQUARE), f" {grid_path}\n", @@ -80,7 +80,7 @@ def subcommand( if n_ekos == 1: _grid, _fk, comp = evolve.evolve_grid( grid, - operators_a, + operators1, fktable, max_as, max_al, @@ -92,16 +92,16 @@ def subcommand( min_as=min_as, ) else: - with eko.EKO.edit(op_paths[1]) as operators_b: + with eko.EKO.edit(op_paths[1]) as operators2: _grid, _fk, comp = evolve.evolve_grid( grid, - operators_a, + operators1, fktable, max_as, max_al, xir, xif, - operators_b=operators_b, + operators2=operators2, assumptions=assumptions, comparison_pdf1=pdf1, comparison_pdf2=pdf2, diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 4c3dc441..02c4e51f 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -192,7 +192,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): # switch on polarization ? kv = pineappl_grid.key_values() - conv_type_a, conv_type_b = get_ekos_convolution_type(kv) + conv_type_1, conv_type_2 = get_ekos_convolution_type(kv) # fragmentation function grid? if "timelike" in kv: @@ -258,26 +258,26 @@ def dump_card(card_path, operators_card, conv_type, suffix=False): # For hardonic obs we might need to dump 2 eko cards - if conv_type_b is None or conv_type_a == conv_type_b: - dump_card(card_path, operators_card, conv_type_a) + if conv_type_2 is None or conv_type_1 == conv_type_2: + dump_card(card_path, operators_card, conv_type_1) else: # dump card_a - dump_card(card_path, operators_card, conv_type_a, suffix=True) + dump_card(card_path, operators_card, conv_type_1, suffix=True) # dump card_b - dump_card(card_path, operators_card, conv_type_b, suffix=True) + dump_card(card_path, operators_card, conv_type_2, suffix=True) return operators_card["xgrid"], q2_grid def evolve_grid( grid, - operators_a, + operators1, fktable_path, max_as, max_al, xir, xif, - operators_b=None, + operators2=None, assumptions="Nf6Ind", comparison_pdf1=None, comparison_pdf2=None, @@ -290,7 +290,7 @@ def evolve_grid( ---------- grid : pineappl.grid.Grid unconvolved grid - operators_a : eko.EKO + operators1 : eko.EKO evolution operator fktable_path : str target path for convolved grid @@ -302,8 +302,8 @@ def evolve_grid( renormalization scale variation xif : float factorization scale variation - operators_b: eko.EKO - additonal evolution operator if different from operators_a + operators2: eko.EKO + additonal evolution operator if different from operators1 assumptions : str assumptions on the flavor dimension comparison_pdf1 : None or str @@ -327,9 +327,9 @@ def evolve_grid( evol_info = grid.evolve_info(order_mask) x_grid = evol_info.x1 mur2_grid = evol_info.ren1 - xif = 1.0 if operators_a.operator_card.configs.scvar_method is not None else xif - tcard = operators_a.theory_card - opcard = operators_a.operator_card + xif = 1.0 if operators1.operator_card.configs.scvar_method is not None else xif + tcard = operators1.theory_card + opcard = operators1.operator_card # rotate the targetgrid if "integrability_version" in grid.key_values(): x_grid = np.append(x_grid, 1.0) @@ -346,9 +346,9 @@ def xgrid_reshape(operators): elif not np.allclose(operators.bases.inputpids, br.rotate_flavor_to_evolution): raise ValueError("The EKO is neither in flavor nor in evolution basis.") - xgrid_reshape(operators_a) - if operators_b is not None: - xgrid_reshape(operators_b) + xgrid_reshape(operators1) + if operators2 is not None: + xgrid_reshape(operators2) # PineAPPL wants alpha_s = 4*pi*a_s # remember that we already accounted for xif in the opcard generation @@ -389,17 +389,17 @@ def prepare(operator, items): ) return (info, op.operator) - if operators_b is not None: + if operators2 is not None: fktable = grid.evolve_with_slice_iter2( - map(lambda it: prepare(operators_a, it), operators_a.items()), - map(lambda it: prepare(operators_b, it), operators_b.items()), + map(lambda it: prepare(operators1, it), operators1.items()), + map(lambda it: prepare(operators2, it), operators2.items()), alphas_table=alphas_values, xi=(xir, xif), order_mask=order_mask, ) else: fktable = grid.evolve_with_slice_iter( - map(lambda it: prepare(operators_a, it), operators_a.items()), + map(lambda it: prepare(operators1, it), operators1.items()), ren1=mur2_grid, alphas=alphas_values, xi=(xir, xif), @@ -407,15 +407,13 @@ def prepare(operator, items): ) rich.print(f"Optimizing for {assumptions}") fktable.optimize(PyFkAssumptions(assumptions)) - fktable.set_key_value("eko_version", operators_a.metadata.version) - fktable.set_key_value("eko_theory_card", json.dumps(operators_a.theory_card.raw)) + fktable.set_key_value("eko_version", operators1.metadata.version) + fktable.set_key_value("eko_theory_card", json.dumps(operators1.theory_card.raw)) - fktable.set_key_value( - "eko_operator_card", json.dumps(operators_a.operator_card.raw) - ) - if operators_b is not None: + fktable.set_key_value("eko_operator_card", json.dumps(operators1.operator_card.raw)) + if operators2 is not None: fktable.set_key_value( - "eko_operator_card_b", json.dumps(operators_b.operator_card.raw) + "eko_operator_card_b", json.dumps(operators2.operator_card.raw) ) fktable.set_key_value("pineko_version", version.__version__) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 9c21dd24..abbf926a 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -35,14 +35,14 @@ def get_eko_names(grid_path, name): grid name, i.e. it's true stem """ grid_kv = pineappl.grid.Grid.read(grid_path).key_values() - conv_type_a, conv_type_b = evolve.get_ekos_convolution_type(grid_kv) + conv_type_1, conv_type_2 = evolve.get_ekos_convolution_type(grid_kv) names = [] - if conv_type_b is None or conv_type_a == conv_type_b: + if conv_type_2 is None or conv_type_1 == conv_type_2: names = [name] else: names = [ - f"{name}_{conv_type_a}", - f"{name}_{conv_type_b}", + f"{name}_{conv_type_1}", + f"{name}_{conv_type_2}", ] return names @@ -389,7 +389,7 @@ def ekos(self): self.ekos_path().mkdir(exist_ok=True) self.iterate(self.eko, tcard=tcard) - def fk(self, name, grid_path, tcard, pdf_a, pdf_b): + def fk(self, name, grid_path, tcard, pdf1, pdf2): """Compute a single FK table. Parameters @@ -400,15 +400,15 @@ def fk(self, name, grid_path, tcard, pdf_a, pdf_b): path to grid tcard : dict theory card - pdf_a : str + pdf1 : str comparison PDF - pdf_b : str + pdf2 : str comparison PDF """ # activate logging paths = configs.configs["paths"] do_log = self.activate_logging( - paths["logs"]["fk"], f"{self.theory_id}-{name}-{pdf_a}-{pdf_b}.log" + paths["logs"]["fk"], f"{self.theory_id}-{name}-{pdf1}-{pdf2}.log" ) # Relevant for FONLL-B and FONLL-D: For FFN0 terms, PTO is lower than @@ -466,27 +466,27 @@ def fk(self, name, grid_path, tcard, pdf_a, pdf_b): check_scvar_evolve(grid, max_as, max_al, check.Scale.FACT) # loading ekos to produce a tmp copy n_ekos = len(eko_filename) - with eko.EKO.read(eko_filename[0]) as operators_a: + with eko.EKO.read(eko_filename[0]) as operators1: # Skip the computation of the fktable if the eko is empty - if len(operators_a.mu2grid) == 0 and check.is_num_fonll(tcard["FNS"]): + if len(operators1.mu2grid) == 0 and check.is_num_fonll(tcard["FNS"]): rich.print("[green] Skipping empty eko for nFONLL.") return eko_tmp_path_a = ( - operators_a.paths.root.parent / f"eko-tmp-{name}-{np.random.rand()}.tar" + operators1.paths.root.parent / f"eko-tmp-{name}-{np.random.rand()}.tar" ) - operators_a.deepcopy(eko_tmp_path_a) + operators1.deepcopy(eko_tmp_path_a) if n_ekos > 1: - with eko.EKO.read(eko_filename[1]) as operators_b: + with eko.EKO.read(eko_filename[1]) as operators2: eko_tmp_path_b = ( - operators_a.paths.root.parent + operators1.paths.root.parent / f"eko-tmp-{name}-{np.random.rand()}.tar" ) - operators_b.deepcopy(eko_tmp_path_b) + operators2.deepcopy(eko_tmp_path_b) - with eko.EKO.edit(eko_tmp_path_a) as operators_a: + with eko.EKO.edit(eko_tmp_path_a) as operators1: # Obtain the assumptions hash assumptions = theory_card.construct_assumptions(tcard) # do it! @@ -512,30 +512,30 @@ def fk(self, name, grid_path, tcard, pdf_a, pdf_b): if n_ekos == 1: _grid, _fk, comparison = evolve.evolve_grid( grid, - operators_a, + operators1, fk_filename, max_as, max_al, xir=xir, xif=xif, assumptions=assumptions, - comparison_pdf1=pdf_a, + comparison_pdf1=pdf1, meta_data={"theory_card": json.dumps(tcard)}, ) else: - with eko.EKO.edit(eko_tmp_path_b) as operators_b: + with eko.EKO.edit(eko_tmp_path_b) as operators2: _grid, _fk, comparison = evolve.evolve_grid( grid, - operators_a, + operators1, fk_filename, max_as, max_al, xir=xir, xif=xif, assumptions=assumptions, - operators_b=operators_b, - comparison_pdf1=pdf_a, - comparison_pdf2=pdf_b, + operators2=operators2, + comparison_pdf1=pdf1, + comparison_pdf2=pdf2, meta_data={"theory_card": json.dumps(tcard)}, ) # Remove tmp ekos @@ -551,24 +551,24 @@ def fk(self, name, grid_path, tcard, pdf_a, pdf_b): ) if do_log and comparison is not None: logger.info( - "Comparison with %s %s:\n %s", pdf_a, pdf_b, comparison.to_string() + "Comparison with %s %s:\n %s", pdf1, pdf2, comparison.to_string() ) if fk_filename.exists(): rich.print(f"[green]Success:[/] Wrote FK table to {fk_filename}") - def fks(self, pdf_a, pdf_b): + def fks(self, pdf1, pdf2): """Compute all FK tables. Parameters ---------- - pdf_a : str + pdf1 : str comparison PDF - pdf_b : str + pdf2 : str second comparison PDF if needed """ tcard = theory_card.load(self.theory_id) self.fks_path.mkdir(exist_ok=True) - self.iterate(self.fk, tcard=tcard, pdf_a=pdf_a, pdf_b=pdf_b) + self.iterate(self.fk, tcard=tcard, pdf1=pdf1, pdf2=pdf2) def construct_ren_sv_grids(self, flavors): """Construct renormalization scale variations terms for all the grids in a dataset.""" From bbfc21029f1fcb35ca95929f0c9c80566af5ff31 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Wed, 24 Jul 2024 09:28:23 +0200 Subject: [PATCH 42/66] small fix bench --- benchmarks/bench_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/bench_regression.py b/benchmarks/bench_regression.py index ec6349aa..b6e2bf7f 100644 --- a/benchmarks/bench_regression.py +++ b/benchmarks/bench_regression.py @@ -133,4 +133,4 @@ def benchmark_regression(tmp_path, dataset): raise FileNotFoundError("Regression did not exist and has been regenerated") regression_data = np.load(regression_path) - np.testing.assert_allclose(regression_data, result) + np.testing.assert_allclose(regression_data, result, rtol=4e-6) From 2553fe1221819fa2531409e87b45334e26800185 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Wed, 24 Jul 2024 10:47:32 +0200 Subject: [PATCH 43/66] first round of comments --- benchmarks/bench_cli.py | 4 ++-- docs/source/overview/running.rst | 4 ++-- src/pineko/cli/compare.py | 6 +++--- src/pineko/cli/convolve.py | 7 ++++--- src/pineko/comparator.py | 15 ++++++--------- src/pineko/evolve.py | 7 ++++--- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/benchmarks/bench_cli.py b/benchmarks/bench_cli.py index fb6aed62..a4460759 100644 --- a/benchmarks/bench_cli.py +++ b/benchmarks/bench_cli.py @@ -81,7 +81,7 @@ def benchmark_compare_cli(lhapdf_path, test_files, test_pdf): with lhapdf_path(test_pdf): result = runner.invoke( command, - ["compare", str(grid_path), str(fk_path), "2", "0", "NNPDF40_nlo_as_01180"], + ["compare", str(fk_path), str(grid_path), "2", "0", "NNPDF40_nlo_as_01180"], ) assert "yll left" in result.output @@ -95,7 +95,7 @@ def benchmark_convolve_cli(test_files, tmp_path): runner = CliRunner() result = runner.invoke( command, - ["convolve", str(grid_path), str(fk_path), "2", "0", str(eko_path)], + ["convolve", str(fk_path), str(grid_path), "2", "0", str(eko_path)], ) assert "Optimizing for Nf6Ind" in result.output diff --git a/docs/source/overview/running.rst b/docs/source/overview/running.rst index fe2bb123..ef1ee4b7 100644 --- a/docs/source/overview/running.rst +++ b/docs/source/overview/running.rst @@ -50,7 +50,7 @@ Then you can convolve the |EKO| with the grids by running:: Note that you can also convolve a single grid with a single eko (obtaining a single FK table) by running:: - pineko convolve GRID FKTABLE MAX_AS MAX_AL OP_PATH_1 OP_PATH_2 + pineko convolve FKTABLE GRID MAX_AS MAX_AL OP_PATH_1 OP_PATH_2 If necessary it is possible to specify the values of the *renormalization* and *factorization* scale variations with the options ``--xir`` and ``--xif``. @@ -91,7 +91,7 @@ Comparing grids and FK tables With the command ``pineko compare`` it is possible to compare the predictions as provided by the grid (convolved with a |PDF|) with the predictions as provided by the |FK| table. This is done like - pineko compare GRID FKTABLE MAX_AS MAX_AL PDF_1 PDF_2 + pineko compare FKTABLE GRID MAX_AS MAX_AL PDF_1 PDF_2 again eventually specifying the values of *renormalization* and *factorization* scales with the appropriate options. diff --git a/src/pineko/cli/compare.py b/src/pineko/cli/compare.py index f018dc1a..ac711316 100644 --- a/src/pineko/cli/compare.py +++ b/src/pineko/cli/compare.py @@ -9,14 +9,14 @@ @command.command("compare") -@click.argument("pineappl_path", type=click.Path(exists=True)) @click.argument("fktable_path", type=click.Path()) +@click.argument("grid_path", type=click.Path(exists=True)) @click.argument("max_as", type=int) @click.argument("max_al", type=int) @click.argument("pdfs", type=click.STRING, nargs=-1) @click.option("--xir", default=1.0, help="renormalization scale variation") @click.option("--xif", default=1.0, help="factorization scale variation") -def subcommand(pineappl_path, fktable_path, max_as, max_al, pdfs, xir, xif): +def subcommand(fktable_path, grid_path, max_as, max_al, pdfs, xir, xif): """Compare process level PineAPPL grid and derived FK Table. The comparison between the grid stored at PINEAPPL_PATH, and the FK table @@ -29,7 +29,7 @@ def subcommand(pineappl_path, fktable_path, max_as, max_al, pdfs, xir, xif): XIR and XIF represent the renormalization and factorization scale in the grid respectively. """ - pine = pineappl.grid.Grid.read(pineappl_path) + pine = pineappl.grid.Grid.read(grid_path) fk = pineappl.fk_table.FkTable.read(fktable_path) pdf1 = pdfs[0] pdf2 = pdfs[1] if len(pdfs) == 2 else None diff --git a/src/pineko/cli/convolve.py b/src/pineko/cli/convolve.py index 2f91072a..45853d08 100644 --- a/src/pineko/cli/convolve.py +++ b/src/pineko/cli/convolve.py @@ -10,8 +10,8 @@ @command.command("convolve") -@click.argument("grid_path", type=click.Path(exists=True)) @click.argument("fktable", type=click.Path()) +@click.argument("grid_path", type=click.Path(exists=True)) @click.argument("max_as", type=int) @click.argument("max_al", type=int) @click.argument("op_paths", type=click.Path(exists=True), nargs=-1) @@ -34,8 +34,8 @@ show_default=True, ) def subcommand( - grid_path, fktable, + grid_path, max_as, max_al, op_paths, @@ -72,7 +72,8 @@ def subcommand( rich.print( rich.panel.Panel.fit("Computing ...", style="magenta", box=rich.box.SQUARE), f" {grid_path}\n", - f"+ {op_paths}\n", + f"+ {op_paths[0]}\n", + f"+ {op_paths[1]}\n" if n_ekos > 1 else "", f"= {fktable}\n", f"with max_as={max_as}, max_al={max_al}, xir={xir}, xif={xif}", f"min_as: {min_as}" if min_as is not None else "", diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index 94cec74f..949297e9 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -35,15 +35,12 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): import lhapdf # pylint: disable=import-error,import-outside-toplevel pdfset1 = lhapdf.mkPDF(pdf1, 0) - pdgid1 = int(pdfset1.set().get_entry("Particle")) - if pdf2 is not None: pdfset2 = lhapdf.mkPDF(pdf1, 0) - pdgid2 = int(pdfset2.set().get_entry("Particle")) else: pdfset2 = pdfset1 - pdgid2 = pdgid1 + # TODO: This should probably changed in the future to use the Grid::convolutions try: parton1 = pine.key_values()["convolution_particle_1"] parton2 = pine.key_values()["convolution_particle_2"] @@ -56,9 +53,9 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): if hadronic: before = np.array( pine.convolve_with_two( - pdg_id1=pdgid1, + pdg_id1=parton1, xfx1=pdfset1.xfxQ2, - pdg_id2=pdgid2, + pdg_id2=parton2, xfx2=pdfset2.xfxQ2, alphas=pdfset1.alphasQ2, order_mask=order_mask, @@ -66,19 +63,19 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): ) ) after = np.array( - fktable.convolve_with_two(pdgid1, pdfset1.xfxQ2, pdgid2, pdfset2.xfxQ2) + fktable.convolve_with_two(parton1, pdfset1.xfxQ2, parton2, pdfset2.xfxQ2) ) else: before = np.array( pine.convolve_with_one( - pdgid1, + parton1, pdfset1.xfxQ2, pdfset1.alphasQ2, order_mask=order_mask, xi=((xir, xif),), ) ) - after = np.array(fktable.convolve_with_one(pdgid1, pdfset1.xfxQ2)) + after = np.array(fktable.convolve_with_one(parton1, pdfset1.xfxQ2)) df = pd.DataFrame() # add bin info diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 02c4e51f..d0779b00 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -57,15 +57,16 @@ def get_ekos_convolution_type(kv): kv: dict pineappl grid metadata """ + # TODO: This should probably changed in the future to use the Grid::convolutions if "convolution_type_1" in kv: conv_type_1 = kv["convolution_type_1"] - # TODO: this case is now deprecated and should be remved from yadism and pinefarm + # TODO: polarized is now deprecated, needed for compatibility elif "polarized" in kv and kv["polarized"]: conv_type_1 = "PolPDF" else: conv_type_1 = "UnpolPDF" - # TODO: initial_state_2 is now deprecated, needed for comatibility + # TODO: initial_state_2 is now deprecated, needed for compatibility if "convolution_particle_2" in kv: part_2 = kv["convolution_particle_2"] else: @@ -413,7 +414,7 @@ def prepare(operator, items): fktable.set_key_value("eko_operator_card", json.dumps(operators1.operator_card.raw)) if operators2 is not None: fktable.set_key_value( - "eko_operator_card_b", json.dumps(operators2.operator_card.raw) + "eko_operator_card_2", json.dumps(operators2.operator_card.raw) ) fktable.set_key_value("pineko_version", version.__version__) From b715f038ac02488ad259448c8ba4e7d1fb9beef3 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Wed, 24 Jul 2024 11:32:42 +0200 Subject: [PATCH 44/66] cast parton to int --- src/pineko/comparator.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index 949297e9..b9f0a7a1 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -42,11 +42,11 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): # TODO: This should probably changed in the future to use the Grid::convolutions try: - parton1 = pine.key_values()["convolution_particle_1"] - parton2 = pine.key_values()["convolution_particle_2"] + parton1 = int(pine.key_values()["convolution_particle_1"]) + parton2 = int(pine.key_values()["convolution_particle_2"]) except KeyError: - parton1 = pine.key_values()["initial_state_1"] - parton2 = pine.key_values()["initial_state_2"] + parton1 = int(pine.key_values()["initial_state_1"]) + parton2 = int(pine.key_values()["initial_state_2"]) hadronic = parton1 == parton2 order_mask = pineappl.grid.Order.create_mask(pine.orders(), max_as, max_al, True) From 8da63b11d66fa6077198dc87c43d9c821a87a8d3 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 11:52:12 +0200 Subject: [PATCH 45/66] fix syntax --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index d0779b00..58e04bd5 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -394,7 +394,7 @@ def prepare(operator, items): fktable = grid.evolve_with_slice_iter2( map(lambda it: prepare(operators1, it), operators1.items()), map(lambda it: prepare(operators2, it), operators2.items()), - alphas_table=alphas_values, + alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, ) From 58d6b38d5f9b57a1585c2bbede2019dc400cfeab Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 12:01:48 +0200 Subject: [PATCH 46/66] fix syntax --- src/pineko/evolve.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 58e04bd5..18e448da 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -394,6 +394,7 @@ def prepare(operator, items): fktable = grid.evolve_with_slice_iter2( map(lambda it: prepare(operators1, it), operators1.items()), map(lambda it: prepare(operators2, it), operators2.items()), + ren1=mur2_grid, alphas=alphas_values, xi=(xir, xif), order_mask=order_mask, From 04a56f7b8f03524a4a305450c12a1ab90d3faa87 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 14:26:27 +0200 Subject: [PATCH 47/66] add some usefule logs --- src/pineko/comparator.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index b9f0a7a1..6df1de86 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -3,6 +3,7 @@ import numpy as np import pandas as pd import pineappl +import rich def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): @@ -44,6 +45,25 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): try: parton1 = int(pine.key_values()["convolution_particle_1"]) parton2 = int(pine.key_values()["convolution_particle_2"]) + + if ( + fktable.key_values()["convolution_type_1"] + != pine.key_values()["convolution_type_1"] + or fktable.key_values()["convolution_type_2"] + != pine.key_values()["convolution_type_2"] + ): + raise ValueError( + "Grids and FkTables do not have the same convolution types" + ) + + # log some useful info to check if PDFs are swapped + rich.print( + f"[yellow]Convolution type 1: {fktable.key_values()['convolution_type_1']}, PDF 1: {pdf1}" + ) + rich.print( + f"[yellow]Convolution type 2: {fktable.key_values()['convolution_type_2']}, PDF 2: {pdf2}" + ) + except KeyError: parton1 = int(pine.key_values()["initial_state_1"]) parton2 = int(pine.key_values()["initial_state_2"]) From da1aa536d61edf574762c51efecc4fadad14fdbf Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 14:45:11 +0200 Subject: [PATCH 48/66] add a check on convolution types --- src/pineko/evolve.py | 17 +++++++++++++++-- src/pineko/theory.py | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 18e448da..fbfabfee 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -49,7 +49,7 @@ def sv_scheme(tcard): return modsv -def get_ekos_convolution_type(kv): +def get_grid_convolution_type(kv): """Retrieve the ekos convolution type. Parameters @@ -80,6 +80,17 @@ def get_ekos_convolution_type(kv): return conv_type_1, conv_type_2 +def check_convolution_types(grid, operators1, operators2): + """Check that grid and eko convolution types are sorted correctly.""" + grid_conv_1, grid_conv_2 = get_grid_convolution_type(grid.key_values()) + grid_conv_1 = grid_conv_1 == "PolPDF" + grid_conv_2 = grid_conv_2 == "PolPDF" + eko_conv_1 = operators1.operator_card.configs.polarized + eko_conv_2 = operators2.operator_card.configs.polarized + if grid_conv_1 != eko_conv_1 or grid_conv_2 != eko_conv_2: + raise ValueError("Grid and Eko convolution types are not matching.") + + def write_operator_card_from_file( pineappl_path: os.PathLike, default_card_path: os.PathLike, @@ -193,7 +204,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): # switch on polarization ? kv = pineappl_grid.key_values() - conv_type_1, conv_type_2 = get_ekos_convolution_type(kv) + conv_type_1, conv_type_2 = get_grid_convolution_type(kv) # fragmentation function grid? if "timelike" in kv: @@ -391,6 +402,8 @@ def prepare(operator, items): return (info, op.operator) if operators2 is not None: + # check convolutions order + check_convolution_types(grid, operators1, operators2) fktable = grid.evolve_with_slice_iter2( map(lambda it: prepare(operators1, it), operators1.items()), map(lambda it: prepare(operators2, it), operators2.items()), diff --git a/src/pineko/theory.py b/src/pineko/theory.py index abbf926a..aaa233c5 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -35,7 +35,7 @@ def get_eko_names(grid_path, name): grid name, i.e. it's true stem """ grid_kv = pineappl.grid.Grid.read(grid_path).key_values() - conv_type_1, conv_type_2 = evolve.get_ekos_convolution_type(grid_kv) + conv_type_1, conv_type_2 = evolve.get_grid_convolution_type(grid_kv) names = [] if conv_type_2 is None or conv_type_1 == conv_type_2: names = [name] From 31235b27e12eb2e09736d3c62c9b1c67e35d39c3 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 15:06:50 +0200 Subject: [PATCH 49/66] typo --- src/pineko/comparator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index 6df1de86..f51b1f1b 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -37,7 +37,7 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): pdfset1 = lhapdf.mkPDF(pdf1, 0) if pdf2 is not None: - pdfset2 = lhapdf.mkPDF(pdf1, 0) + pdfset2 = lhapdf.mkPDF(pdf2, 0) else: pdfset2 = pdfset1 From 67a45a2d10a30b8290030ddd89feb2fcc55d5a71 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 16:06:26 +0200 Subject: [PATCH 50/66] propagate metadata in scale variations --- src/pineko/scale_variations.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pineko/scale_variations.py b/src/pineko/scale_variations.py index 3fe47551..04ff9d80 100644 --- a/src/pineko/scale_variations.py +++ b/src/pineko/scale_variations.py @@ -240,7 +240,8 @@ def construct_and_dump_order_exists_grid(ori_grid, to_construct_order): norma = ori_grid.bin_normalizations() remap_obj = pineappl.bin.BinRemapper(norma, limits) new_grid.set_remapper(remap_obj) - new_grid.set_key_value("initial_state_2", ori_grid.key_values()["initial_state_2"]) + for k, v in ori_grid.key_values().items(): + new_grid.set_key_value(k, v) return new_grid From 618f46bda8675537a66c19c82d5f040f52758f33 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 24 Jul 2024 16:08:09 +0200 Subject: [PATCH 51/66] improve check --- src/pineko/evolve.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index fbfabfee..bbf2696f 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -83,12 +83,16 @@ def get_grid_convolution_type(kv): def check_convolution_types(grid, operators1, operators2): """Check that grid and eko convolution types are sorted correctly.""" grid_conv_1, grid_conv_2 = get_grid_convolution_type(grid.key_values()) - grid_conv_1 = grid_conv_1 == "PolPDF" - grid_conv_2 = grid_conv_2 == "PolPDF" - eko_conv_1 = operators1.operator_card.configs.polarized - eko_conv_2 = operators2.operator_card.configs.polarized - if grid_conv_1 != eko_conv_1 or grid_conv_2 != eko_conv_2: - raise ValueError("Grid and Eko convolution types are not matching.") + conv_to_eko = {"UnpolPDF": (False, False), "PolPDF": (True, False)} + + def check(op, pine_conv): + is_pol, is_tl = conv_to_eko[pine_conv] + cfg = op.operator_card.configs + if cfg.polarized != is_pol or cfg.time_like != is_tl: + raise ValueError("Grid and Eko convolution types are not matching.") + + check(operators1, grid_conv_1) + check(operators2, grid_conv_2) def write_operator_card_from_file( From 4bc04012f5ad95bc776f547cac5770b6b0830d7a Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:49:58 +0200 Subject: [PATCH 52/66] Update src/pineko/theory.py Co-authored-by: Tanjona Rabemananjara --- src/pineko/theory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index aaa233c5..454405d9 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -25,7 +25,7 @@ def get_eko_names(grid_path, name): - """Find eko names. + """Get the names of the ekos depending on the types of convolution present in the grid. Parameters ---------- From 4859448f78230f02f9dba11c0e22c07ca46280b2 Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:50:22 +0200 Subject: [PATCH 53/66] Update src/pineko/theory.py Co-authored-by: Tanjona Rabemananjara --- src/pineko/theory.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 454405d9..60c02acf 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -33,6 +33,11 @@ def get_eko_names(grid_path, name): path to grid name : str grid name, i.e. it's true stem + + Returns + ----------- + list[str] : + list containing the names of the ekos """ grid_kv = pineappl.grid.Grid.read(grid_path).key_values() conv_type_1, conv_type_2 = evolve.get_grid_convolution_type(grid_kv) From ddf92ef07990cfd3a28313822bae1fd087375114 Mon Sep 17 00:00:00 2001 From: giacomomagni Date: Tue, 30 Jul 2024 17:03:43 +0200 Subject: [PATCH 54/66] pre-commit --- src/pineko/theory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 60c02acf..ac3572e6 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -33,10 +33,10 @@ def get_eko_names(grid_path, name): path to grid name : str grid name, i.e. it's true stem - + Returns ----------- - list[str] : + list[str] : list containing the names of the ekos """ grid_kv = pineappl.grid.Grid.read(grid_path).key_values() From f3d818714b27b3eee7c5b7c13270d9a3c4f2e3c1 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Tue, 30 Jul 2024 18:29:48 +0200 Subject: [PATCH 55/66] fix pre-commit error due to identation --- src/pineko/theory.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index ac3572e6..1f72213e 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -34,10 +34,10 @@ def get_eko_names(grid_path, name): name : str grid name, i.e. it's true stem - Returns - ----------- - list[str] : - list containing the names of the ekos + Returns + ------- + list[str] : + list containing the names of the ekos """ grid_kv = pineappl.grid.Grid.read(grid_path).key_values() conv_type_1, conv_type_2 = evolve.get_grid_convolution_type(grid_kv) From e066d88f3fe8cb0e83a9e4e7a3c3564bb1fa3edd Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 14 Aug 2024 11:10:20 +0200 Subject: [PATCH 56/66] apply review suggetsion --- src/pineko/cli/convolve.py | 50 ++++++++++++++++---------------------- src/pineko/theory.py | 48 +++++++++++++++--------------------- 2 files changed, 41 insertions(+), 57 deletions(-) diff --git a/src/pineko/cli/convolve.py b/src/pineko/cli/convolve.py index 45853d08..6244ae35 100644 --- a/src/pineko/cli/convolve.py +++ b/src/pineko/cli/convolve.py @@ -78,36 +78,28 @@ def subcommand( f"with max_as={max_as}, max_al={max_al}, xir={xir}, xif={xif}", f"min_as: {min_as}" if min_as is not None else "", ) - if n_ekos == 1: - _grid, _fk, comp = evolve.evolve_grid( - grid, - operators1, - fktable, - max_as, - max_al, - xir, - xif, - assumptions=assumptions, - comparison_pdf1=pdf1, - comparison_pdf2=pdf2, - min_as=min_as, - ) + if n_ekos == 2: + operators2 = eko.EKO.edit(op_paths[1]) else: - with eko.EKO.edit(op_paths[1]) as operators2: - _grid, _fk, comp = evolve.evolve_grid( - grid, - operators1, - fktable, - max_as, - max_al, - xir, - xif, - operators2=operators2, - assumptions=assumptions, - comparison_pdf1=pdf1, - comparison_pdf2=pdf2, - min_as=min_as, - ) + operators2 = None + + _grid, _fk, comp = evolve.evolve_grid( + grid, + operators1, + fktable, + max_as, + max_al, + xir, + xif, + operators2=operators2, + assumptions=assumptions, + comparison_pdf1=pdf1, + comparison_pdf2=pdf2, + min_as=min_as, + ) + + if n_ekos == 2: + operators2.close() if comp is not None: print(comp.to_string()) diff --git a/src/pineko/theory.py b/src/pineko/theory.py index 1f72213e..fa58d169 100644 --- a/src/pineko/theory.py +++ b/src/pineko/theory.py @@ -514,35 +514,27 @@ def fk(self, name, grid_path, tcard, pdf1, pdf2): f"with max_as={max_as}, max_al={max_al}, xir={xir}, xif={xif}", ) - if n_ekos == 1: - _grid, _fk, comparison = evolve.evolve_grid( - grid, - operators1, - fk_filename, - max_as, - max_al, - xir=xir, - xif=xif, - assumptions=assumptions, - comparison_pdf1=pdf1, - meta_data={"theory_card": json.dumps(tcard)}, - ) + if n_ekos == 2: + operators2 = eko.EKO.edit(eko_tmp_path_b) else: - with eko.EKO.edit(eko_tmp_path_b) as operators2: - _grid, _fk, comparison = evolve.evolve_grid( - grid, - operators1, - fk_filename, - max_as, - max_al, - xir=xir, - xif=xif, - assumptions=assumptions, - operators2=operators2, - comparison_pdf1=pdf1, - comparison_pdf2=pdf2, - meta_data={"theory_card": json.dumps(tcard)}, - ) + operators2 = None + + _grid, _fk, comparison = evolve.evolve_grid( + grid, + operators1, + fk_filename, + max_as, + max_al, + xir=xir, + xif=xif, + assumptions=assumptions, + operators2=operators2, + comparison_pdf1=pdf1, + comparison_pdf2=pdf2, + meta_data={"theory_card": json.dumps(tcard)}, + ) + + if n_ekos == 2: # Remove tmp ekos eko_tmp_path_b.unlink() From 725db3df2d018de88dab96aa5adeb92b078db4cd Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Wed, 14 Aug 2024 11:15:00 +0200 Subject: [PATCH 57/66] apply review suggetsion --- src/pineko/evolve.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index bbf2696f..8719014f 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -350,16 +350,18 @@ def evolve_grid( if "integrability_version" in grid.key_values(): x_grid = np.append(x_grid, 1.0) - def xgrid_reshape(operators): + def xgrid_reshape(full_operator): eko.io.manipulate.xgrid_reshape( - operators, targetgrid=eko.interpolation.XGrid(x_grid) + full_operator, targetgrid=eko.interpolation.XGrid(x_grid) ) - check.check_grid_and_eko_compatible(grid, operators, xif, max_as, max_al) + check.check_grid_and_eko_compatible(grid, full_operator, xif, max_as, max_al) # rotate to evolution (if doable and necessary) - if np.allclose(operators.bases.inputpids, br.flavor_basis_pids): - eko.io.manipulate.to_evol(operators) + if np.allclose(full_operator.bases.inputpids, br.flavor_basis_pids): + eko.io.manipulate.to_evol(full_operator) # Here we are checking if the EKO contains the rotation matrix (flavor to evol) - elif not np.allclose(operators.bases.inputpids, br.rotate_flavor_to_evolution): + elif not np.allclose( + full_operator.bases.inputpids, br.rotate_flavor_to_evolution + ): raise ValueError("The EKO is neither in flavor nor in evolution basis.") xgrid_reshape(operators1) From ecb021ebef75a7a322d7e075b16a926c7159753d Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Thu, 15 Aug 2024 18:18:12 +0200 Subject: [PATCH 58/66] fix bug, finally --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 8719014f..0a3da541 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -61,7 +61,7 @@ def get_grid_convolution_type(kv): if "convolution_type_1" in kv: conv_type_1 = kv["convolution_type_1"] # TODO: polarized is now deprecated, needed for compatibility - elif "polarized" in kv and kv["polarized"]: + elif "polarized" in kv and kv["polarized"] == "True": conv_type_1 = "PolPDF" else: conv_type_1 = "UnpolPDF" From a279d702e26d6ac309fa3a5acae440e1f050cf06 Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Fri, 16 Aug 2024 12:07:47 +0200 Subject: [PATCH 59/66] Update src/pineko/cli/compare.py Co-authored-by: Juan M. Cruz-Martinez --- src/pineko/cli/compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/cli/compare.py b/src/pineko/cli/compare.py index ac711316..29f6f54a 100644 --- a/src/pineko/cli/compare.py +++ b/src/pineko/cli/compare.py @@ -13,7 +13,7 @@ @click.argument("grid_path", type=click.Path(exists=True)) @click.argument("max_as", type=int) @click.argument("max_al", type=int) -@click.argument("pdfs", type=click.STRING, nargs=-1) +@click.argument("pdfs", type=click.STRING, nargs=2) @click.option("--xir", default=1.0, help="renormalization scale variation") @click.option("--xif", default=1.0, help="factorization scale variation") def subcommand(fktable_path, grid_path, max_as, max_al, pdfs, xir, xif): From fde3e6526f0c0bc7b0ba6f180e9b4205d7c0b8ba Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Fri, 16 Aug 2024 12:18:15 +0200 Subject: [PATCH 60/66] Update src/pineko/evolve.py Co-authored-by: Juan M. Cruz-Martinez --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index 0a3da541..c09d26be 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -73,7 +73,7 @@ def get_grid_convolution_type(kv): part_2 = kv["initial_state_2"] # check for DIS - if check.islepton(float(part_2)): + if check.islepton(int(part_2)): conv_type_2 = None else: conv_type_2 = kv.get("convolution_type_2", "UnpolPDF") From d80c9fe447602702ce2851700c372e40c48ce703 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 16 Aug 2024 12:45:59 +0200 Subject: [PATCH 61/66] address review comments --- src/pineko/comparator.py | 4 +-- src/pineko/evolve.py | 55 ++++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index f51b1f1b..e00e961e 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -52,9 +52,7 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): or fktable.key_values()["convolution_type_2"] != pine.key_values()["convolution_type_2"] ): - raise ValueError( - "Grids and FkTables do not have the same convolution types" - ) + raise TypeError("Grids and FkTables do not have the same convolution types") # log some useful info to check if PDFs are swapped rich.print( diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index c09d26be..dc011a3d 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -66,7 +66,8 @@ def get_grid_convolution_type(kv): else: conv_type_1 = "UnpolPDF" - # TODO: initial_state_2 is now deprecated, needed for compatibility + # TODO: initial_state_1 and initial_state_2 are now deprecated, + # needed for compatibility. initial_state_1 is always a proton: 2212 if "convolution_particle_2" in kv: part_2 = kv["convolution_particle_2"] else: @@ -85,15 +86,12 @@ def check_convolution_types(grid, operators1, operators2): grid_conv_1, grid_conv_2 = get_grid_convolution_type(grid.key_values()) conv_to_eko = {"UnpolPDF": (False, False), "PolPDF": (True, False)} - def check(op, pine_conv): + for op, pine_conv in [(operators1, grid_conv_1), (operators2, grid_conv_2)]: is_pol, is_tl = conv_to_eko[pine_conv] cfg = op.operator_card.configs if cfg.polarized != is_pol or cfg.time_like != is_tl: raise ValueError("Grid and Eko convolution types are not matching.") - check(operators1, grid_conv_1) - check(operators2, grid_conv_2) - def write_operator_card_from_file( pineappl_path: os.PathLike, @@ -132,6 +130,36 @@ def write_operator_card_from_file( return write_operator_card(pineappl_grid, default_card, card_path, tcard) +def dump_card(card_path, operators_card, conv_type, suffix=False): + """Set polarization and dump operator cards. + + Parameters + ---------- + card_path : str or os.PathLike + target path + operators_card : dict + operators card to dump + conv_type : str + convolution type + suffix : bool, None + if True use the convolution type as operator card suffix + """ + op_to_dump = copy.deepcopy(operators_card) + op_to_dump["configs"]["polarized"] = conv_type == "PolPDF" + + if suffix: + card_path = card_path.parent / f"{card_path.stem}_{conv_type}.yaml" + with open(card_path, "w", encoding="UTF-8") as f: + yaml.safe_dump(op_to_dump, f) + pineko_version = metadata.version("pineko") + f.write(f"# {pineko_version=}") + + if card_path.exists(): + rich.print( + f"[green]Success:[/] Wrote card with {len(operators_card['mugrid'])} Q2 points to {card_path}" + ) + + def write_operator_card(pineappl_grid, default_card, card_path, tcard): """Generate operator card for this grid. @@ -204,7 +232,6 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): # Add the version of eko and pineko to the operator card # using importlib.metadata.version to get the correct tag in editable mode operators_card["eko_version"] = metadata.version("eko") - pineko_version = metadata.version("pineko") # switch on polarization ? kv = pineappl_grid.key_values() @@ -257,23 +284,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): "are you sure that's what you want?" ) - def dump_card(card_path, operators_card, conv_type, suffix=False): - op_to_dump = copy.deepcopy(operators_card) - op_to_dump["configs"]["polarized"] = conv_type == "PolPDF" - - if suffix: - card_path = card_path.parent / f"{card_path.stem}_{conv_type}.yaml" - with open(card_path, "w", encoding="UTF-8") as f: - yaml.safe_dump(op_to_dump, f) - f.write(f"# {pineko_version=}") - - if card_path.exists(): - rich.print( - f"[green]Success:[/] Wrote card with {len(q2_grid)} Q2 points to {card_path}" - ) - # For hardonic obs we might need to dump 2 eko cards - if conv_type_2 is None or conv_type_1 == conv_type_2: dump_card(card_path, operators_card, conv_type_1) else: From fd588b65116cf6882d765724bf12363d03bde99c Mon Sep 17 00:00:00 2001 From: Giacomo Magni <39065935+giacomomagni@users.noreply.github.com> Date: Fri, 16 Aug 2024 12:47:12 +0200 Subject: [PATCH 62/66] Update src/pineko/evolve.py Co-authored-by: Juan M. Cruz-Martinez --- src/pineko/evolve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index dc011a3d..f0d78022 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -284,7 +284,7 @@ def write_operator_card(pineappl_grid, default_card, card_path, tcard): "are you sure that's what you want?" ) - # For hardonic obs we might need to dump 2 eko cards + # For hadronic obs we might need to dump 2 eko cards if conv_type_2 is None or conv_type_1 == conv_type_2: dump_card(card_path, operators_card, conv_type_1) else: From d68f2be8ceae03c31f7e8d8b44178dfa5716e321 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 16 Aug 2024 12:52:45 +0200 Subject: [PATCH 63/66] restore nargs=-1 and add a check --- src/pineko/cli/compare.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pineko/cli/compare.py b/src/pineko/cli/compare.py index 29f6f54a..0a077ff2 100644 --- a/src/pineko/cli/compare.py +++ b/src/pineko/cli/compare.py @@ -13,7 +13,7 @@ @click.argument("grid_path", type=click.Path(exists=True)) @click.argument("max_as", type=int) @click.argument("max_al", type=int) -@click.argument("pdfs", type=click.STRING, nargs=2) +@click.argument("pdfs", type=click.STRING, nargs=-1) @click.option("--xir", default=1.0, help="renormalization scale variation") @click.option("--xif", default=1.0, help="factorization scale variation") def subcommand(fktable_path, grid_path, max_as, max_al, pdfs, xir, xif): @@ -31,6 +31,11 @@ def subcommand(fktable_path, grid_path, max_as, max_al, pdfs, xir, xif): """ pine = pineappl.grid.Grid.read(grid_path) fk = pineappl.fk_table.FkTable.read(fktable_path) + + if len(pdfs) > 2: + raise ValueError( + "Pineko supports the concolution with maximum 2 different PDF sets." + ) pdf1 = pdfs[0] pdf2 = pdfs[1] if len(pdfs) == 2 else None # Note that we need to cast to string before printing to avoid ellipsis ... From 4aac0f89842abac08497017ad87fb8e4fd0e987b Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 16 Aug 2024 12:53:00 +0200 Subject: [PATCH 64/66] restore nargs=-1 and add a check --- src/pineko/cli/compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pineko/cli/compare.py b/src/pineko/cli/compare.py index 0a077ff2..92e4d986 100644 --- a/src/pineko/cli/compare.py +++ b/src/pineko/cli/compare.py @@ -34,7 +34,7 @@ def subcommand(fktable_path, grid_path, max_as, max_al, pdfs, xir, xif): if len(pdfs) > 2: raise ValueError( - "Pineko supports the concolution with maximum 2 different PDF sets." + "Pineko supports the convolution with maximum 2 different PDF sets." ) pdf1 = pdfs[0] pdf2 = pdfs[1] if len(pdfs) == 2 else None From 495ad80cd41030c9eaa4abee109e0f62376376a8 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 16 Aug 2024 13:13:55 +0200 Subject: [PATCH 65/66] simplify prepare --- src/pineko/evolve.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/pineko/evolve.py b/src/pineko/evolve.py index f0d78022..d2e4d14b 100644 --- a/src/pineko/evolve.py +++ b/src/pineko/evolve.py @@ -67,7 +67,7 @@ def get_grid_convolution_type(kv): conv_type_1 = "UnpolPDF" # TODO: initial_state_1 and initial_state_2 are now deprecated, - # needed for compatibility. initial_state_1 is always a proton: 2212 + # needed for compatibility. if "convolution_particle_2" in kv: part_2 = kv["convolution_particle_2"] else: @@ -362,6 +362,7 @@ def evolve_grid( x_grid = np.append(x_grid, 1.0) def xgrid_reshape(full_operator): + """Reinterpolate operators on output and/or input grids.""" eko.io.manipulate.xgrid_reshape( full_operator, targetgrid=eko.interpolation.XGrid(x_grid) ) @@ -405,25 +406,26 @@ def xgrid_reshape(full_operator): for mur2 in mur2_grid ] - def prepare(operator, items): - (q2, _), op = items - info = PyOperatorSliceInfo( - fac0=operator.mu20, - x0=operator.bases.inputgrid.raw, - pids0=basis_rotation.evol_basis_pids, - fac1=q2, - x1=operator.bases.targetgrid.raw, - pids1=operator.bases.targetpids, - pid_basis=PyPidBasis.Evol, - ) - return (info, op.operator) + def prepare(operator): + """Match the raw operator with its relevant metadata.""" + for (q2, _), op in operator.items(): + info = PyOperatorSliceInfo( + fac0=operator.mu20, + x0=operator.bases.inputgrid.raw, + pids0=basis_rotation.evol_basis_pids, + fac1=q2, + x1=operator.bases.targetgrid.raw, + pids1=operator.bases.targetpids, + pid_basis=PyPidBasis.Evol, + ) + yield (info, op.operator) if operators2 is not None: # check convolutions order check_convolution_types(grid, operators1, operators2) fktable = grid.evolve_with_slice_iter2( - map(lambda it: prepare(operators1, it), operators1.items()), - map(lambda it: prepare(operators2, it), operators2.items()), + prepare(operators1), + prepare(operators2), ren1=mur2_grid, alphas=alphas_values, xi=(xir, xif), @@ -431,7 +433,7 @@ def prepare(operator, items): ) else: fktable = grid.evolve_with_slice_iter( - map(lambda it: prepare(operators1, it), operators1.items()), + prepare(operators1), ren1=mur2_grid, alphas=alphas_values, xi=(xir, xif), From 8642572c3188a4f7264bc7a89f8c1df5fe155ff1 Mon Sep 17 00:00:00 2001 From: Giacomo Magni Date: Fri, 16 Aug 2024 13:18:55 +0200 Subject: [PATCH 66/66] clarify error message --- src/pineko/comparator.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pineko/comparator.py b/src/pineko/comparator.py index e00e961e..bca2b382 100644 --- a/src/pineko/comparator.py +++ b/src/pineko/comparator.py @@ -52,7 +52,11 @@ def compare(pine, fktable, max_as, max_al, pdf1, xir, xif, pdf2=None): or fktable.key_values()["convolution_type_2"] != pine.key_values()["convolution_type_2"] ): - raise TypeError("Grids and FkTables do not have the same convolution types") + raise ValueError( + f"""Grids and FkTables do not have the same convolution types: + grid=({pine.key_values()['convolution_type_1']},{pine.key_values()['convolution_type_2']}) + vs. fk=({fktable.key_values()['convolution_type_1']},{fktable.key_values()['convolution_type_2']})""" + ) # log some useful info to check if PDFs are swapped rich.print(