From 1b8794e623e7e2c0e0a2ec92730ef44d9d33061a Mon Sep 17 00:00:00 2001 From: Kajetan Champlewski Date: Sun, 5 Jan 2020 17:37:27 +0000 Subject: [PATCH] Remove no longer needed patch. --- .../python-modules/scikit-build/default.nix | 3 --- .../scikit-build/fix_pytestrunner_req.patch | 13 ------------- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 5132d32bfbad..8d459e249848 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -12,9 +12,6 @@ buildPythonPackage rec { sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; }; - # Fixes incorrect specified requirement (part of next release) - patches = [ ./fix_pytestrunner_req.patch ]; - propagatedBuildInputs = [ wheel setuptools packaging ]; checkInputs = [ cmake ninja cython codecov coverage six pathpy diff --git a/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch b/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch deleted file mode 100644 index e8e19f84a5d4..000000000000 --- a/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index dd348fa..4de89c6 100755 ---- a/setup.py -+++ b/setup.py -@@ -22,7 +22,7 @@ with open('requirements-dev.txt', 'r') as fp: - dev_requirements = list(filter(bool, (line.strip() for line in fp))) - - # Require pytest-runner only when running tests --pytest_runner = (['pytest-runner>=2.0,<3dev'] -+pytest_runner = (['pytest-runner>=2.0'] - if any(arg in sys.argv for arg in ('pytest', 'test')) - else []) -