From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tanguy Le Carrour Subject: Re: gnu: python: Update to 3.8.0. Date: Wed, 30 Oct 2019 17:04:30 +0100 Message-ID: <20191030160430.4zdmlsnkoq5ps6tq@rafflesia> References: <20191023091150.r6hdhtm2idxfdka3@rafflesia> <2b50f965-cbb2-d476-ceaf-2f00323fb50f@goebel-consult.de> <20191023125104.s3xvjegaufjjt4no@rafflesia> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="ev5cakxhbrbuve3t" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:51363) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPqSb-00079v-DC for guix-devel@gnu.org; Wed, 30 Oct 2019 12:04:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPqSY-0004pB-Px for guix-devel@gnu.org; Wed, 30 Oct 2019 12:04:37 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:39545) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iPqSY-0004hV-DA for guix-devel@gnu.org; Wed, 30 Oct 2019 12:04:34 -0400 Content-Disposition: inline In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Hartmut Goebel Cc: guix-devel@gnu.org --ev5cakxhbrbuve3t Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi Hartmut, Hi Guix! Le 10/23, Hartmut Goebel a écrit : > Am 23.10.19 um 14:51 schrieb Tanguy Le Carrour: > > Is it possible to package it and make it available, but not to make it > > the default python? When would be a good time to make the switch?! > > Yes, you can add a package "python-3.8". Done! But I still have some questions/problems: 1- `etc/indent-code.el` re-indent the package differently than, for instance, python-3.7. Should I stick to what `etc/indent-code.el` does? 2- To make it work I had to deactivate 4 tests. There was already a patch doing something similar ("This fails for unknown reasons on Guix"), but I'm pretty sure it would be better to work on fixing the problems, right? > You might even test if all packages still pass the test when you make > this the default "python-3". This, I'll do in a second time. Any comment welcome! -- Tanguy --ev5cakxhbrbuve3t Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-Add-python-3.8.patch" Content-Transfer-Encoding: 8bit >From 961d8a4ca3562d5620eef79d7dbf5a6d68990244 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 25 Oct 2019 15:36:52 +0200 Subject: [PATCH] gnu: Add python-3.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-3.8): New public variable. [source]: Add patches to skip four tests. * gnu/packages/patches/python-3.8-search-paths.patch: New file. * gnu/packages/patches/python-3.8-fix-tests.patch: New file. --- .../patches/python-3.8-fix-tests.patch | 42 +++++++++ .../patches/python-3.8-search-paths.patch | 17 ++++ gnu/packages/python.scm | 88 +++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 gnu/packages/patches/python-3.8-fix-tests.patch create mode 100644 gnu/packages/patches/python-3.8-search-paths.patch diff --git a/gnu/packages/patches/python-3.8-fix-tests.patch b/gnu/packages/patches/python-3.8-fix-tests.patch new file mode 100644 index 0000000000..bea311992a --- /dev/null +++ b/gnu/packages/patches/python-3.8-fix-tests.patch @@ -0,0 +1,42 @@ +diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py +index 1474624..887f8ee 100644 +--- a/Lib/test/_test_multiprocessing.py ++++ b/Lib/test/_test_multiprocessing.py +@@ -3801,6 +3801,7 @@ class _TestSharedMemory(BaseTestCase): + sms.close() + + @unittest.skipIf(os.name != "posix", "not feasible in non-posix platforms") ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_shared_memory_SharedMemoryServer_ignores_sigint(self): + # bpo-36368: protect SharedMemoryManager server process from + # KeyboardInterrupt signals. +diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py +index d41e94b..a1c15e7 100644 +--- a/Lib/test/test_signal.py ++++ b/Lib/test/test_signal.py +@@ -78,6 +78,7 @@ class PosixTests(unittest.TestCase): + self.assertLess(len(s), signal.NSIG) + + @unittest.skipUnless(sys.executable, "sys.executable required.") ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_keyboard_interrupt_exit_code(self): + """KeyboardInterrupt triggers exit via SIGINT.""" + process = subprocess.run( +@@ -128,6 +129,7 @@ class WindowsSignalTests(unittest.TestCase): + signal.signal(7, handler) + + @unittest.skipUnless(sys.executable, "sys.executable required.") ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_keyboard_interrupt_exit_code(self): + """KeyboardInterrupt triggers an exit using STATUS_CONTROL_C_EXIT.""" + # We don't test via os.kill(os.getpid(), signal.CTRL_C_EVENT) here +@@ -1245,6 +1247,7 @@ class StressTest(unittest.TestCase): + + class RaiseSignalTest(unittest.TestCase): + ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_sigint(self): + with self.assertRaises(KeyboardInterrupt): + signal.raise_signal(signal.SIGINT) +-- +2.23.0 diff --git a/gnu/packages/patches/python-3.8-search-paths.patch b/gnu/packages/patches/python-3.8-search-paths.patch new file mode 100644 index 0000000000..22e102ccbe --- /dev/null +++ b/gnu/packages/patches/python-3.8-search-paths.patch @@ -0,0 +1,17 @@ +diff --git a/setup.py b/setup.py +index 20d7f35..5751083 100644 +--- a/setup.py ++++ b/setup.py +@@ -676,8 +676,8 @@ class PyBuildExt(build_ext): + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. + if not CROSS_COMPILING: +- self.lib_dirs = self.compiler.library_dirs + system_lib_dirs +- self.inc_dirs = self.compiler.include_dirs + system_include_dirs ++ self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ self.inc_dirs = os.getenv('CPATH', '').split(os.pathsep) + else: + # Add the sysroot paths. 'sysroot' is a compiler option used to + # set the logical path of the standard system headers and +-- +2.23.0 diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 644c9d7666..4720b42b7b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -408,6 +409,93 @@ data types.") (version-major+minor version) "/site-packages")))))))) +(define-public python-3.8 + (package (inherit python-2) + (name "python") + (version "3.8.0") + (source (origin + (method url-fetch) + (uri (string-append "https://www.python.org/ftp/python/" + version "/Python-" version ".tar.xz")) + (patches (search-patches + "python-3.8-search-paths.patch" + "python-3-fix-tests.patch" + "python-3.8-fix-tests.patch" + "python-3-deterministic-build-info.patch")) + (sha256 + (base32 + "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled copy of libexpat. + (delete-file-recursively "Modules/expat") + (substitute* "Modules/Setup" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments python-2) + ((#:make-flags _) + `(list (string-append + (format #f "TESTOPTS=-j~d" (parallel-job-count)) + ;; test_mmap fails on low-memory systems. + " --exclude test_mmap" + ;; test_socket may hang and eventually run out of memory + ;; on some systems: . + " test_socket" + ;; XXX: test_ctypes fails on some platforms due to a problem in + ;; libffi 3.2.1: . + ,@(if (string-prefix? "aarch64" (%current-system)) + '(" test_ctypes") + '())))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'set-TZDIR + (lambda* (#:key inputs #:allow-other-keys) + ;; test_email requires the Olson time zone database. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t)) + ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it + ;; again afterwards. See . + (add-before 'check 'unset-SOURCE_DATE_EPOCH + (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) + (add-after 'check 'reset-SOURCE_DATE_EPOCH + (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) + (replace 'rebuild-bytecode + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Disable hash randomization to ensure the generated .pycs + ;; are reproducible. + (setenv "PYTHONHASHSEED" "0") + (for-each + (lambda (opt) + (format #t "Compiling with optimization level: ~a\n" + (if (null? opt) "none" (car opt))) + (for-each (lambda (file) + (apply invoke + `(,(string-append out "/bin/python3") + ,@opt + "-m" "compileall" + "-f" ; force rebuild + ;; Don't build lib2to3, because it's Python 2 code. + "-x" "lib2to3/.*" + ,file))) + (find-files out "\\.py$"))) + (list '() '("-O") '("-OO"))) + #t))))))) + (native-inputs + `(("tzdata" ,tzdata-for-tests) + ,@(package-native-inputs python-2))) + (native-search-paths + (list (search-path-specification + (variable "PYTHONPATH") + (files (list (string-append "lib/python" + (version-major+minor version) + "/site-packages")))))))) + ;; Current 3.x version. (define-public python-3 python-3.7) -- 2.23.0 --ev5cakxhbrbuve3t--