[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/16: gnu: python-prompt-toolkit: Update to 3.0.5.
From: |
guix-commits |
Subject: |
08/16: gnu: python-prompt-toolkit: Update to 3.0.5. |
Date: |
Sat, 30 May 2020 10:44:22 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 32ba87c14fd5e5b54d95211cd9a159d568ce7c67
Author: Edouard Klein <edk@beaver-labs.com>
AuthorDate: Tue May 26 15:53:49 2020 +0200
gnu: python-prompt-toolkit: Update to 3.0.5.
* gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Pin
implicit python-prompt-toolkit dependency to version 2.
* gnu/packages/python-xyz.scm
(python-widgetsnbextension)[propagated-inputs]:
Pin implicit python-prompt-toolkit dependency to version 2.
(python-ipywidgets)[propagated-inputs]: Pin implicit python-prompt-toolkit
dependency to version 2.
(python-jupyter-console)[propagated-inputs]: Pin explicit
python-prompt-toolkit dependency to version 2.
(python-prompt-toolkit): Update to version 3.0.5.
[propagated-inputs]: Remove PYTHON-SIX and PYTHON-PYGMENTS.
[home-page]: Adjust to current.
(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.
Signed-off-by: Marius Bakke <marius@gnu.org>
---
gnu/packages/machine-learning.scm | 3 ++-
gnu/packages/python-xyz.scm | 48 ++++++++++++++++++++++++++++-----------
2 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 17d01bc..e267682 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 b968a6c..8f1c3bb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9006,7 +9006,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)
@@ -9033,7 +9034,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
@@ -9063,9 +9065,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)))
@@ -12131,14 +12134,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
@@ -12152,12 +12155,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
@@ -12167,11 +12169,31 @@ 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))
+ (sha256
+ (base32
+ "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx"))))
+ (propagated-inputs
+ `(("python-wcwidth" ,python-wcwidth)
+ ("python-six" ,python-six)
+ ("python-pygments" ,python-pygments)))))
+
+(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
- branch master updated (968612b -> 839dba3), guix-commits, 2020/05/30
- 01/16: gnu: Add spectacle-analyzer., guix-commits, 2020/05/30
- 02/16: gnu: flowee: Really disable black-box test., guix-commits, 2020/05/30
- 03/16: gnu: python-pylint: Udpate to 2.5.2., guix-commits, 2020/05/30
- 04/16: gnu: python-widgetsnbextension: Update to 3.5.1., guix-commits, 2020/05/30
- 09/16: gnu: Add liferea., guix-commits, 2020/05/30
- 06/16: gnu: python-jupyter-console: Update to 6.1.0., guix-commits, 2020/05/30
- 07/16: gnu: python-iml: Move nose from propagated to native input., guix-commits, 2020/05/30
- 08/16: gnu: python-prompt-toolkit: Update to 3.0.5.,
guix-commits <=
- 10/16: gnu: python-peewee: Update to 3.9.6., guix-commits, 2020/05/30
- 05/16: gnu: python-ipywidgets: Update to 7.5.1., guix-commits, 2020/05/30
- 11/16: gnu: python-orderedmultidict: Update to 1.0., guix-commits, 2020/05/30
- 12/16: gnu: python-furl: Update to 2.0.0., guix-commits, 2020/05/30
- 14/16: gnu: emacs-elpher: Update to 2.7.8., guix-commits, 2020/05/30
- 15/16: gnu: emacsy-minimal: Inputs now use guile version 2.2., guix-commits, 2020/05/30
- 16/16: gnu: Add font-sarasa-gothic., guix-commits, 2020/05/30
- 13/16: gnu: bemenu: Update to 0.4.1., guix-commits, 2020/05/30