alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build: use 'jupyter nbconvert' instead of 'ipython nbconvert'

Browse source 
The latter is deprecatd.

* configure.ac: Check for jupyter.
* tests/Makefile.am: Adjust.
* HACKING: Mention we need jupyter.
This commit is contained in:
Alexandre Duret-Lutz 2021-09-04 22:08:20 +02:00
parent 4d2ced1b07
commit d5b641a7dc
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
HACKING
View file

@ -43,6 +43,7 @@ since the generated files they produce are distributed.)
like dsfont.sty. like dsfont.sty.
ImageMagick ImageMagick
Python >= 3.3, IPython >= 2.3 Python >= 3.3, IPython >= 2.3
Jupyter >= 4, with nbconvert
GraphViz GraphViz
Java >= 1.7 (needed to run PlantUML while generating the doc) Java >= 1.7 (needed to run PlantUML while generating the doc)
wget or curl (needed to download PlantUML) wget or curl (needed to download PlantUML)

1
configure.ac
View file

@ -197,6 +197,7 @@ AC_CHECK_PROG([SPIN], [spin], [spin])
AC_CHECK_PROG([LBTT], [lbtt], [lbtt]) AC_CHECK_PROG([LBTT], [lbtt], [lbtt])
AC_CHECK_PROG([EMACS], [emacs], [emacs]) AC_CHECK_PROG([EMACS], [emacs], [emacs])
AC_CHECK_PROGS([IPYTHON], [ipython3 ipython], [ipython]) AC_CHECK_PROGS([IPYTHON], [ipython3 ipython], [ipython])
AC_CHECK_PROGS([JUPYTER], [jupyter], [jupyter])
AC_CHECK_PROG([LBTT_TRANSLATE], [lbtt-translate], [lbtt-translate]) AC_CHECK_PROG([LBTT_TRANSLATE], [lbtt-translate], [lbtt-translate])
AX_CHECK_VALGRIND AX_CHECK_VALGRIND
# Debian used to reserve the name 'swig' for swig-2.0. So prefer # Debian used to reserve the name 'swig' for swig-2.0. So prefer

2
tests/Makefile.am
View file

@ -457,7 +457,7 @@ CLEANFILES = python/test1.dve python/test1.dve2C python/test1.dve.cpp
SUFFIXES = .ipynb .html SUFFIXES = .ipynb .html
.ipynb.html: .ipynb.html:
$(IPYTHON) nbconvert $< --to html --stdout >$@ $(JUPYTER) nbconvert $< --to html --stdout >$@
.PHONY: nb-html .PHONY: nb-html
nb-html: $(TESTS_ipython:.ipynb=.html) nb-html: $(TESTS_ipython:.ipynb=.html)