diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2020-01-05 23:05:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-05 23:05:07 +0100 |
commit | 0752cf064167c701092316355f08e9351cdcbd31 (patch) | |
tree | b7b3d83da8718da6705e5a42bd658821dcf11d65 | |
parent | 1d59cdcb2a96857ea1244039dff67e66f818935b (diff) | |
parent | 1b8794e623e7e2c0e0a2ec92730ef44d9d33061a (diff) |
Merge pull request #76993 from mildlyincompetent/fix-scikit-build
Fix scikit-build by removing no longer needed patch.
-rw-r--r-- | pkgs/development/python-modules/scikit-build/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch | 13 |
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 5132d32bfbad1..8d459e2498481 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 e8e19f84a5d48..0000000000000 --- 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 []) - |