From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QW+XBzYgzV49XQAA0tVLHw (envelope-from ) for ; Tue, 26 May 2020 13:57:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yDcCAzYgzV6mMwAA1q6Kng (envelope-from ) for ; Tue, 26 May 2020 13:57:10 +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 B12B9940D34 for ; Tue, 26 May 2020 13:57:09 +0000 (UTC) Received: from localhost ([::1]:58270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jda4q-0005fE-51 for larch@yhetil.org; Tue, 26 May 2020 09:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jda4k-0005ci-4x for guix-patches@gnu.org; Tue, 26 May 2020 09:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34464) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jda4j-0003EN-SQ for guix-patches@gnu.org; Tue, 26 May 2020 09:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jda4j-000175-Ro for guix-patches@gnu.org; Tue, 26 May 2020 09:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41395] [PATCH 3/3] gnu: Update python-prompt-toolkit to version 3.0.5 Resent-From: Edouard Klein Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 May 2020 13:57: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.15905013684250 (code B ref 41395); Tue, 26 May 2020 13:57:01 +0000 Received: (at 41395) by debbugs.gnu.org; 26 May 2020 13:56:08 +0000 Received: from localhost ([127.0.0.1]:46010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jda3r-00016U-R4 for submit@debbugs.gnu.org; Tue, 26 May 2020 09:56:08 -0400 Received: from sender4-op-o10.zoho.com ([136.143.188.10]:17058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jda3o-00016O-LC for 41395@debbugs.gnu.org; Tue, 26 May 2020 09:56:06 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1590501361; cv=none; d=zohomail.com; s=zohoarc; b=QVRHUBfANw57lqc1PhnHcYsVatP2WKQAMBNiO1VEBWMuDAPl3TRwBgkpq64UTQt5iGf2kdHkJWMVEQ7/lke8bmFlL+zu2cZ6rUIutduzEl35XF5RYy+F9djzXTcH3KYanW6wp/HxV2hDlllRD1V6DwtUGAqBYhBKG7i3o4PugFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590501361; h=Content-Type:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=mc3xJmE+R9tMUGJ4PUTw4J6xJNEeRLTki00IIvtBpzw=; b=Vxa9GlgHhpxN6E7RX10tQYB/qa1JIPdWC31PFDhopYdoSlaUKOCGHgKcni8Y+lRQcFAlXLbySq/PokI8wWEF8JZAkKfCo5Bak5xgCYw9d3YRiF3pCileBAzoX4I2kMlBHHB4HnuP0eActskCJNSNlhHPYV8G8jZpLx5OBQu89DI= 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=1590501361; s=zoho; d=beaver-labs.com; i=edk@beaver-labs.com; h=References:From:To:Subject:In-reply-to:Message-ID:Date:MIME-Version:Content-Type; bh=mc3xJmE+R9tMUGJ4PUTw4J6xJNEeRLTki00IIvtBpzw=; b=dOWK7Ao+znUI4Sq34dBiG6F90cJiY+bXi0zsg8zwIYUEiLxad+LMHXHBaSYsdsBG 25YeYOH/b15iExejtm/Ww1lCXy7qrM+q7JqoOassQMrg65ueCPzCZequ4n6ZD0eCu4c aD8aVwP3nrYJwBSiSQKlHk+TrB5Mjaj5ekJV0VNk= 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 15905013575931018.9212608840911; Tue, 26 May 2020 06:55:57 -0700 (PDT) References: <87v9ksckt3.fsf@alice.lan> <87h7w2ylan.fsf@alice.lan> User-agent: mu4e 1.4.6; emacs 26.3 From: Edouard Klein In-reply-to: <87h7w2ylan.fsf@alice.lan> Message-ID: <87zh9ux0k5.fsf@alice.lan> Date: Tue, 26 May 2020 15:55:54 +0200 MIME-Version: 1.0 Content-Type: text/plain 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=dOWK7Ao+; 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: Xxusi4r+MmkB Please disregard this one (as it is the one that follows the erroneous deletion of python-prompt-toolkit-1), and use the one I just sent with the same name instead. Thanks in advance, and sorry for the mistake. Edouard Klein writes: > * gnu/packages/machine-learning.scm (python-iml): Pin implicit > python-prompt-toolkit dependency to version 2. > > * gnu/packages/python-xyz.scm (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 version > 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 > (python2-prompt-toolkit): keep at version 2. > --- > gnu/packages/machine-learning.scm | 3 +- > gnu/packages/python-xyz.scm | 47 +++++++++++++++++++++++-------- > 2 files changed, 37 insertions(+), 13 deletions(-) > > diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm > index 17d01bc656..e26768267b 100644 > --- a/gnu/packages/machine-learning.scm > +++ b/gnu/packages/machine-learning.scm > @@ -1817,7 +1817,8 @@ advanced research.") > "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) > (build-system python-build-system) > (propagated-inputs > - `(("ipython" ,python-ipython) > + `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit > + python-ipython)) > ("numpy" ,python-numpy) > ("pandas" ,python-pandas) > ("scipy" ,python-scipy))) > diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm > index 04cfb98eef..e7d8c69472 100644 > --- a/gnu/packages/python-xyz.scm > +++ b/gnu/packages/python-xyz.scm > @@ -8980,7 +8980,8 @@ interactive computing.") > "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) > @@ -9007,7 +9008,8 @@ notebooks.") > "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 > @@ -9037,9 +9039,10 @@ in the data.") > "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,8 +12143,29 @@ code completion, incremental search, support for Chinese double-width > characters, mouse support, and auto suggestions.") > (license license:bsd-3))) > > +(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")))) > + (propagated-inputs > + `(("python-wcwidth" ,python-wcwidth) > + ("python-six" ,python-six) > + ("python-pygments" ,python-pygments) > + ("python-wcwidth" ,python-wcwidth))))) > + > +(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)) > + (package-with-python2 python-prompt-toolkit-2)) > > (define-public python-jedi > (package