Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-03-14 01:42:02 +01:00
commit bb4674b43f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
71 changed files with 1579 additions and 524 deletions

View file

@ -5757,9 +5757,9 @@ computing.")
(add-before 'check 'delete-broken-tests
(lambda* (#:key inputs #:allow-other-keys)
;; These tests throw errors for unknown reasons.
(delete-file "IPython/core/tests/test_displayhook.py")
(delete-file "IPython/core/tests/test_magic_terminal.py")
(delete-file "IPython/core/tests/test_profile.py")
(delete-file "IPython/core/tests/test_interactiveshell.py")
(delete-file "IPython/core/tests/test_magic.py")
#t)))))
(home-page "https://ipython.org")
(synopsis "IPython is a tool for interactive computing in Python")
@ -8186,6 +8186,7 @@ in the data.")
(description "This package provides a terminal-based console frontend for
Jupyter kernels. It also allows for console-based interaction with non-Python
Jupyter kernels such as IJulia and IRKernel.")
(properties `((python2-variant . ,(delay python2-jupyter-console))))
(license license:bsd-3)))
(define-public python2-jupyter-console
@ -8200,8 +8201,9 @@ Jupyter kernels such as IJulia and IRKernel.")
(base32
"1kam1qzgwr7srhm5r6aj90di5sws4bq0jmiw15452ddamb9yspal"))))
(build-system python-build-system)
;; Tests only run in an TTY.
(arguments `(#:tests? #f))
(arguments
`(#:python ,python-2
#:tests? #f)) ; Tests only run in a TTY.
(propagated-inputs
`(("python2-ipykernel" ,python2-ipykernel)
("python2-jupyter-client" ,python2-jupyter-client)