From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57362) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3hrx-0002aU-T7 for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3hrv-0002yK-7a for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i3hru-0002od-V3 for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i3hrs-0003rv-Qm for guix-patches@gnu.org; Fri, 30 Aug 2019 10:27:12 -0400 Subject: [bug#37234] [PATCH 19/21] gnu: python-pyyaml: Add version 5.1. Resent-Message-ID: From: Marius Bakke Date: Fri, 30 Aug 2019 16:25:37 +0200 Message-Id: <20190830142539.28376-19-mbakke@fastmail.com> In-Reply-To: <20190830142539.28376-1-mbakke@fastmail.com> References: <20190830142539.28376-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 37234@debbugs.gnu.org * gnu/packages/python-xyz.scm (python-pyyaml-next, python2-pyyaml-next): New public variables. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7d4b0be494..7056ea3d48 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2282,6 +2282,28 @@ object.") (define-public python2-pyyaml (package-with-python2 python-pyyaml)) +;; Some packages (e.g python-keras) are not ready for the PyYAML >= 4.x API, +;; so we keep this as a separate variable for now. +(define-public python-pyyaml-next + (package/inherit python-pyyaml + (version "5.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "15czj11s2bcgchn2jx81k0jmswf2hjxry5cq820h7hgpxiscfss3")))))) + +(define-public python2-pyyaml-next + (package/inherit python2-pyyaml + (version "5.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "15czj11s2bcgchn2jx81k0jmswf2hjxry5cq820h7hgpxiscfss3")))))) + (define-public python-vine (package (name "python-vine") -- 2.22.1