From patchwork Thu Mar 18 23:08:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 27964 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 41C3F27BC57; Thu, 18 Mar 2021 23:09:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4019127BC55 for ; Thu, 18 Mar 2021 23:09:09 +0000 (GMT) Received: from localhost ([::1]:41952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lN1lM-0001UM-D1 for patchwork@mira.cbaines.net; Thu, 18 Mar 2021 19:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lN1lG-0001U0-8g for guix-patches@gnu.org; Thu, 18 Mar 2021 19:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lN1lG-00008C-0k for guix-patches@gnu.org; Thu, 18 Mar 2021 19:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lN1lF-00007b-Se for guix-patches@gnu.org; Thu, 18 Mar 2021 19:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47214] [core-updates] gnu: python: Remove unnecessary files Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Mar 2021 23:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47214 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47214@debbugs.gnu.org Received: via spool by 47214-submit@debbugs.gnu.org id=B47214.1616108932444 (code B ref 47214); Thu, 18 Mar 2021 23:09:01 +0000 Received: (at 47214) by debbugs.gnu.org; 18 Mar 2021 23:08:52 +0000 Received: from localhost ([127.0.0.1]:48298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lN1ky-00006w-VL for submit@debbugs.gnu.org; Thu, 18 Mar 2021 19:08:52 -0400 Received: from lepiller.eu ([89.234.186.109]:41416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lN1kv-00006h-N7 for 47214@debbugs.gnu.org; Thu, 18 Mar 2021 19:08:43 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f9dcac84 for <47214@debbugs.gnu.org>; Thu, 18 Mar 2021 23:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:in-reply-to:references:mime-version :content-type; s=dkim; bh=VN1MbdFM4NAFW3DsAvhQt5z3JKybz2eNMp5ovB UgJdY=; b=emEqftl5qTLeWiV1MZHbonEvp+d578bJ+T7dwBIKtbcgeVwhbdY+l/ z8xBfcQTwNI2aR9Fwm+2Y+uT4SJcQjGYlavHfX8IbBZ+7Pq8c8C5zqyvmL21IcJd MpmmNAl/c3lgcvLxjYfS/DkdpxDj/b9WIXx0yNA7T4JBI+e10y0u+JIL62YJicnz Y+P8Hi6vu92BO0AQW1j2mrVOeN19OLdwrFliJlFFTM2NPIwFFuQOiSBMO7hw7CVZ gi0Zfp5IUXcPQNNWa/nuw3z4yz4xHO2yNDzdUEBCSfepIQ0hz+9/PauFj1b+UdI9 VAURRh2crZbPGn2Plbn0p/lyp7cqz4Vw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 14d17a30 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <47214@debbugs.gnu.org>; Thu, 18 Mar 2021 23:08:39 +0000 (UTC) Date: Fri, 19 Mar 2021 00:08:30 +0100 From: Julien Lepiller Message-ID: <20210319000830.23926447@tachikoma.lepiller.eu> In-Reply-To: <20210317133933.5eb6d325@tachikoma.lepiller.eu> References: <20210317133933.5eb6d325@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Le Wed, 17 Mar 2021 13:41:02 +0100, Julien Lepiller a écrit : > Hi Guix! > > this patch (going to core-updates) removes files from the output of > python2 and python3, in an attempt to save some space. First, I > noticed that python3 shipped windows binaries in its source > distribution and installs them to the output, in > lib/python3.8/distutils/command/*.exe, > lib/python3.8/site-packages/*.exe and > lib/python3.8/site-packages/pip/_vendor/distlib/*.exe. I remove them > from the snippet, so they should not be installed anymore. > > I also noticed that python installs files that were built during the > test phase, so I remove them, but we need to check they are not > actually needed. Other distros ship them in a separate package, so > maybe we could have a separate test output if this is causing issues? > > I haven't yet tested the patch, because it needs to rebuild part of > the bootstrap chain. I'll report progress and update my patch > depending on the results! I discovered other .exe in python3, so this updated patch deletes them. Since I modify the python from commencement.scm by changing a phase in python-2.7, I decided to also change the definition there to remove the offending files. I managed to build up to python-3.9 without any issue, but haven't tested building more than a handful of python packages. From 0d2d9a32cbbf24eadf74271b2fb1304b7a72d281 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 17 Mar 2021 13:33:22 +0100 Subject: [PATCH 1/2] gnu: python: Remove unnecessary files. * gnu/packages/python.scm (python2)[arguments]: Remove files built during the test phase. (python3)[arguments]: Also remove windows binaries shipped with the sources. --- gnu/packages/commencement.scm | 9 ++++++++- gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b2921a4a48..b2b9651444 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -3098,7 +3099,12 @@ memoized as a function of '%current-system'." (delete-file-recursively "Modules/expat") (substitute* "Modules/Setup.dist" ;; Link Expat instead of embedding the bundled one. - (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n"))))))) + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + ;; Delete windows binaries + (for-each delete-file + (find-files "Lib/distutils/command" ".*.exe$")) + (for-each delete-file + (find-files "Lib/ensurepip" ".*.whl$"))))))) (inputs `(,@(%boot0-inputs) ("expat" ,expat-sans-tests))) ;remove OpenSSL, zlib, etc. @@ -3129,6 +3135,7 @@ memoized as a function of '%current-system'." ('add-after unpack apply-alignment-patch _)) `(modify-phases ,original-phases ,@changes)) (_ phases))) + (delete 'remove-windows-binaries) (add-before 'configure 'disable-modules (lambda _ (substitute* "setup.py" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 49d43ab008..da9859b11a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac -;;; Copyright © 2016, 2017, 2018 Julien Lepiller +;;; Copyright © 2016, 2017, 2018, 2021 Julien Lepiller ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro @@ -294,7 +294,16 @@ (not (string-prefix? "test_support." file)))))) - (call-with-output-file "__init__.py" (const #t))))))))) + (call-with-output-file "__init__.py" (const #t)))) + (let ((libdir (string-append out "/lib/" pythonX.Y))) + (for-each + (lambda (directory) + (let ((dir (string-append libdir "/" directory))) + (when (file-exists? dir) + (delete-file-recursively dir)))) + '("email/test" "ctypes/test" "unittest/test" "tkinter/test" + "sqlite3/test" "bsddb/test" "lib-tk/test" "lib2to3/tests" + "json/tests" "distutils/tests")))))))) (add-after 'remove-tests 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -424,6 +433,9 @@ data types.") (substitute* "Modules/Setup" ;; Link Expat instead of embedding the bundled one. (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + ;; Delete windows binaries + (for-each delete-file + (find-files "Lib/distutils/command" ".*.exe$")) #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) @@ -469,6 +481,23 @@ data types.") ,@(if (hurd-system?) `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 '()) + (add-after 'unpack 'remove-windows-binaries + (lambda _ + ;; Delete .exe from embedded .whl (zip) files + (for-each + (lambda (whl) + (let ((dir "whl-content")) + (mkdir-p dir) + (with-directory-excursion dir + (let ((whl (string-append "../" whl))) + (invoke "unzip" whl) + (for-each delete-file + (find-files "." ".*.exe$")) + (delete-file whl) + (apply invoke "zip" "-X" whl + (find-files "." ".*" #:directories? #t)))) + (delete-file-recursively dir))) + (find-files "Lib/ensurepip" ".*.whl$")))) (add-before 'check 'set-TZDIR (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; test_email requires the Olson time zone database. @@ -503,6 +532,8 @@ data types.") ,(customize-site version)))))) (native-inputs `(("tzdata" ,tzdata-for-tests) + ("unzip" ,unzip) + ("zip" ,(@ (gnu packages compression) zip)) ,@(if (%current-target-system) `(("python3" ,this-package)) '()) -- 2.30.0