diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 1600e3e0ed57..3e7ff095fe1c 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -2,17 +2,18 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, buildPythonPackage, python, - pythonOlder, pytestCheckHook, assertpy, + chardet, + freezegun, mock, path, pyhamcrest, pytest-html, colorama, + cucumber-expressions, cucumber-tag-expressions, parse, parse-type, @@ -22,41 +23,34 @@ buildPythonPackage rec { pname = "behave"; - version = "1.2.7.dev5"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "behave"; repo = "behave"; - rev = "v${version}"; - hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA="; + tag = "v${version}"; + hash = "sha256-sHsnBeyl0UJ0f7WcTUc+FhUxATh84RPxVE3TqGYosrs="; }; - patches = [ - # fix tests: https://github.com/behave/behave/pull/1214 - (fetchpatch2 { - url = "https://github.com/behave/behave/pull/1214/commits/98b63a2524eff50ce1dc7360a46462a6f673c5ea.patch?full_index=1"; - hash = "sha256-MwODEm6vhg/H8ksp5XBBP5Uhu2dhB5B1T6Owkxpy3v0="; - }) - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook assertpy + chardet + freezegun mock path pyhamcrest pytest-html ]; - doCheck = pythonOlder "3.12"; - pythonImportsCheck = [ "behave" ]; dependencies = [ colorama + cucumber-expressions cucumber-tag-expressions parse parse-type @@ -80,7 +74,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/behave/behave/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/behave/behave/blob/${src.tag}/CHANGES.rst"; homepage = "https://github.com/behave/behave"; description = "Behaviour-driven development, Python style"; mainProgram = "behave"; diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix new file mode 100644 index 000000000000..dd0a28ebe6f2 --- /dev/null +++ b/pkgs/development/python-modules/cucumber-expressions/default.nix @@ -0,0 +1,40 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + poetry-core, + pytestCheckHook, + pyyaml, +}: + +buildPythonPackage rec { + pname = "cucumber-expressions"; + version = "18.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cucumber"; + repo = "cucumber-expressions"; + tag = "v${version}"; + hash = "sha256-Mbf7bG7NvKFdv6kYPkd6UlPDJGjnK2GPl0qnLUhQ3es="; + }; + + sourceRoot = "${src.name}/python"; + + build-system = [ poetry-core ]; + + pythonImportsCheck = [ "cucumber_expressions" ]; + + nativeCheckInputs = [ + pytestCheckHook + pyyaml + ]; + + meta = { + changelog = "https://github.com/cucumber/cucumber-expressions/blob/${src.tag}/CHANGELOG.md"; + description = "Human friendly alternative to Regular Expressions"; + homepage = "https://github.com/cucumber/cucumber-expressions/tree/main/python"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcda11fcfb1b..979d4020ce4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3224,6 +3224,8 @@ self: super: with self; { cu2qu = callPackage ../development/python-modules/cu2qu { }; + cucumber-expressions = callPackage ../development/python-modules/cucumber-expressions { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cupy = callPackage ../development/python-modules/cupy {