From ac5ef3c55ff886e3318f5c2b806b1b33201afd50 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Mon, 10 May 2021 18:08:04 -0400 Subject: [PATCH] python3Packages.pytest-bdd: 4.0.1 -> 4.0.2 --- .../python-modules/pytest-bdd/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index e71b3e7350a..b087cd6f459 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch , execnet , glob2 , Mako @@ -7,29 +7,38 @@ , parse-type , py , pytest +, pytestCheckHook , six }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "4.0.1"; + version = "4.0.2"; # tests are not included in pypi tarball src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = version; - sha256 = "1yqzz44as4pxffmg4hk9lijvnvlc2chg1maq1fbj5i4k4jpagvjz"; + sha256 = "0pxx4c8lm68rw0jshbr09fnadg8zz8j73q0qi49yw9s7yw86bg5l"; }; + patches = [ + # Fixed compatibility with pytest > 6.1 + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-bdd/commit/e1dc0cad9a1c1ba563ccfbc24f9993d83ac59293.patch"; + sha256 = "1p3gavh6nir2a8crd5wdf0prfrg0hmgar9slvn8a21ils3k5pm5y"; + }) + ]; + + buildInputs = [ pytest ]; propagatedBuildInputs = [ glob2 Mako parse parse-type py six ]; - # Tests require extra dependencies - checkInputs = [ execnet mock pytest ]; - checkPhase = '' - PATH=$PATH:$out/bin pytest + checkInputs = [ pytestCheckHook execnet mock ]; + preCheck = '' + export PATH=$PATH:$out/bin ''; meta = with lib; {