Merge pull request #36359 from alunduil/bump-behave-version
behave: 1.2.5 -> 1.2.6
This commit is contained in:
commit
814288c571
4 changed files with 15 additions and 35 deletions
|
@ -1,23 +1,22 @@
|
||||||
{ stdenv, fetchPypi
|
{ stdenv, fetchPypi
|
||||||
, buildPythonApplication, python, pythonAtLeast
|
, buildPythonApplication, isPy27, python, pythonOlder
|
||||||
, mock, nose, pyhamcrest
|
, mock, nose, pathpy, pyhamcrest, pytest
|
||||||
, glibcLocales, parse, parse-type, six
|
, glibcLocales, parse, parse-type, six
|
||||||
|
, traceback2
|
||||||
}:
|
}:
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "behave";
|
pname = "behave";
|
||||||
version = "1.2.6";
|
version = "1.2.6";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
disabled = pythonAtLeast "3.6";
|
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86";
|
sha256 = "11hsz365qglvpp1m1w16239c3kiw15lw7adha49lqaakm8kj6rmr";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ mock nose pyhamcrest ];
|
checkInputs = [ mock nose pathpy pyhamcrest pytest ];
|
||||||
buildInputs = [ glibcLocales ];
|
buildInputs = [ glibcLocales ];
|
||||||
propagatedBuildInputs = [ parse parse-type six ];
|
propagatedBuildInputs = [ parse parse-type six ] ++ stdenv.lib.optional (pythonOlder "3.0") traceback2;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs bin
|
patchShebangs bin
|
||||||
|
@ -29,7 +28,7 @@ buildPythonApplication rec {
|
||||||
export LANG="en_US.UTF-8"
|
export LANG="en_US.UTF-8"
|
||||||
export LC_ALL="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' features/
|
||||||
${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/
|
${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage, fetchFromGitHub
|
||||||
, fetchFromGitHub
|
, future, pyparsing
|
||||||
, pyparsing
|
, glibcLocales, nose
|
||||||
, future
|
|
||||||
, nose
|
|
||||||
, glibcLocales
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -19,7 +16,7 @@ buildPythonPackage rec {
|
||||||
sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai";
|
sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ pyparsing future ];
|
propagatedBuildInputs = [ future pyparsing ];
|
||||||
|
|
||||||
checkInputs = [ nose glibcLocales ];
|
checkInputs = [ nose glibcLocales ];
|
||||||
|
|
||||||
|
|
|
@ -6,21 +6,13 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "parse_type";
|
pname = "parse_type";
|
||||||
version = "0.3.4";
|
version = "0.4.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "3dd0b323bafcb8c25e000ce5589042a1c99cba9c3bec77b9f591e46bc9606147";
|
sha256 = "0g3b6gsdwnm8dpkh2vn34q6dzxm9gl908ggyzcv31n9xbp3vv5pm";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "python-3.5-tests-compat.patch";
|
|
||||||
url = "https://github.com/jenisys/parse_type/pull/4.patch";
|
|
||||||
sha256 = "1mmn2fxss6q3qhaydd4s4v8vjgvgkg41v1vcivrzdsvgsc3npg7m";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
checkInputs = [ pytest pytestrunner ];
|
checkInputs = [ pytest pytestrunner ];
|
||||||
propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
|
propagatedBuildInputs = [ parse six ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
|
||||||
|
|
||||||
|
|
|
@ -3,22 +3,14 @@
|
||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "parse";
|
pname = "parse";
|
||||||
version = "1.6.6";
|
version = "1.8.2";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "71435aaac494e08cec76de646de2aab8392c114e56fe3f81c565ecc7eb886178";
|
sha256 = "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
name = "python-3.5-tests-compat.patch";
|
|
||||||
url = "https://github.com/r1chardj0n3s/parse/pull/34.patch";
|
|
||||||
sha256 = "16iicgkf3lwivmdnp3xkq4n87wjmr3nb77z8mwz67b7by9nnp3jg";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
${python.interpreter} test_parse.py
|
${python.interpreter} test_parse.py
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue