guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

45/49: gnu: Python: Do not embed timestamps in wheel files.


From: guix-commits
Subject: 45/49: gnu: Python: Do not embed timestamps in wheel files.
Date: Fri, 23 Jul 2021 11:33:14 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit ea562aba69d8ef8599abdaf2505e3f1f7ecf4d28
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Jul 21 23:54:10 2021 +0200

    gnu: Python: Do not embed timestamps in wheel files.
    
    * gnu/packages/python.scm (python-3.9)[arguments]: Reset timestamps before
    zipping wheels.  While at it, remove redundant regex argument.
---
 gnu/packages/python.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 74af5b3..0ec7902 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -26,7 +26,7 @@
 ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke 
<marius@gnu.org>
 ;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
@@ -502,7 +502,8 @@ data types.")
                ;; Delete .exe from embedded .whl (zip) files
                (for-each
                 (lambda (whl)
-                  (let ((dir "whl-content"))
+                  (let ((dir "whl-content")
+                        (circa-1980 (* 10 366 24 60 60)))
                     (mkdir-p dir)
                     (with-directory-excursion dir
                       (let ((whl (string-append "../" whl)))
@@ -510,8 +511,13 @@ data types.")
                         (for-each delete-file
                                   (find-files "." "\\.exe$"))
                         (delete-file whl)
+                        ;; Reset timestamps to prevent them from ending
+                        ;; up in the Zip archive.
+                        (ftw "." (lambda (file stat flag)
+                                   (utime file circa-1980 circa-1980)
+                                   #t))
                         (apply invoke "zip" "-X" whl
-                               (find-files "." ".*" #:directories? #t))))
+                               (find-files "." #:directories? #t))))
                     (delete-file-recursively dir)))
                 (find-files "Lib/ensurepip" "\\.whl$"))))
            (add-before 'check 'set-TZDIR



reply via email to

[Prev in Thread] Current Thread [Next in Thread]