git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #76993 from mildlyincompetent/fix-scikit-build

Fix scikit-build by removing no longer needed patch.

commit0752cf064167c701092316355f08e9351cdcbd31 authorRobert Hensing <roberth@users.noreply.github.com> dateSun 5 Jan 2020, 23:05 (7 years ago) parent1d59cdc1b8794e
2 files changed−16
pkgs/development/python-modules/scikit-build/default.nix−3 pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch−13
pkgs/development/python-modules/scikit-build/default.nix−3
@@ -12,9 +12,6 @@ buildPythonPackage rec {
1212 sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526";
1313 };
1414
15− # Fixes incorrect specified requirement (part of next release)
16− patches = [ ./fix_pytestrunner_req.patch ];
17−
1815 propagatedBuildInputs = [ wheel setuptools packaging ];
1916 checkInputs = [
2017 cmake ninja cython codecov coverage six pathpy
pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/setup.py b/setup.py
2−index dd348fa..4de89c6 100755
3−--- a/setup.py
4−+++ b/setup.py
5−@@ -22,7 +22,7 @@ with open('requirements-dev.txt', 'r') as fp:
6− dev_requirements = list(filter(bool, (line.strip() for line in fp)))
7−
8− # Require pytest-runner only when running tests
9−-pytest_runner = (['pytest-runner>=2.0,<3dev']
10−+pytest_runner = (['pytest-runner>=2.0']
11− if any(arg in sys.argv for arg in ('pytest', 'test'))
12− else [])
13−