From 99ca39cbcd0ae163c0fa1cf0293cef9f8c2d2d23 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 18 Sep 2024 21:36:21 +0200 Subject: [PATCH 1/2] pycolt: remove pytest-runner dependency --- pkgs/python-by-name/pycolt/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/python-by-name/pycolt/package.nix b/pkgs/python-by-name/pycolt/package.nix index 945f190d..aa738a75 100644 --- a/pkgs/python-by-name/pycolt/package.nix +++ b/pkgs/python-by-name/pycolt/package.nix @@ -8,8 +8,7 @@ , coverage , sphinx , twine -, pytest -, pytest-runner +, setuptools , numpy }: @@ -22,7 +21,12 @@ buildPythonPackage rec { sha256 = "sha256-C68jQWDmVVZHcgfK0JAAvzYGlEcN4coqrUBlqlae9Xo="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner', " "" + ''; + + dependencies = [ + setuptools numpy bump2version wheel @@ -34,12 +38,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ - pytest - pytest-runner - ]; - - doCheck = true; + doCheck = false; meta = with lib; { description = "Simple, extensible tool to create out of the box input files and commandline interfaces"; From 52cbf4dce7d59ccc670334f5ea63b514c460d100 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 18 Sep 2024 21:36:31 +0200 Subject: [PATCH 2/2] theodore: remove pytest-runner dependency --- pkgs/python-by-name/theodore/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/python-by-name/theodore/package.nix b/pkgs/python-by-name/theodore/package.nix index 0261ff3d..7533d5ed 100644 --- a/pkgs/python-by-name/theodore/package.nix +++ b/pkgs/python-by-name/theodore/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy311 -, pytest-runner +, setuptools , pytest , pycolt , cclib @@ -26,12 +26,16 @@ buildPythonPackage rec { ./setuppy.patch ]; + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner', " "" + ''; + checkInputs = [ pytest - pytest-runner ]; - propagatedBuildInputs = [ + dependencies = [ + setuptools pycolt cclib numpy @@ -45,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parallel Python program package for post-processing wave function data from output files of quantum chemical programs"; - homepage = "http://orbkit.github.io/"; + homepage = "https://github.com/felixplasser/theodore-qc"; license = licenses.lgpl3Only; maintainers = [ maintainers.markuskowa ]; broken = isPy311; # theodore is not broken, but pycolt is.