[Python-modules-commits] r29387 - in packages/breathe/trunk/debian (10 files)

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Jun 18 17:53:30 UTC 2014 

    Date: Wednesday, June 18, 2014 @ 17:53:29
  Author: sramacher
Revision: 29387

* Add DEP8 tests
* Fix MathJax symlinks

Added:
  packages/breathe/trunk/debian/breathe-doc.links
  packages/breathe/trunk/debian/tests/
  packages/breathe/trunk/debian/tests/control
  packages/breathe/trunk/debian/tests/python2
  packages/breathe/trunk/debian/tests/python3
Modified:
  packages/breathe/trunk/debian/changelog
  packages/breathe/trunk/debian/control
  packages/breathe/trunk/debian/patches/conf.py-version.patch
  packages/breathe/trunk/debian/patches/packaged-mathjax.patch
  packages/breathe/trunk/debian/rules

Added: packages/breathe/trunk/debian/breathe-doc.links
===================================================================
--- packages/breathe/trunk/debian/breathe-doc.links	                        (rev 0)
+++ packages/breathe/trunk/debian/breathe-doc.links	2014-06-18 17:53:29 UTC (rev 29387)
@@ -0,0 +1 @@
+usr/share/javascript/mathjax/ usr/share/doc/breathe-doc/html/_static/mathjax

