[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
118/166: gnu: Add python-nbdime.
From: |
guix-commits |
Subject: |
118/166: gnu: Add python-nbdime. |
Date: |
Tue, 19 Apr 2022 09:18:06 -0400 (EDT) |
apteryx pushed a commit to branch wip-ipython+polyglossia
in repository guix.
commit 2b24a123b1d8cc896b6ca4206173a4b978e5cfc8
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 88777bdf81..67c236abf1 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)
@@ -46,7 +48,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
@@ -397,6 +399,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")
- 96/166: gnu: Add python-pydevd., (continued)
- 96/166: gnu: Add python-pydevd., guix-commits, 2022/04/19
- 99/166: gnu: Add python-pytest-forked-next., guix-commits, 2022/04/19
- 100/166: gnu: python-pytest-xdist-next: Update to 2.5.0., guix-commits, 2022/04/19
- 103/166: gnu: python-jupyter-core: Update to 4.10.0., guix-commits, 2022/04/19
- 104/166: gnu: python-jupyter-client: Update to 7.2.2., guix-commits, 2022/04/19
- 107/166: gnu: python-ipyparallel: Update to 8.2.1., guix-commits, 2022/04/19
- 109/166: gnu: python-nbclient: Update to 0.6.0., guix-commits, 2022/04/19
- 112/166: gnu: Add texlive-lm-math., guix-commits, 2022/04/19
- 114/166: gnu: Add python-jupyter-server-mathjax., guix-commits, 2022/04/19
- 116/166: gnu: python-send2trash: Update to 1.8.0 and update home page., guix-commits, 2022/04/19
- 118/166: gnu: Add python-nbdime.,
guix-commits <=
- 117/166: gnu: python-notebook: Update to 6.4.10., guix-commits, 2022/04/19
- 121/166: gnu: Add python-pep621., guix-commits, 2022/04/19
- 122/166: gnu: Add python-sphinx-theme-builder., guix-commits, 2022/04/19
- 123/166: gnu: Add python-sphinx-sitemap., guix-commits, 2022/04/19
- 124/166: gnu: texlive-fontspec: Add missing propagated inputs., guix-commits, 2022/04/19
- 125/166: gnu: texlive-polyglossia: Rename and fix package., guix-commits, 2022/04/19
- 126/166: gnu: python-ipython-documentation: Also build info and pdf targets., guix-commits, 2022/04/19
- 129/166: gnu: Add python-rfc3339-validator., guix-commits, 2022/04/19
- 134/166: gnu: Add python-httpcore-bootstrap., guix-commits, 2022/04/19
- 133/166: gnu: python-httpcore: Update to 0.14.7 and enable tests., guix-commits, 2022/04/19