Merge pull request #133049 from SuperSandro2000/cleanup

2021-08-07 23:13:00 +02:00 · 2021-08-07 23:13:00 +02:00 · 94cff14200
commit 94cff14200
parent d85ded6d18 ae43a849a9
3 changed files with 11 additions and 6 deletions
--- a/pkgs/development/python-modules/pytest-mockservers/default.nix
+++ b/pkgs/development/python-modules/pytest-mockservers/default.nix
@ -31,9 +31,12 @@ buildPythonPackage rec {
    poetry-core
  ];

+  buildInputs = [
+    pytest
+  ];
+
  propagatedBuildInputs = [
    aiohttp
-    pytest
    pytest-asyncio
  ];

--- a/pkgs/development/python-modules/pytest-resource-path/default.nix
+++ b/pkgs/development/python-modules/pytest-resource-path/default.nix
@ -3,7 +3,6 @@
 , pythonOlder
 , fetchFromGitHub
 , colorama
-, pytest-runner
 , pytest
 , pytestCheckHook
 }:
@ -20,13 +19,17 @@ buildPythonPackage rec {
    sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2";
  };

-  nativeBuildInputs = [
-    pytest-runner
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "pytest-runner" ""
+  '';
+
+  buildInputs = [
+    pytest
  ];

  propagatedBuildInputs = [
    colorama
-    pytest
  ];

  checkInputs = [
--- a/pkgs/development/python-modules/roonapi/default.nix
+++ b/pkgs/development/python-modules/roonapi/default.nix
@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , ifaddr
 , poetry-core
 , pythonOlder