about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Brandt <alunduil@alunduil.com>2018-03-07 11:03:23 -0600
committerAlex Brandt <alunduil@alunduil.com>2018-03-08 19:57:35 -0600
commitdf9148c2aa2f94fdacbebc8e6dc691a4abb873a3 (patch)
tree40b26043f8465e1b5bf3c70e604fb81e08b57387
parentb8c3a16cd3e0f85200e167f539e2e2a98d02e657 (diff)
downloadnixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.tar
nixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.tar.gz
nixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.tar.bz2
nixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.tar.lz
nixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.tar.xz
nixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.tar.zst
nixlib-df9148c2aa2f94fdacbebc8e6dc691a4abb873a3.zip
behave: 1.2.5 -> 1.2.6
-rw-r--r--pkgs/development/python-modules/behave/default.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 80acc58f6544..722117ba6e83 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchPypi
-, buildPythonApplication, python, pythonAtLeast
-, mock, nose, pyhamcrest
+, buildPythonApplication, isPy27, python, pythonOlder
+, mock, nose, pathpy, pyhamcrest, pytest
 , glibcLocales, parse, parse-type, six
+, traceback2
 }:
 buildPythonApplication rec {
   pname = "behave";
-  version = "1.2.5";
+  version = "1.2.6";
   name = "${pname}-${version}";
 
-  disabled = pythonAtLeast "3.6";
-
   src = fetchPypi {
     inherit pname version;
-    sha256 = "81b731ac5187e31e4aad2594944fa914943683a9818320846d037c5ebd6d5d0b";
+    sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr";
   };
 
-  checkInputs = [ mock nose pyhamcrest ];
+  checkInputs = [ mock nose pathpy pyhamcrest pytest ];
   buildInputs = [ glibcLocales ];
-  propagatedBuildInputs = [ parse parse-type six ];
+  propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;
 
   postPatch = ''
     patchShebangs bin
@@ -29,7 +28,7 @@ buildPythonApplication rec {
     export LANG="en_US.UTF-8"
     export LC_ALL="en_US.UTF-8"
 
-    nosetests -x
+    pytest test tests
 
     ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/
     ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/