From patchwork Fri Apr 28 14:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cully X-Patchwork-Id: 49653 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 13C8727BBEA; Fri, 28 Apr 2023 15:02:44 +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,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 3DA7F27BBE2 for ; Fri, 28 Apr 2023 15:02:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOg4-0000vb-Fe; Fri, 28 Apr 2023 10:02:24 -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 1psOfw-0000sc-9v for guix-patches@gnu.org; Fri, 28 Apr 2023 10:02:20 -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 1psOfi-0001BO-6y for guix-patches@gnu.org; Fri, 28 Apr 2023 10:02:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psOfi-0001rq-2F for guix-patches@gnu.org; Fri, 28 Apr 2023 10:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63044] [PATCH v3] gnu: python-setuptools: Disable date checking in bdist_egg.py References: <87ildm3zf6.fsf@psyduck.jhoto.kublai.com> In-Reply-To: <87ildm3zf6.fsf@psyduck.jhoto.kublai.com> Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 14:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63044 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63044@debbugs.gnu.org Cc: Brian Cully Received: via spool by 63044-submit@debbugs.gnu.org id=B63044.16826904867116 (code B ref 63044); Fri, 28 Apr 2023 14:02:02 +0000 Received: (at 63044) by debbugs.gnu.org; 28 Apr 2023 14:01:26 +0000 Received: from localhost ([127.0.0.1]:34066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOf8-0001qi-40 for submit@debbugs.gnu.org; Fri, 28 Apr 2023 10:01:26 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:65137 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOf3-0001qT-3K for 63044@debbugs.gnu.org; Fri, 28 Apr 2023 10:01:24 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id E34779138; Fri, 28 Apr 2023 10:01:20 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682690481; bh=ypIk2h/sJU80BcK0fiAiq4obdyjY7Afsb1ttbCCBR8o=; h=From:To:Cc:Subject:Date; b=LEUzon6qo4mKZyw94aUQileWDFHDnq6n4GVTIWLoYWBJIcd0Iv90s/gXpE47w7Os8 IoRfovwcLrntYDRcbR8TplPxptMwjo+u/P0A615CSPaPLtSu/5XELnffMfSEQqSqSN +KmZo1SBOwlq6AEwUtbP+8r8pE5R3NSZpWrDm5i4= Date: Fri, 28 Apr 2023 10:01:12 -0400 Message-Id: <6351ec19a1f494f5ae5d9828530f70f9c1aa2dea.1682690472.git.bjc@spork.org> X-Mailer: git-send-email 2.39.2 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: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches X-Patchwork-Original-From: Brian Cully via Guix-patches via From: Brian Cully 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 This fixes errors when packing Python eggs, where ZipFile fails due to Guix setting file timestamps to 0 epoch seconds, where ZipFile wants all files to date from at least 1980. * gnu/packages/python-build.scm (python-setuptools) [disable-zipfile-date-check]: new phase --- gnu/packages/python-build.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 70719c44d4..d9f6f5beff 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -299,7 +299,21 @@ (define-public python-setuptools (build-system python-build-system) ;; FIXME: Tests require pytest, which itself relies on setuptools. ;; One could bootstrap with an internal untested setuptools. - (arguments (list #:tests? #f)) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Disable the check which requires files to be dated from at least + ;; 1980. + ;; + ;; This phase is also in the base python package, as it includes its + ;; own setuptools. + (add-after 'unpack 'disable-zipfile-date-check + (lambda _ + (substitute* "setuptools/command/bdist_egg.py" + (("zipfile.ZipFile\\(zip_filename, mode, compression=compression\\)") + "zipfile.ZipFile(zip_filename, mode, compression=compression, strict_timestamps=False)"))))))) (home-page "https://pypi.org/project/setuptools/") (synopsis "Library designed to facilitate packaging Python projects") (description "Setuptools is a fully-featured, stable library designed to