diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2020-03-30 14:57:50 -0700 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-03-30 16:54:40 -0700 |
commit | 915d58ba7cbb763bb6b6574c74a54fceca53128f (patch) | |
tree | d1e6427b0816e603ddf445d9085cc3a8e51d5317 | |
parent | fc451835f66ff14ece8737ca62a0f10d99e627e3 (diff) | |
download | nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.tar nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.tar.gz nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.tar.bz2 nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.tar.lz nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.tar.xz nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.tar.zst nixlib-915d58ba7cbb763bb6b6574c74a54fceca53128f.zip |
python3Packages.subunit: fix build and add tests
-rw-r--r-- | pkgs/development/python-modules/subunit/default.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 25 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index eeef94e6c765..f46226891877 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -1,22 +1,33 @@ { buildPythonPackage -, pkgs -, testtools +# pkgs dependencies +, check +, cppunit +, pkg-config +, subunit + +# python dependencies +, fixtures +, hypothesis +, pytest , testscenarios +, testtools }: buildPythonPackage { - name = pkgs.subunit.name; - src = pkgs.subunit.src; + inherit (subunit) name src meta; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ check cppunit ]; propagatedBuildInputs = [ testtools ]; - checkInputs = [ testscenarios ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.check pkgs.cppunit ]; - patchPhase = '' - sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py + checkInputs = [ testscenarios hypothesis fixtures pytest ]; + # ignore tests which call shell code, or call methods which haven't been implemented + checkPhase = '' + pytest python/subunit \ + --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py ''; - meta = pkgs.subunit.meta; - + patchPhase = '' + sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py + ''; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 74003cde6e5b..ef46edc70b4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6158,7 +6158,9 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = callPackage ../development/python-modules/subunit { }; + subunit = callPackage ../development/python-modules/subunit { + inherit (pkgs) subunit pkg-config cppunit check; + }; sure = callPackage ../development/python-modules/sure { }; |