Modified: packages/breathe/trunk/debian/changelog
===================================================================
--- packages/breathe/trunk/debian/changelog	2014-06-18 17:01:56 UTC (rev 29386)
+++ packages/breathe/trunk/debian/changelog	2014-06-18 17:53:29 UTC (rev 29387)
@@ -4,11 +4,16 @@
   * debian/control:
     - Add Suggests: breathe-doc to python{,3}-breathe. (Closes: #743781)
     - Point Homepage to upstream repository.
-  * debian/rules: Call pybuild with --test instead of --build to run tests.
+  * debian/rules: Call pybuild with --test instead of --build to run tests and
+    run the test for the correct Python version.
   * debian/patches:
     - undefined-names.patch: Removed, applied upstream.
     - conf.py-version.patch: Hardcode version for documentation instead of
       running git describe.
+  * Fix MathJax symlinks:
+    - debian/{rules,breathe-doc.links}: Link _static/mathjax to the packaged
+      MathJax directory and create the appropriate symlinks in the package.
+    - packaged-mathjax.patch: Refreshed and adopted for the new symlink.
 
  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 18 Jun 2014 17:23:01 +0200
 

Modified: packages/breathe/trunk/debian/control
===================================================================
--- packages/breathe/trunk/debian/control	2014-06-18 17:01:56 UTC (rev 29386)
+++ packages/breathe/trunk/debian/control	2014-06-18 17:53:29 UTC (rev 29387)
@@ -19,6 +19,7 @@
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/breathe/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/breathe/trunk/
 Homepage: http://github.com/michaeljones/breathe/
+XS-Testsuite: autopkgtest
 
 Package: python-breathe
 Architecture: all

Modified: packages/breathe/trunk/debian/patches/conf.py-version.patch
===================================================================
--- packages/breathe/trunk/debian/patches/conf.py-version.patch	2014-06-18 17:01:56 UTC (rev 29386)
+++ packages/breathe/trunk/debian/patches/conf.py-version.patch	2014-06-18 17:53:29 UTC (rev 29387)
@@ -1,12 +1,18 @@
 Description: Hardcode version instead of running git describe --tags
+ Also build the readthedocs version that does not include warnings about
+ unreleased API.
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-06-18
 
 --- a/documentation/source/conf.py
 +++ b/documentation/source/conf.py
-@@ -34,7 +34,7 @@ extensions = [ 'breathe', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig' ]
- read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
+@@ -31,10 +31,10 @@ import re
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = [ 'breathe', 'sphinx.ext.mathjax', 'sphinx.ext.ifconfig' ]
  
+-read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
++read_the_docs_build = True
+ 
  # Get a description of the current position
 -git_tag = subprocess.check_output('git describe --tags', shell=True)
 +git_tag = "v2.0.0"

Modified: packages/breathe/trunk/debian/patches/packaged-mathjax.patch
===================================================================
--- packages/breathe/trunk/debian/patches/packaged-mathjax.patch	2014-06-18 17:01:56 UTC (rev 29386)
+++ packages/breathe/trunk/debian/patches/packaged-mathjax.patch	2014-06-18 17:53:29 UTC (rev 29387)
@@ -1,7 +1,7 @@
 Description: Use packaged copy of MathJax
 Author: Sebastian Ramacher <sramacher at debian.org>
 Forwarded: not-needed
-Last-Update: 2014-02-02
+Last-Update: 2014-06-18
 
 --- a/documentation/source/conf.py
 +++ b/documentation/source/conf.py
@@ -11,7 +11,7 @@
  # mathjax file which we can load from http or https. We break the url over two lines.
 -mathjax_path = 'https://c328740.ssl.cf1.rackcdn.com/' \
 -               'mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
-+mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++mathjax_path = 'mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
  
  
  # Add any paths that contain templates here, relative to this directory.

Modified: packages/breathe/trunk/debian/rules
===================================================================
--- packages/breathe/trunk/debian/rules	2014-06-18 17:01:56 UTC (rev 29386)
+++ packages/breathe/trunk/debian/rules	2014-06-18 17:53:29 UTC (rev 29387)
@@ -14,6 +14,9 @@
 
 override_dh_auto_build:
 	dh_auto_build
+	# Link mathjax in _static
+	ln -s /usr/share/javascript/mathjax \
+		documentation/source/_static/mathjax
 	pybuild --system=custom -p $(PY3DEF) --build \
 		--build-args="env PYTHONPATH={build_dir} $(MAKE) SPHINXBUILD=$(SPHINXBUILD)"
 	mv documentation/build/html html
@@ -27,5 +30,11 @@
 		--test-args="env PYTHONPATH={build_dir} $(MAKE) SPHINXBUILD=$(SPHINXBUILD)"
 endif
 
+override_dh_installdocs:
+	# Do not copy mathjax to the binary package
+	dh_installdocs -X_static/mathjax
+
 override_dh_sphinxdoc:
-	dh_sphinxdoc -X/usr/share/javascript/mathjax/MathJax.js
+	# dh_link creates the link for mathjax after dh_sphinxdoc, so ignore
+	# MathJax.js
+	dh_sphinxdoc -XMathJax.js

Added: packages/breathe/trunk/debian/tests/control
===================================================================
--- packages/breathe/trunk/debian/tests/control	                        (rev 0)
+++ packages/breathe/trunk/debian/tests/control	2014-06-18 17:53:29 UTC (rev 29387)
@@ -0,0 +1,5 @@
+Tests: python2
+Depends: python-breathe, python-sphinx
+
+Tests: python3
+Depends: python3-breathe, python3-sphinx

Added: packages/breathe/trunk/debian/tests/python2
===================================================================
--- packages/breathe/trunk/debian/tests/python2	                        (rev 0)
+++ packages/breathe/trunk/debian/tests/python2	2014-06-18 17:53:29 UTC (rev 29387)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+export SPHINXBUILD=/usr/share/sphinx/scripts/python2/sphinx-build
+
+cp -r documentation examples "$ADTTMP"
+cd "$ADTTMP"
+make -C documentation html


Property changes on: packages/breathe/trunk/debian/tests/python2
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/breathe/trunk/debian/tests/python3
===================================================================
--- packages/breathe/trunk/debian/tests/python3	                        (rev 0)
+++ packages/breathe/trunk/debian/tests/python3	2014-06-18 17:53:29 UTC (rev 29387)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+export SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
+
+cp -r documentation examples "$ADTTMP"
+cd "$ADTTMP"
+make -C documentation html


Property changes on: packages/breathe/trunk/debian/tests/python3
___________________________________________________________________
Added: svn:executable
   + *

More information about the Python-modules-commits mailing list