From patchwork Thu May 9 22:53:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 27270 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 CF2FA27BBEE; Thu, 9 May 2024 23:58:35 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 37A4E27BBE2 for ; Thu, 9 May 2024 23:58:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5Chq-0006D8-4l; Thu, 09 May 2024 18:57:42 -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 1s5ChQ-0005ur-Q3 for guix-patches@gnu.org; Thu, 09 May 2024 18:57:17 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5ChP-0006Sd-96 for guix-patches@gnu.org; Thu, 09 May 2024 18:57:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5ChN-0002hG-JZ for guix-patches@gnu.org; Thu, 09 May 2024 18:57:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70855] [PATCH 25/92] gnu: gunicorn: Move to pyproject-build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 May 2024 22:57:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70855 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70855@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70855-submit@debbugs.gnu.org id=B70855.171529541310026 (code B ref 70855); Thu, 09 May 2024 22:57:13 +0000 Received: (at 70855) by debbugs.gnu.org; 9 May 2024 22:56:53 +0000 Received: from localhost ([127.0.0.1]:41103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Ch2-0002bY-Gb for submit@debbugs.gnu.org; Thu, 09 May 2024 18:56:52 -0400 Received: from 17.mo584.mail-out.ovh.net ([46.105.41.16]:52647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5Cgz-0002az-4d for 70855@debbugs.gnu.org; Thu, 09 May 2024 18:56:49 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.25.233]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Vb6p93jbQz1Dyq for <70855@debbugs.gnu.org>; Thu, 9 May 2024 22:56:49 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-k2rm4 (unknown [10.110.96.170]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 478CC1FD46; Thu, 9 May 2024 22:56:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-k2rm4 with ESMTPSA id iXZQDbFUPWYWMAAA4Cy/jA (envelope-from ); Thu, 09 May 2024 22:56:49 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002180f1036-1da4-41ca-b991-a3126253fe48, E63BAB6C0A71DD4DA934779D5D345DF804807214) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Fri, 10 May 2024 00:53:20 +0200 Message-ID: <20240509225530.24649-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240509225530.24649-1-ngraves@ngraves.fr> References: <20240509225530.24649-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6102658973403505378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdeffedgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdffvdeitdehleefteefvedtffeuffdvtdfgjeekgffgteegiefggeduieejvdehnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtkeehheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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-web.scm (gunicorn): Improve package style. [build-system]: Move to pyproject-build-system. [arguments]<#:phases>: Remove check phase replacement, now in <#:test-flags>. Use gexp. Remove wrap phase replacement (will not be needed after merge of 25235). Change-Id: I83e09cd0a22c0a5d249e50af199c5c648e53aa65 --- gnu/packages/python-web.scm | 41 ++++++++++--------------------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index fd9d49e2e2f..494b11422f3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6064,29 +6064,25 @@ (define-public gunicorn (base32 "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0")))) (outputs '("out" "doc")) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:test-flags '(list + ;; Disable the geventlet tests because eventlet uses + ;; dnspython, which does not work in the build + ;; container due to lack of /etc/resolv.conf, etc. + "--ignore=tests/workers/test_geventlet.py") + #:phases + #~(modify-phases %standard-phases (add-after 'build 'build-doc (lambda _ (invoke "make" "-C" "docs" "PAPER=a4" "html" "info") (delete-file "docs/build/texinfo/Makefile") (delete-file "docs/build/texinfo/Gunicorn.texi"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (invoke "pytest" "-vv" - ;; Disable the geventlet tests because eventlet uses - ;; dnspython, which does not work in the build - ;; container due to lack of /etc/resolv.conf, etc. - "--ignore=tests/workers/test_geventlet.py")) - (format #t "test suite not run~%")))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version)) + "/share/doc/" #$name "-" #$version)) (html (string-append doc "/html")) (info (string-append doc "/info")) (examples (string-append doc "/examples"))) @@ -6098,22 +6094,7 @@ (define-public gunicorn (copy-recursively "examples" examples) (for-each (lambda (file) (copy-file file (string-append doc "/" file))) - '("README.rst" "NOTICE" "LICENSE" "THANKS"))))) - ;; XXX: The wrap phase includes native inputs on PYTHONPATH, (see - ;; ), leading to an inflated closure - ;; size. Override it to only add the essential entries. - (replace 'wrap - (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (python (assoc-ref (or native-inputs inputs) "python")) - (sitedir (string-append "/lib/python" - (python-version python) - "/site-packages"))) - (wrap-program (string-append out "/bin/gunicorn") - `("PYTHONPATH" ":" prefix - ,(map (lambda (output) - (string-append output sitedir)) - (list python out)))))))))) + '("README.rst" "NOTICE" "LICENSE" "THANKS")))))))) (native-inputs (list binutils ;; for ctypes.util.find_library() python-aiohttp