[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
118/242: gnu: Add python-nbdime.
From: |
guix-commits |
Subject: |
118/242: gnu: Add python-nbdime. |
Date: |
Thu, 12 May 2022 14:14:16 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit b6021d38ab215a9de25df3d4131e5cc681e22895
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Apr 13 22:34:05 2022 -0400
gnu: Add python-nbdime.
* gnu/packages/jupyter.scm (python-nbdime): New variable.
---
gnu/packages/jupyter.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 56 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 18efc9bb8b..9bda6e23bd 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,6 +31,7 @@
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages cpp)
+ #:use-module (gnu packages docker)
#:use-module (gnu packages linux)
#:use-module (gnu packages monitoring)
#:use-module (gnu packages networking)
@@ -47,7 +49,7 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages serialization)
- #:use-module (gnu packages docker))
+ #:use-module (gnu packages version-control))
(define-public python-jupyter-protocol
(package
@@ -398,6 +400,59 @@ Mathjax, the JavaScript display engine for mathematics.")
It was formerly known as nbconvert's @code{ExecutePreprocessor.}")
(license license:bsd-3)))
+(define-public python-nbdime
+ (package
+ (name "python-nbdime")
+ (version "3.1.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "nbdime" version))
+ (sha256
+ (base32 "12v41lricbg713lzlfcx0cilfm9spndaanhp39q4ydvix4h76xk7"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-ipython-genutils
+ ;; TODO: Remove when a release newer than 3.1.1 is made.
+ (lambda _
+ (substitute* "nbdime/config.py"
+ (("from ipython_genutils import py3compat")
+ "")
+ (("py3compat\\.getcwd")
+ "os.getcwd")))))))
+ (propagated-inputs
+ (list python-colorama
+ python-gitpython
+ python-jinja2
+ python-jupyter-server
+ python-jupyter-server-mathjax
+ python-nbformat
+ python-pygments
+ python-requests
+ python-tornado-6))
+ (native-inputs
+ (list python-jupyter-server
+ python-mock
+ python-notebook
+ python-pytest
+ python-pytest-tornado
+ python-tabulate))
+ (home-page "https://nbdime.readthedocs.io")
+ (synopsis "Diff tools for Jupyter Notebooks")
+ (description "@code{nbdime} provides tools for diffing and merging of
+Jupyter Notebooks. It includes the following commands:
+@table @command
+@item nbdiff compare notebooks in a terminal-friendly way
+@item nbmerge three-way merge of notebooks with automatic conflict resolution
+@item nbdiff-web rich rendered diff of notebooks
+@item nbmerge-web web-based three-way merge tool for notebooks
+nbshow present a single notebook in a terminal-friendly way
+@end table")
+ (license license:bsd-3)))
+
(define-public repo2docker
(package
(name "repo2docker")
- 32/242: gnu: Add python-fontparts., (continued)
- 32/242: gnu: Add python-fontparts., guix-commits, 2022/05/12
- 47/242: gnu: python-importlib-metadata: Update to 4.11.3., guix-commits, 2022/05/12
- 12/242: gnu: Add texlive-paralist., guix-commits, 2022/05/12
- 31/242: gnu: Add python-defcon., guix-commits, 2022/05/12
- 25/242: gnu: python-fonttools-with-test: Rename to python-fonttools-full., guix-commits, 2022/05/12
- 44/242: gnu: Add python-pytest-enabler-bootstrap., guix-commits, 2022/05/12
- 42/242: gnu: Add python-types-pytz., guix-commits, 2022/05/12
- 85/242: gnu: Add python-sfdlib., guix-commits, 2022/05/12
- 109/242: gnu: python-nbclient: Update to 0.6.0., guix-commits, 2022/05/12
- 114/242: gnu: Add python-jupyter-server-mathjax., guix-commits, 2022/05/12
- 118/242: gnu: Add python-nbdime.,
guix-commits <=
- 131/242: gnu: Add texlive-xindy., guix-commits, 2022/05/12
- 129/242: gnu: texlive-latex-geometry: Propagate texlive-latex-graphics., guix-commits, 2022/05/12
- 178/242: gnu: python-amqp: Update to 5.1.1 and enable tests., guix-commits, 2022/05/12
- 193/242: gnu: python-locust: Update to 2.8.6., guix-commits, 2022/05/12
- 215/242: gnu: python-pydata-sphinx-theme: Update to 0.7.2., guix-commits, 2022/05/12
- 212/242: gnu: dynaconf: Fix build following python-click upgrade., guix-commits, 2022/05/12
- 219/242: gnu: python-sphinxcontrib-programoutput: Update to 0.17 and enable tests., guix-commits, 2022/05/12
- 241/242: gnu: Add python-sanic-testing., guix-commits, 2022/05/12
- 204/242: gnu: emacsy: Use webkitgtk-with-libsoup2., guix-commits, 2022/05/12
- 238/242: gnu: python-multidict: Update to 5.2.0., guix-commits, 2022/05/12