From: Edouard Klein <edk@beaver-labs.com>
To: 41395@debbugs.gnu.org
Subject: [bug#41395] [PATCH] gnu: Update python-prompt-toolkit to version 3.0.5
Date: Tue, 26 May 2020 15:53:49 +0200 [thread overview]
Message-ID: <87367myf82.fsf@alice.lan> (raw)
In-Reply-To: <87v9ksckt3.fsf@alice.lan>
* 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.
(python-prompt-toolkit-1): inherit from version 2.
---
gnu/packages/machine-learning.scm | 3 +-
gnu/packages/python-xyz.scm | 49 +++++++++++++++++++++++--------
2 files changed, 38 insertions(+), 14 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 76a1635b12..aea4d5aab6 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,11 +12143,32 @@ 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-prompt-toolkit-1
- (package (inherit python-prompt-toolkit)
+ (package (inherit python-prompt-toolkit-2)
(version "1.0.15")
(source
(origin
--
2.26.2
next prev parent reply other threads:[~2020-05-26 13:55 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 9:53 [bug#41395] [PATCH 0/2] gnu: Add python-questionary Edouard Klein
2020-05-19 9:58 ` [bug#41395] [PATCH 1/2] gnu: python-prompt-toolkit: Update to 3.0.5 Edouard Klein
2020-05-23 18:35 ` Marius Bakke
2020-05-25 10:52 ` Edouard Klein
2020-05-25 22:21 ` Marius Bakke
2020-05-26 9:28 ` Edouard Klein
2020-05-19 9:59 ` [bug#41395] [PATCH 2/2] gnu: Add python-questionary Edouard Klein
2020-05-23 18:39 ` Marius Bakke
2020-05-25 11:23 ` Edouard Klein
2020-05-25 11:24 ` [bug#41395] [PATCH 1/4] gnu: Update python-iml homepage to https Edouard Klein
2020-05-25 22:23 ` Marius Bakke
2020-05-25 11:26 ` [bug#41395] [PATCH 2/4] gnu: Update python-prompt-toolkit to version 3.0.5 Edouard Klein
2020-05-25 22:28 ` Marius Bakke
2020-05-26 11:39 ` Edouard Klein
2020-05-25 11:27 ` [bug#41395] [PATCH 3/4] gnu: Add python-pytest-pycodestyle Edouard Klein
2020-05-25 22:33 ` Marius Bakke
2020-05-25 11:28 ` [bug#41395] [PATCH 4/4] gnu: Add python-questionary Edouard Klein
2020-05-26 9:30 ` [bug#41395] [PATCH 1/3] gnu: Update python-widgetsnbextension to 3.5.1 Edouard Klein
2020-05-30 13:16 ` Marius Bakke
2020-05-26 9:31 ` [bug#41395] [PATCH 2/3] gnu: Update python-ipywidgets to 7.5.1 Edouard Klein
2020-05-30 13:18 ` Marius Bakke
2020-05-26 9:33 ` [bug#41395] [PATCH 3/3] gnu: Update python-jupyter-console to 6.1.0 Edouard Klein
2020-05-30 13:19 ` Marius Bakke
2020-05-26 11:21 ` [bug#41395] [PATCH] gnu: Move nose from propagated to native in python-iml Edouard Klein
2020-05-30 13:21 ` Marius Bakke
2020-05-26 11:40 ` [bug#41395] [PATCH 1/3] " Edouard Klein
2020-05-26 11:41 ` [bug#41395] [PATCH 2/3] gnu: Remove python-prompt-toolkit-1 Edouard Klein
2020-05-26 13:41 ` Edouard Klein
2020-05-30 13:27 ` Marius Bakke
2020-05-30 13:26 ` Marius Bakke
2020-05-26 11:42 ` [bug#41395] [PATCH 3/3] gnu: Update python-prompt-toolkit to version 3.0.5 Edouard Klein
2020-05-26 13:55 ` Edouard Klein
2020-05-26 13:53 ` Edouard Klein [this message]
2020-05-30 13:48 ` bug#41395: [PATCH] " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87367myf82.fsf@alice.lan \
--to=edk@beaver-labs.com \
--cc=41395@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).