From 5135f7dce08bfcae896b038df28d8ccbe69cebff Mon Sep 17 00:00:00 2001 From: sarahec Date: Tue, 1 Oct 2024 09:38:39 -0700 Subject: [PATCH] scalene: 1.5.44.1 -> 1.5.45 --- .../02-pyproject-unpin-setuptools.patch | 23 ------------------- .../python-modules/scalene/default.nix | 7 +++--- 2 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch diff --git a/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch b/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch deleted file mode 100644 index 80ab0080e631..000000000000 --- a/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 777be9c46c4caed5f3fcde65b70ada4d773f4298 Mon Sep 17 00:00:00 2001 -From: Sarah Clark -Date: Sat, 24 Aug 2024 11:26:30 -0700 -Subject: [PATCH] Unpin setuptools - ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index d17d12dc8..6bf1c7a38 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -54,7 +54,7 @@ scalene = "scalene.__main__:main" - [build-system] - build-backend = "setuptools.build_meta" - requires = [ -- "setuptools>=65.5.1,<71.0", # Pin to setuptools<71.0 to avoid this bug: https://github.com/pypa/setuptools/issues/4496 -+ "setuptools>=65.5.1", - "setuptools_scm>=8", - "wheel", - "cython", --- diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 820de7be473b..7040e8d57256 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -10,6 +10,7 @@ numpy, nvidia-ml-py, psutil, + pydantic, pynvml, pytestCheckHook, pythonOlder, @@ -38,7 +39,7 @@ in buildPythonPackage rec { pname = "scalene"; - version = "1.5.44.1"; + version = "1.5.45"; pyproject = true; disabled = pythonOlder "3.9"; @@ -46,12 +47,11 @@ buildPythonPackage rec { owner = "plasma-umass"; repo = "scalene"; rev = "v${version}"; - hash = "sha256-XMz+gwiNaKiKplD4kOE1yhcg+dkzjEdDYjW0JsDEMQE="; + hash = "sha256-0DhoLsXv2tUEkynMkoA14pNxF6GGLe30bfUOii7+PYE="; }; patches = [ ./01-manifest-no-git.patch - ./02-pyproject-unpin-setuptools.patch ]; prePatch = '' @@ -74,6 +74,7 @@ buildPythonPackage rec { jinja2 numpy psutil + pydantic pynvml rich ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ];