From b5ab55f2564034f98150e532fce74d8e0e5527cf Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 28 Feb 2025 10:28:21 -0800 Subject: [PATCH] git-revise: macOS: Skip failing GPG test Fixes a failure due to no GPG agent being run for the test suite: ``` E subprocess.CalledProcessError: Command '['gpg', '--batch', '--passphrase', '', '--quick-gen-key', b'Test User ']' returned non-zero exit status 2. /nix/store/wwqdmdr2f5wrjnsjs64bny8df471rh9b-python3-3.12.9/lib/python3.12/subprocess.py:573: CalledProcessError ----------------------------- Captured stdout call ----------------------------- [master (root-commit) 5aa2dc9] commit 1 Author: Bash Author ----------------------------- Captured stderr call ----------------------------- gpg: keybox '/private/tmp/nix-build-python3.12-git-revise-0.7.0-unstable-2025-01-28.drv-0/tmpfmshzluc/pubring.kbx' created gpg: error running '/nix/store/69pwwprid9rhgkz9ip9nq71p0r2b73b7-gnupg-2.4.7/bin/gpg-agent': exit status 2 gpg: failed to start gpg-agent '/nix/store/69pwwprid9rhgkz9ip9nq71p0r2b73b7-gnupg-2.4.7/bin/gpg-agent': General error gpg: can't connect to the gpg-agent: General error gpg: agent_genkey failed: No agent running gpg: key generation failed: No agent running =========================== short test summary info ============================ FAILED tests/test_gpgsign.py::test_gpgsign - subprocess.CalledProcessError: Command '['gpg', '--batch', '--passphrase', ... ======================== 1 failed, 37 passed in 20.81s ========================= ``` I've also marked myself as a maintiner, as @emilazy no longer uses Git directly. --- .../python-modules/git-revise/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 8e796abdf3c7..3f3526b70481 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, pythonOlder, git, @@ -23,10 +24,18 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - nativeCheckInputs = [ - git - gnupg - pytestCheckHook + nativeCheckInputs = + [ + git + pytestCheckHook + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + gnupg + ]; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # `gpg: agent_genkey failed: No agent running` + "test_gpgsign" ]; meta = with lib; { @@ -35,6 +44,6 @@ buildPythonPackage rec { changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md"; license = licenses.mit; mainProgram = "git-revise"; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ _9999years ]; }; }