From patchwork Fri Apr 28 05:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 49630 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0EF0E27BBEA; Fri, 28 Apr 2023 06:52:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4EF7127BBE2 for ; Fri, 28 Apr 2023 06:52:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psH1b-00060J-1h; Fri, 28 Apr 2023 01:52:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psH1X-0005y8-Q8 for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psH1X-0003HZ-GB for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psH1X-0006eg-6P for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63139] [PATCH python 13/20] gnu: python-dulwich: Update to 0.21.3. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 05:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63139 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63139@debbugs.gnu.org Cc: John Kehayias Received: via spool by 63139-submit@debbugs.gnu.org id=B63139.168266109125492 (code B ref 63139); Fri, 28 Apr 2023 05:52:03 +0000 Received: (at 63139) by debbugs.gnu.org; 28 Apr 2023 05:51:31 +0000 Received: from localhost ([127.0.0.1]:60307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psH11-0006d4-1M for submit@debbugs.gnu.org; Fri, 28 Apr 2023 01:51:31 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:24881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psH0y-0006cP-RK for 63139@debbugs.gnu.org; Fri, 28 Apr 2023 01:51:29 -0400 Date: Fri, 28 Apr 2023 05:51:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682661083; x=1682920283; bh=3+mpbdVB6qCMGhgvFz/TW8ftKWRguTTtRi5r8nlgBI4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=q+kL5Lof480jqtTDeaj89sJJ6df+Y2CGOQUe26CD8E5ueOnYa7KIAK+Woc63obSCM HROC5Z+rZSr52ydla56WPFFtbugI23NOZxdSXqtczTegEr18BCjF8yrRdDIV/IFtcy g6DgIf7arTFcHG/pC++QsgniWJ6Pyzci8dXRbGb/r7Ndp+wmwixGmdiUjfhzNkFJs5 tXNpfq0CGqm8hq30U0UllYZ7Qwm1257CI06liGKo/SfLvVuLzqyk/JwoTs2EuUBy5F BDPmJZXg9YEoQYIfeJMEqB7Brcx6Z8c9imYdeO6kIYlu19hp+CBNWu2GlK0xYxbfBx vNiVdV/HTpqGA== Message-ID: <8af56bc0b51ee7ef0c2042c06aa53fc4f836d987.1682660105.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-dulwich): Update to 0.21.3. [arguments]{phases}: In 'check' phase skip a test which fails without a configuration file. [native-inputs]: Add python-paramiko and python-requests. --- gnu/packages/python-xyz.scm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) -- 2.39.2 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a3ed048f03..8b61cba8ae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19932,7 +19932,7 @@ (define-public python-cheetah (define-public python-dulwich (package (name "python-dulwich") - (version "0.20.30") + (version "0.21.3") (source (origin (method url-fetch) @@ -19941,23 +19941,27 @@ (define-public python-dulwich (pypi-uri "dulwich" version))) (sha256 (base32 - "0hafaff30bmkj30b8pwpwsy3fz5h6c1pn98ihqcvl5zndflr1h22")))) + "10yg11kcjc8lbk2hvnyz3hs5m1rlr76wzw2qxjrq7sv7sx9v98vw")))) (build-system python-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("dulwich/tests/test_repository.py" - "dulwich/tests/test_porcelain.py" - "dulwich/tests/test_hooks.py") - (("/bin/sh") (search-input-file inputs "/bin/sh"))) - (setenv "TEST_RUNNER" "unittest") - (setenv "PYTHONHASHSEED" "random")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dulwich/contrib/test_swift_smoke.py" + (("^class SwiftRepoSmokeTest.*" line) + (string-append "@unittest.skipIf(True, \ +'Needs configuration file')\n" line))) + (substitute* '("dulwich/tests/test_repository.py" + "dulwich/tests/test_porcelain.py" + "dulwich/tests/test_hooks.py") + (("/bin/sh") (search-input-file inputs "/bin/sh"))) + (setenv "TEST_RUNNER" "unittest") + (setenv "PYTHONHASHSEED" "random")))))) (propagated-inputs (list python-fastimport python-urllib3)) (native-inputs - (list python-mock python-geventhttpclient python-gpg + (list python-mock python-paramiko python-geventhttpclient python-gpg python-requests git gnupg)) (home-page "https://www.dulwich.io/") (synopsis "Git implementation in Python")