[Python-modules-commits] [dask] 02/11: Simplify integration with the packaged MathJax

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository dask.

commit 135e65c1ddd377a1e3315febc1ed76664885ddce
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed May 31 11:59:10 2017 +0100

    Simplify integration with the packaged MathJax
    
    - New patch Use-the-packaged-MathJax.patch, replaces the old
      use-mathjax-package.patch patch with a different approach
    - Drop MathJax from Build-Depends, no longer required
    - Add MathJax to Depends manually
    - Drop symlinkage of MathJax at build time, no longer required
    
    Gbp-Dch: Full
---
 debian/control                                |  3 +--
 debian/patches/Use-the-packaged-MathJax.patch | 21 +++++++++++++++++++++
 debian/patches/series                         |  2 +-
 debian/patches/use-mathjax-package.patch      | 14 --------------
 debian/rules                                  |  9 ++++-----
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index ad24607..c390b89 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
-               libjs-mathjax,
                python3-all,
                python3-cloudpickle (>= 0.2.1),
                python3-numpy,
@@ -50,7 +49,7 @@ Description: Minimal task scheduling abstraction for Python 3
 Package: python-dask-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, libjs-mathjax
 Description: Minimal task scheduling abstraction documentation
  Dask is a flexible parallel computing library for analytics,
  containing two components.
diff --git a/debian/patches/Use-the-packaged-MathJax.patch b/debian/patches/Use-the-packaged-MathJax.patch
new file mode 100644
index 0000000..122c2e9
--- /dev/null
+++ b/debian/patches/Use-the-packaged-MathJax.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 31 May 2017 12:01:36 +0100
+Subject: Use the packaged MathJax
+
+---
+ docs/source/conf.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 4c8576a..c79869b 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -30,6 +30,8 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax',
+ 
+ numpydoc_show_class_members = False
+ 
++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1d51d1d..3761a4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-use-mathjax-package.patch
+Use-the-packaged-MathJax.patch
diff --git a/debian/patches/use-mathjax-package.patch b/debian/patches/use-mathjax-package.patch
deleted file mode 100644
index c848a0e..0000000
--- a/debian/patches/use-mathjax-package.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description: Use locally installed MathJax
-
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -28,6 +28,8 @@
- extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax',
-               'sphinx.ext.autosummary', 'sphinx.ext.extlinks', 'numpydoc']
- 
-+mathjax_path = 'mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
-+
- numpydoc_show_class_members = False
- 
- # Add any paths that contain templates here, relative to this directory.
diff --git a/debian/rules b/debian/rules
index fab1684..fe4ba9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,16 @@ export PYBUILD_NAME=dask
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_clean:
+	dh_auto_clean
+	$(RM) -rf build/html
+
 override_dh_auto_build: export http_proxy=127.0.0.1:9
 override_dh_auto_build: export https_proxy=127.0.0.1:9
 override_dh_auto_build:
 	dh_auto_build
-	ln -s /usr/share/javascript/mathjax docs/source/_static
 	PYTHONPATH=. sphinx-build -N -bhtml docs/source build/html # HTML generator
 
-override_dh_auto_clean:
-	dh_auto_clean
-	-rm docs/source/_static/mathjax
-
 # Test needs: skimage, scipy, s3fs, cachey, distributed, graphviz
 # dask is a build-dep for distributed... so we can't run tests at build
 .PHONY: override_dh_auto_test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/dask.git