From: Marius Bakke <mbakke@fastmail.com>
To: Edouard Klein <edk@beaver-labs.com>, 41395@debbugs.gnu.org
Subject: [bug#41395] [PATCH 1/2] gnu: python-prompt-toolkit: Update to 3.0.5
Date: Sat, 23 May 2020 20:35:42 +0200 [thread overview]
Message-ID: <87wo527b41.fsf@devup.no> (raw)
In-Reply-To: <87sgfwcklx.fsf@alice.lan>
[-- Attachment #1: Type: text/plain, Size: 6072 bytes --]
Edouard Klein <edk@beaver-labs.com> writes:
> * /gnu/packages/python-xyz.scm (python-widgetsnbextension): Pin python-prompt-toolkit to version 2
> * /gnu/packages/python-xyz.scm (python-ipywidgets): Pin python-prompt-toolkit to version 2
> * /gnu/packages/python-xyz.scm (python-jupyter-console): Pin python-prompt-toolkit to version 2
> * /gnu/packages/python-xyz.scm (python-prompt-toolkit): Update to 3.0.5
> * /gnu/packages/python-xyz.scm (python-prompt-toolkit-2): New variable
> * /gnu/packages/python-xyz.scm (python-prompt-toolkit-2-instead-of-prompt-toolkit): New variable
> * /gnu/packages/machine-learning.scm (python-iml): Pin ipython to python-prompt-toolkit-2 variant
You only need to mention the file name once.
> @@ -1803,12 +1804,14 @@ 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)))
> - (home-page "http://github.com/interpretable-ml/iml")
> + (native-inputs
> + `(("nose" ,python-nose)))
> + (home-page "https://github.com/interpretable-ml/iml")
Can you submit the home page and inputs change of this package as two
separate patches?
> (synopsis "Interpretable Machine Learning (iML) package")
> (description "Interpretable ML (iML) is a set of data type objects,
> visualizations, and interfaces that can be used by any method designed to
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index b8a51570c3..5fd7e274e9 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -8922,6 +8922,7 @@ interactive computing.")
> (build-system python-build-system)
> (propagated-inputs
> `(("python-ipykernel" ,python-ipykernel)
> + ("python-prompt-toolkit" ,python-prompt-toolkit-2)
> ("python-notebook" ,python-notebook)))
> (native-inputs
> `(("python-certifi" ,python-certifi)
> @@ -8950,6 +8951,7 @@ notebooks.")
> (propagated-inputs
> `(("python-ipython" ,python-ipython)
> ("python-traitlets" ,python-traitlets)
> + ("python-prompt-toolkit" ,python-prompt-toolkit-2)
> ("python-widgetsnbextension" ,python-widgetsnbextension)))
> (native-inputs
> `(("python-nose" ,python-nose)
> @@ -8980,7 +8982,7 @@ in the data.")
> (propagated-inputs
> `(("python-ipykernel" ,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)))
> @@ -12049,6 +12051,44 @@ collections of data.")
> (package-with-python2 python-backpack))
It would be great to update these packages instead of pinning to the old
version. I won't blame you if you don't feel like embarking on that
journey though.
> (define-public python-prompt-toolkit
> + (package
> + (name "python-prompt-toolkit")
> + (version "3.0.5")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (pypi-uri "prompt_toolkit" version))
> + (sha256
> + (base32
> + "1j3x5s4gp4ih73sbcni0a0vffbzvrxbrbnkvb3fzjgxn810ilgan"))))
> + (build-system python-build-system)
> + (arguments
> + `(#:phases
> + (modify-phases %standard-phases
> + (delete 'check)
> + (add-after 'install 'post-install-check
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + ;; HOME is needed for the test
> + ;; "test_pathcompleter_can_expanduser".
> + (setenv "HOME" "/tmp")
> + (add-installed-pythonpath inputs outputs)
> + (invoke "py.test"))))))
> + (propagated-inputs
> + `(("python-wcwidth" ,python-wcwidth)))
> + (native-inputs
> + `(("python-pytest" ,python-pytest)))
> + (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
> +interfaces in Python. It's like GNU Readline but it also features syntax
> +highlighting while typing, out-of-the-box multi-line input editing, advanced
> +code completion, incremental search, support for Chinese double-width
> +characters, mouse support, and auto suggestions.")
> + (license license:bsd-3)))
Can you make python-prompt-toolkit-2 inherit from this package to avoid
duplicating the entire expression?
> +(define-public python-prompt-toolkit-2
> (package
> (name "python-prompt-toolkit")
> (version "2.0.7")
> @@ -12077,7 +12117,7 @@ collections of data.")
> ("python-pygments" ,python-pygments)))
> (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
> @@ -12104,6 +12144,10 @@ characters, mouse support, and auto suggestions.")
> (define-public python2-prompt-toolkit-1
> (package-with-python2 python-prompt-toolkit-1))
>
> +(define-public prompt-toolkit-2-instead-of-prompt-toolkit
> + (package-input-rewriting/spec
> + `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2)))))
Is this actually necessary? Just changing the inputs as you did above
should be sufficient I think.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2020-05-23 18:36 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 [this message]
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 ` [bug#41395] [PATCH] " Edouard Klein
2020-05-30 13:48 ` bug#41395: " 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=87wo527b41.fsf@devup.no \
--to=mbakke@fastmail.com \
--cc=41395@debbugs.gnu.org \
--cc=edk@beaver-labs.com \
/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).