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 = [ 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 '/' 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"