Merge pull request #76993 from mildlyincompetent/fix-scikit-build

Fix scikit-build by removing no longer needed patch.
This commit is contained in:
Robert Hensing 2020-01-05 23:05:07 +01:00 committed by GitHub
commit 0752cf0641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions

View File

@ -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

View File

@ -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 [])