diff options
author | Nick Cao <nickcao@nichi.co> | 2024-01-18 09:33:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-18 09:33:36 -0500 |
commit | 3f0f8faeca52bfb59bac714d7e9ee7cfecbd3359 (patch) | |
tree | 799b64c7609c187802bd1ec2b74b3174cf14d041 /pkgs | |
parent | 2e7515d1d58c85ec2fde37d7d0650e8844ba0816 (diff) | |
parent | 10a93fa134c11e105e7f96aaf43e5200508ca8a2 (diff) |
Merge pull request #281630 from GaetanLepage/torchmetrics
python311Packages.torchmetrics: 1.3.0 -> 1.3.0.post
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/torchmetrics/0001-remove-illegal-name-from-extra-dependencies.patch | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/torchmetrics/default.nix | 11 |
2 files changed, 2 insertions, 33 deletions
diff --git a/pkgs/development/python-modules/torchmetrics/0001-remove-illegal-name-from-extra-dependencies.patch b/pkgs/development/python-modules/torchmetrics/0001-remove-illegal-name-from-extra-dependencies.patch deleted file mode 100644 index b11a2c93637da..0000000000000 --- a/pkgs/development/python-modules/torchmetrics/0001-remove-illegal-name-from-extra-dependencies.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3ae04e8b9be879cf25fb5b51a48c8a1263a4844d Mon Sep 17 00:00:00 2001 -From: Gaetan Lepage <gaetan@glepage.com> -Date: Mon, 15 Jan 2024 10:05:40 +0100 -Subject: [PATCH] remove-illegal-name-from-extra-dependencies - ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index 968c32d6..c98ee9f8 100755 ---- a/setup.py -+++ b/setup.py -@@ -190,6 +190,7 @@ def _prepare_extras(skip_pattern: str = "^_", skip_files: Tuple[str] = ("base.tx - # create an 'all' keyword that install all possible dependencies - extras_req["all"] = list(chain([pkgs for k, pkgs in extras_req.items() if k not in ("_test", "_tests")])) - extras_req["dev"] = extras_req["all"] + extras_req["_tests"] -+ extras_req.pop("_tests") - return extras_req - - --- -2.42.0 - diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 26ff5f37882ea..5361e6bc49a39 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -20,7 +20,7 @@ let pname = "torchmetrics"; - version = "1.3.0"; + version = "1.3.0.post"; in buildPythonPackage { inherit pname version; @@ -32,16 +32,9 @@ buildPythonPackage { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-xDUT9GSOn6ZNDFRsFws3NLxBsILKDHPKeEANwM8NXj8="; + hash = "sha256-InwXOeQ/u7sdq/+gjm0CSCiuB/9YXP+rPVbvOSH16Dk="; }; - patches = [ - # The extra dependencies dictionary contains an illegally named entry '_tests'. - # The build fails because of this. - # Issue has been opened upstream: https://github.com/Lightning-AI/torchmetrics/issues/2305 - ./0001-remove-illegal-name-from-extra-dependencies.patch - ]; - propagatedBuildInputs = [ numpy lightning-utilities |