Skip to content

Commit b5ab55f

Browse files
committed
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 <[email protected]>']' 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 <[email protected]> ----------------------------- 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.
1 parent 323ad32 commit b5ab55f

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

pkgs/development/python-modules/git-revise/default.nix

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
lib,
3+
stdenv,
34
buildPythonPackage,
45
pythonOlder,
56
git,
@@ -23,10 +24,18 @@ buildPythonPackage rec {
2324

2425
disabled = pythonOlder "3.8";
2526

26-
nativeCheckInputs = [
27-
git
28-
gnupg
29-
pytestCheckHook
27+
nativeCheckInputs =
28+
[
29+
git
30+
pytestCheckHook
31+
]
32+
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
33+
gnupg
34+
];
35+
36+
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
37+
# `gpg: agent_genkey failed: No agent running`
38+
"test_gpgsign"
3039
];
3140

3241
meta = with lib; {
@@ -35,6 +44,6 @@ buildPythonPackage rec {
3544
changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md";
3645
license = licenses.mit;
3746
mainProgram = "git-revise";
38-
maintainers = with maintainers; [ emily ];
47+
maintainers = with maintainers; [ _9999years ];
3948
};
4049
}

0 commit comments

Comments
 (0)