From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tanguy Le Carrour Subject: Re: gnu: python: Update to 3.8.0. Date: Mon, 4 Nov 2019 10:15:36 +0100 Message-ID: <20191104091536.5zgt4c5knjsjff6m@rafflesia> References: <20191023091150.r6hdhtm2idxfdka3@rafflesia> <2b50f965-cbb2-d476-ceaf-2f00323fb50f@goebel-consult.de> <20191023125104.s3xvjegaufjjt4no@rafflesia> <20191030160430.4zdmlsnkoq5ps6tq@rafflesia> <20191030180150.k2txz37uffgu777k@melmoth> <87zhhgo6ms.fsf@devup.no> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="3yopgeepbefip34l" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:37681) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRYSg-0000Z2-6S for guix-devel@gnu.org; Mon, 04 Nov 2019 04:15:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRYSe-00018b-6I for guix-devel@gnu.org; Mon, 04 Nov 2019 04:15:45 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:54645) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iRYSd-00015G-6m for guix-devel@gnu.org; Mon, 04 Nov 2019 04:15:43 -0500 Content-Disposition: inline In-Reply-To: <87zhhgo6ms.fsf@devup.no> 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: Marius Bakke Cc: guix-devel@gnu.org --3yopgeepbefip34l Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi Marius! Le 11/01, Marius Bakke a écrit : > Tanguy Le Carrour writes: > > Oh, oh… what I forgot to mention is that… it's a shameless copy/paste of > > the python-3.7 package and it would deserve a rewrite! Something like > > `(inherit python-3.7)` and a modification of [source](patches) and > > [source](snippet). But I'm not sure how to do that! > > Origins can also be inherited: > > (source (origin > (inherit (package-source python-3.7)) > (uri ...) > (sha256 ...) > (patches (append (origin-patches (package-source python-3.7)) > (search-patches "python-3.8-adjust-tests.patch"))))) > > That would inherit the snippet and any other properties that are not > explicitly overridden. Thanks for the snippet! I updated my package definition accordingly (see attachment), but… `./pre-inst-env guix build --rounds=2 python@3.8` always fails with: """ output ‘/gnu/store/…-python-3.8.0’ of ‘/gnu/store/…-python-3.8.0.drv’ differs from previous round """ I checked and I have the same problem with my previous version! :-( Any idea welcome!! -- Tanguy --3yopgeepbefip34l Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-Add-python-3.8.patch" Content-Transfer-Encoding: 8bit >From c60570afb0185d69034c7d140f2997f59ca83171 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 | 23 ++++++++++ 3 files changed, 82 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..ba394f0ad9 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,28 @@ data types.") (version-major+minor version) "/site-packages")))))))) +(define-public python-3.8 + (package (inherit python-3.7) + (version "3.8.0") + (source + (origin (inherit (package-source python-3.7)) + (uri (string-append "https://www.python.org/ftp/python/" + version "/Python-" version ".tar.xz")) + (sha256 (base32 "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk")) + (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")) + (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)))))) + ;; Current 3.x version. (define-public python-3 python-3.7) -- 2.23.0 --3yopgeepbefip34l--