From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id XgyuHCGsy17FZgAA0tVLHw (envelope-from ) for ; Mon, 25 May 2020 11:29:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KIEHGCGsy16lcgAAbx9fmQ (envelope-from ) for ; Mon, 25 May 2020 11:29:37 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DF29A9403EC for ; Mon, 25 May 2020 11:29:36 +0000 (UTC) Received: from localhost ([::1]:43276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdBIV-00013E-Ps for larch@yhetil.org; Mon, 25 May 2020 07:29:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdBG2-0005gh-55 for guix-patches@gnu.org; Mon, 25 May 2020 07:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jdBG1-0001Zp-RW for guix-patches@gnu.org; Mon, 25 May 2020 07:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jdBG1-00036r-NX for guix-patches@gnu.org; Mon, 25 May 2020 07:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41395] [PATCH 2/4] gnu: Update python-prompt-toolkit to version 3.0.5 References: <87v9ksckt3.fsf@alice.lan> In-Reply-To: <87v9ksckt3.fsf@alice.lan> Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 May 2020 11:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41395 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41395@debbugs.gnu.org Received: via spool by 41395-submit@debbugs.gnu.org id=B41395.159040601111936 (code B ref 41395); Mon, 25 May 2020 11:27:01 +0000 Received: (at 41395) by debbugs.gnu.org; 25 May 2020 11:26:51 +0000 Received: from localhost ([127.0.0.1]:40010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdBFq-00036S-HV for submit@debbugs.gnu.org; Mon, 25 May 2020 07:26:51 -0400 Received: from sender4-op-o11.zoho.com ([136.143.188.11]:17143) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jdBFo-00036K-Jk for 41395@debbugs.gnu.org; Mon, 25 May 2020 07:26:49 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1590406006; cv=none; d=zohomail.com; s=zohoarc; b=ViryAvqwCzD0eZdEosWlCARmsJp59SH7i0522an2qy5ob4MkGaIT6b3pngIJjLUCxUUeWnJkF4s1e5E4DZvQSbTDxuKNtLAk+C+GpYkxbQYldjyithfdw7b+l8S6Y2slA4jFkEM5OKd4aOG6hXX/6Qetqnqpsj1ROqY3OIK3prY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590406006; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=JfFHRCijF7+nrwwyRO0A84HKem10f8FJjv5uEnw7VXo=; b=Pd+F/QYCtg+4UBN/MK5soDKDXqgfDjjnXG8Vh81gBk79faFeyga7OlRIWEKyJFeIX9bHGyW/IfsHswowpwmNu6HnfeNxnoajLC8Vs3WEQbZDPrKe3iR9I+0jzUw3IyhZkNH1LquDuOBdBbJ4fdbwmd+eb20ssB9krMdX+g4IDBk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=beaver-labs.com; spf=pass smtp.mailfrom=edk@beaver-labs.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1590406006; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=From:To:Subject:Message-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=JfFHRCijF7+nrwwyRO0A84HKem10f8FJjv5uEnw7VXo=; b=Gl4WzoecYoZgaxSqX2Jg9lNru/sP5ttWFiAzl3sdT/NtqrMDROug0rRrPbC3tBY6 gVzu7Jc4rvnFzB7YpDBPtqEIzLZS0GxdKFPM2mwMMbn5XEtxGRq3d/zSL8Pb2HFgHfK wL2X2BpBGtWeam2rLaVmEoBrySfB7bIRNVRRsFuY= Received: from alice.lan (lfbn-idf1-1-1299-119.w90-79.abo.wanadoo.fr [90.79.23.119]) by mx.zohomail.com with SMTPS id 1590406004262627.4651838161097; Mon, 25 May 2020 04:26:44 -0700 (PDT) User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein Message-ID: <87h7w4i7bj.fsf@alice.lan> Date: Mon, 25 May 2020 13:26:40 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=beaver-labs.com header.s=zoho header.b=Gl4Wzoec; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.99 X-TUID: lbu3ERYExnds * gnu/packages/machine-learning.scm (python-iml): Move python-nose from propagated to native input. (python-iml): Pin implicit python-prompt-toolkit dependency to version 2. * gnu/packages/python-xyz.scm (python-widgetsnbextension): Update to version 3.5.1. (python-widgetsnbextension): Pin implicit python-prompt-toolkit dependency = to version 2. (python-ipywidgets): Update to version 7.5.1. (python-ipywidgets): Pin implicit python-prompt-toolkit dependency to versi= on 2. (python-jupyter-console): Update to version 6.1.0. (python-jupyter-console): Pin implicit python-prompt-toolkit dependency to version 2. (python-jupyter-console): Pin explicit python-prompt-toolkit dependency to version 2. (python-prompt-toolkit): Update to version 3.0.5. (python-prompt-toolkit-2): New variable (prompt-toolkit-2-instead-of-prompt-toolkit): New variable --- gnu/packages/machine-learning.scm | 7 +++-- gnu/packages/python-xyz.scm | 52 +++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learn= ing.scm index 2395dbfe80..5553b31bb5 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -14,6 +14,7 @@ ;;; Copyright =C2=A9 2019 Guillaume Le Vaillant ;;; Copyright =C2=A9 2019 Brett Gilio ;;; Copyright =C2=A9 2020 Konrad Hinsen +;;; Copyright =C2=A9 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -1803,11 +1804,13 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,python-ipython) - ("nose" ,python-nose) + `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) + (native-inputs + `(("nose" ,python-nose))) (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9aa5635ab8..f60d4cc0ab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8970,17 +8970,18 @@ interactive computing.") (define-public python-widgetsnbextension (package (name "python-widgetsnbextension") - (version "3.4.2") + (version "3.5.1") (source (origin (method url-fetch) (uri (pypi-uri "widgetsnbextension" version)) (sha256 (base32 - "0rc2nivdy7k4m3vljx7wdh2jh11djapcgwhvzlbs0isl8gl8nqgs")))) + "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" + ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -8997,17 +8998,18 @@ notebooks.") (define-public python-ipywidgets (package (name "python-ipywidgets") - (version "5.2.2") + (version "7.5.1") (source (origin (method url-fetch) (uri (pypi-uri "ipywidgets" version)) (sha256 (base32 - "1lk0qrr5l9a0z7qkkn30hv5832whxwxymf1l576fmmad0n7hkxms")))) + "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,python-ipython) + `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs @@ -9027,19 +9029,20 @@ in the data.") (define-public python-jupyter-console (package (name "python-jupyter-console") - (version "6.0.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_console" version)) (sha256 (base32 - "1xdjw11cppf1fxvwkw2bk13ckkwas3bdah8baingn9296mvfi31h")))) + "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipykernel)) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) (native-inputs `(("python-nose" ,python-nose))) @@ -12105,14 +12108,14 @@ collections of data.") (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") - (version "2.0.7") + (version "3.0.5") (source (origin (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) + (uri (pypi-uri "prompt_toolkit" version)) (sha256 (base32 - "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + "1j3x5s4gp4ih73sbcni0a0vffbzvrxbrbnkvb3fzjgxn810ilgan")))) (build-system python-build-system) (arguments `(#:phases @@ -12126,12 +12129,11 @@ collections of data.") (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-wcwidth" ,python-wcwidth) - ("python-six" ,python-six) - ("python-pygments" ,python-pygments))) + `(("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") + (home-page + "https://github.com/prompt-toolkit/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") (description "Prompt-Toolkit is a library for building interactive command line @@ -12141,6 +12143,22 @@ code completion, incremental search, support for C= hinese double-width characters, mouse support, and auto suggestions.") (license license:bsd-3))) =20 +(define-public python-prompt-toolkit-2 + (package (inherit python-prompt-toolkit) + (name "python-prompt-toolkit") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) + (sha256 + (base32 + "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))))) + +(define-public prompt-toolkit-2-instead-of-prompt-toolkit + (package-input-rewriting/spec + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) + (define-public python2-prompt-toolkit (package-with-python2 python-prompt-toolkit)) =20 --=20 2.26.2