unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Christopher Baines <mail@cbaines.net>
To: 28782@debbugs.gnu.org
Subject: [bug#28782] [PATCH] gnu: Add python-jupyter-console as input to python-ipython.
Date: Wed, 11 Oct 2017 10:06:24 +0100	[thread overview]
Message-ID: <20171011090624.11181-1-mail@cbaines.net> (raw)

This fixes running ipython console and ipython3 console.

As python-ipython is an input to python-jupyter-console, depend on a modified
version of the package which doesn't have this input.

* gnu/packages/python.scm (python-ipython)[propagated-inputs]: Add a modified
  version of python-jupyter-console.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8521ab352..6921a8944 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5851,6 +5851,31 @@ tools for mocking system commands and recording calls to those.")
        ("python-numpy" ,python-numpy)
        ("python-numpydoc" ,python-numpydoc)
        ("python-jinja2" ,python-jinja2)
+       ("python-jupyter-console"
+        ;; The python-ipython and python-jupyter-console require each
+        ;; other. To get the functionality in both packages working, strip
+        ;; down the python-jupyter-console package when using it as an input
+        ;; to python-ipython.
+        ,(package
+           (inherit python-jupyter-console)
+           (arguments
+            (substitute-keyword-arguments
+                (package-arguments python-jupyter-console)
+              ((#:phases phases)
+               `(modify-phases ,phases
+                  (add-after 'install 'delete-bin
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; Delete the bin files, to avoid conflicts in profiles
+                      ;; where python-ipython and python-jupyter-console are
+                      ;; both present.
+                      (delete-file-recursively
+                       (string-append
+                        (assoc-ref outputs "out") "/bin"))))))))
+           ;; Remove the python-ipython propagated input, to avoid the cycle
+           (propagated-inputs
+            (remove (lambda (input)
+                      (string=? (car input) name))
+                    (package-propagated-inputs python-jupyter-console)))))
        ("python-mistune" ,python-mistune)
        ("python-pexpect" ,python-pexpect)
        ("python-pickleshare" ,python-pickleshare)
-- 
2.14.2

             reply	other threads:[~2017-10-11  9:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-11  9:06 Christopher Baines [this message]
2017-10-11 19:56 ` [bug#28782] [PATCH] gnu: Add python-jupyter-console as input to python-ipython Ludovic Courtès
2017-10-12 19:27   ` bug#28782: " Christopher Baines

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=20171011090624.11181-1-mail@cbaines.net \
    --to=mail@cbaines.net \
    --cc=28782@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).