diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2018-05-02 15:17:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:17:09 +0200 |
| commit | 166282e8264225467d9e1862ee5d8fdd68e8dfb1 (patch) | |
| tree | 5eacd5784f063ae382d688a5894161b1ab177dd6 /pkgs/tools/security | |
| parent | daef0358cbcf5327d965048fe8851e48d9bc2e15 (diff) | |
| parent | 11a244afdb68b01724a6238d84c9ed3ca701a54c (diff) | |
| download | nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.tar nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.tar.gz nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.tar.bz2 nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.tar.lz nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.tar.xz nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.tar.zst nixlib-166282e8264225467d9e1862ee5d8fdd68e8dfb1.zip | |
Merge pull request #39815 from jluttine/pytest-flake8-1.0.1
pythonPackages.pytest-flake8: 1.0.0 -> 1.0.1
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/vulnix/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/security/vulnix/disable-flake8.patch | 23 |
2 files changed, 3 insertions, 31 deletions
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index b28fa7cfd475..dbb42c2bef42 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -9,9 +9,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf"; }; - buildInputs = - [ ronn ] ++ - (with pythonPackages; [ freezegun pytest pytestcov ]); + buildInputs = [ ronn ]; + + checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ]; propagatedBuildInputs = [ nix @@ -27,11 +27,6 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; - # pytest-flake8 is currently broken - # re-enable after it has been fixed - # https://github.com/NixOS/nixpkgs/issues/39206 - patches = [ ./disable-flake8.patch ]; - postBuild = '' make -C doc ''; diff --git a/pkgs/tools/security/vulnix/disable-flake8.patch b/pkgs/tools/security/vulnix/disable-flake8.patch deleted file mode 100644 index cd165d05ccc1..000000000000 --- a/pkgs/tools/security/vulnix/disable-flake8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index a9e37ce..41b9886 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,5 +1,5 @@ - [tool:pytest] --addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix -+addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix - markers = slow: This is a non-unit test and thus is not run by default. Use ``-m slow`` to run these, or ``-m 1`` to run all tests. - - [aliases] -diff --git a/setup.py b/setup.py -index a9315e5..d14ad59 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,7 +35,6 @@ setup( - 'freezegun>0.3', - 'pytest>=3.2', - 'pytest-cov>=2.5', -- 'pytest-flake8', - 'pytest-runner>=2.11,<3dev', - 'pytest-timeout>=1.2', - 'setuptools_scm>=1.15', |