From a97ba67bf71b1c35ae87b0d8ecfde80e7a827752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 30 Aug 2022 18:17:31 +0200
Subject: [PATCH 1/3] python310Packages.rising: remove unused pytest-cov

---
 pkgs/development/python-modules/rising/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix
index 07fdad78aadf..553724807261 100644
--- a/pkgs/development/python-modules/rising/default.nix
+++ b/pkgs/development/python-modules/rising/default.nix
@@ -3,7 +3,6 @@
 , isPy27
 , fetchFromGitHub
 , pytestCheckHook
-, pytest-cov
 , dill
 , numpy
 , torch
@@ -25,7 +24,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ];
-  checkInputs = [ dill pytest-cov pytestCheckHook ];
+  checkInputs = [ dill pytestCheckHook ];
 
   disabledTests = [ "test_affine" ];  # deprecated division operator '/'
 

From d1be027e2dd7876441bb5ce209c3f57dc7333d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 30 Aug 2022 18:17:47 +0200
Subject: [PATCH 2/3] python310Packages.qiskit-machine-learning: remove package
 variant

---
 .../python-modules/qiskit-machine-learning/default.nix       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
index ea4ae3bb3438..e4761dc33b02 100644
--- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix
+++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -11,8 +11,6 @@
 , qiskit-terra
 , scikit-learn
 , sparse
-  # Optional inputs
-, withTorch ? true
 , torch
   # Check Inputs
 , pytestCheckHook
@@ -38,10 +36,11 @@ buildPythonPackage rec {
     fastdtw
     numpy
     psutil
+    torch
     qiskit-terra
     scikit-learn
     sparse
-  ] ++ lib.optional withTorch torch;
+  ];
 
   doCheck = false;  # TODO: enable. Tests fail on unstable due to some multithreading issue?
   checkInputs = [

From dbfd75435938888cff88e8325a006ed5130c8b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 30 Aug 2022 18:22:56 +0200
Subject: [PATCH 3/3] python310Packages.torchgpipe: remove useless
 pytest-runner, correct disabled

---
 .../python-modules/torchgpipe/default.nix            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix
index 68e113ce70fe..8bde4937eaec 100644
--- a/pkgs/development/python-modules/torchgpipe/default.nix
+++ b/pkgs/development/python-modules/torchgpipe/default.nix
@@ -1,8 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, isPy27
-, pytest-runner
+, pythonOlder
 , pytestCheckHook
 , torch
 }:
@@ -11,7 +10,7 @@ buildPythonPackage rec {
   pname = "torchgpipe";
   version = "0.0.7";
 
-  disabled = isPy27;
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "kakaobrain";
@@ -20,9 +19,14 @@ buildPythonPackage rec {
     sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'" ""
+  '';
+
   propagatedBuildInputs = [ torch ];
 
-  checkInputs = [ pytest-runner pytestCheckHook ];
+  checkInputs = [ pytestCheckHook ];
   disabledTests = [
     "test_inplace_on_requires_grad"
     "test_input_requiring_grad"