From 68c8eaedb87be829cdb62c7936904555d98a9d99 Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Tue, 15 Feb 2022 22:43:39 +0100 Subject: [PATCH] git-machete: updates to 3.7.2 --- .../git-and-tools/git-machete/default.nix | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3fd3a37419f5..69e1c2b065e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , installShellFiles , git -, stestr +, pytest , nix-update-script , testVersion , git-machete @@ -22,19 +22,37 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git stestr ]; + checkInputs = [ git pytest ]; + ### Maybe not needed at all? since `python setup.py test` is executed anyway? + /* + Executing setuptoolsCheckPhase + running test + WARNING: Testing via this command is deprecated and will be removed in a future version. Users looking for a generic test entry point independent of test runner are encouraged to use tox. + running egg_info + writing git_machete.egg-info/PKG-INFO + writing dependency_links to git_machete.egg-info/dependency_links.txt + writing top-level names to git_machete.egg-info/top_level.txt + reading manifest file 'git_machete.egg-info/SOURCES.txt' + reading manifest template 'MANIFEST.in' + adding license file 'LICENSE' + writing manifest file 'git_machete.egg-info/SOURCES.txt' + running build_ext + test_add (git_machete.tests.functional.test_machete.MacheteTester) + Verify behaviour of a 'git machete add' command. ... ok + .... + */ postCheck = '' - stestr run + pytest ''; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + installShellCompletion --fish completion/git-machete.fish ''; postInstallCheck = '' - git init test "$($out/bin/git-machete version)" = "git-machete version ${version}" '';