Merge pull request #281630 from GaetanLepage/torchmetrics

python311Packages.torchmetrics: 1.3.0 -> 1.3.0.post

pkgs/development/python-modules/torchmetrics/0001-remove-illegal-name-from-extra-dependencies.patch

@@ -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
-

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