From b1ae817db5ae0d427a52c4b629e13f290f0cab2f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 7 Nov 2024 23:46:19 +0100 Subject: [PATCH 1/4] python312Packages.awkward-cpp: 39 -> 42 --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index bebc46bbd89f..099691b3a80b 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "39"; + version = "42"; pyproject = true; src = fetchPypi { pname = "awkward_cpp"; inherit version; - hash = "sha256-YdoAEZnqIJRITijKB0WR0uxmDxF+mperieYNpAUnI4U="; + hash = "sha256-1sSJ7L6asuqjTUXM7OxVt0gHs2P+yiO4123IvCBzVew="; }; build-system = [ From 42196ae6e12202148ffe3ec6f9054a041e77342e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 7 Nov 2024 23:45:22 +0100 Subject: [PATCH 2/4] python312Packages.awkward: 2.6.9 -> 2.7.1 Diff https://github.com/scikit-hep/awkward/compare/refs/tags/v2.6.9...v2.7.1 Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.7.1 --- pkgs/development/python-modules/awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 086bd6a47035..3d7e6a72f982 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.9"; + version = "2.7.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-kYDihmfzMH5LPXSgXpC64qMPqxIX59VzflhP0gWu92Y="; + hash = "sha256-EcBSPW+us6RjxQu+rNc+++5vGsXyeJB27/Zuth3wacc="; }; build-system = [ From f002b218c2a408e3bb6e7d77bc9b8b2cf9e98701 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 8 Nov 2024 18:41:24 +0100 Subject: [PATCH 3/4] python312Packages.awkward-pandas: init at 2023.8.0 --- .../python-modules/awkward-pandas/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/awkward-pandas/default.nix diff --git a/pkgs/development/python-modules/awkward-pandas/default.nix b/pkgs/development/python-modules/awkward-pandas/default.nix new file mode 100644 index 000000000000..fca22d234dee --- /dev/null +++ b/pkgs/development/python-modules/awkward-pandas/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + hatch-vcs, + hatchling, + + # dependencies + awkward, + pandas, +}: + +buildPythonPackage rec { + pname = "awkward-pandas"; + version = "2023.8.0"; + pyproject = true; + + src = fetchPypi { + pname = "awkward_pandas"; + inherit version; + hash = "sha256-Vre3NSQVAkI6ya+0nbDdO7WQWlGlPN/kdunUMWqXX94="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + awkward + pandas + ]; + + pythonImportsCheck = [ + "awkward_pandas" + ]; + + # There are no tests in the Pypi archive + doCheck = false; + + meta = { + description = "Awkward Array Pandas Extension"; + homepage = "https://pypi.org/project/awkward-pandas/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4d6dea86887..b3199aac6d7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1087,6 +1087,8 @@ self: super: with self; { inherit (pkgs) cmake ninja; }; + awkward-pandas = callPackage ../development/python-modules/awkward-pandas { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; aws-encryption-sdk = callPackage ../development/python-modules/aws-encryption-sdk { }; From bf476a1d006a0cd2b4117b1f22a7f785644cd51a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 7 Nov 2024 23:45:07 +0100 Subject: [PATCH 4/4] python312Packages.uproot: 5.4.1 -> 5.5.0 Diff: https://github.com/scikit-hep/uproot5/compare/refs/tags/v5.4.1...v5.5.0 Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.5.0 --- pkgs/development/python-modules/uproot/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 4242814caafe..2fea117b29aa 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,6 +15,7 @@ packaging, # checks + awkward-pandas, pandas, pytestCheckHook, pytest-timeout, @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.4.1"; + version = "5.5.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-MWqkEbw6hdNaXrRLWoxUcppT+X9a+DmEhho9GpG29XM="; + hash = "sha256-letdC246I9LDqEnLCOTz51cBnQGbkrsR/i7UN6EMcDA="; }; build-system = [ @@ -50,6 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + awkward-pandas pandas pytestCheckHook pytest-timeout