gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python311Packages.pyparted: use pytestCheckHook

Browse Source 
...instead of manually patching the Makefile.
This commit is contained in:
Yarny0
2023-11-07 20:30:59 +01:00
parent 18597c8aa7
commit 1e0c4226a4
2 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/pyparted/default.nix
+2 -10
View File
@@ -5,6 +5,7 @@
, pkgs
, python
, six
, pytestCheckHook
}:
buildPythonPackage rec {
@@ -30,23 +31,14 @@ buildPythonPackage rec {
tests/test__ped_ped.py
'';
patches = [
./fix-test-pythonpath.patch
];
preConfigure = ''
PATH="${pkgs.parted}/sbin:$PATH"
'';
nativeBuildInputs = [ pkgs.pkg-config ];
nativeCheckInputs = [ six ];
nativeCheckInputs = [ six pytestCheckHook ];
propagatedBuildInputs = [ pkgs.parted ];
checkPhase = ''
patchShebangs Makefile
make test PYTHON=${python.executable}
'';
meta = with lib; {
homepage = "https://github.com/dcantrell/pyparted/";
description = "Python interface for libparted";
pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch
-26
View File
@@ -1,26 +0,0 @@
diff -ur a/Makefile b/Makefile
--- a/Makefile 1980-01-02 00:00:00.000000000 +0100
+++ b/Makefile 2020-02-18 20:04:14.068243263 +0100
@@ -39,19 +39,19 @@
@$(PYTHON) setup.py build
test: all
- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
$(PYTHON) -m unittest discover -v
coverage: all
@echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***"
- @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
+ @env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
$(COVERAGE) run --branch -m unittest discover -v
$(COVERAGE) report --include="build/lib.*/parted/*" --show-missing
$(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log
check: clean
$(MAKE) ; \
- env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
+ env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
tests/pylint/runpylint.py
dist: