[Python-modules-commits] r29236 - in packages/python-markdown/trunk/debian (5 files)

[wrar-guest at users.alioth.debian.org]

    Date: Friday, June 6, 2014 @ 10:43:09
  Author: wrar-guest
Revision: 29236

Convert to pybuild

Added:
  packages/python-markdown/trunk/debian/patches/doctest-fix.patch
Modified:
  packages/python-markdown/trunk/debian/changelog
  packages/python-markdown/trunk/debian/rules
Deleted:
  packages/python-markdown/trunk/debian/python-markdown.install
  packages/python-markdown/trunk/debian/python3-markdown.install

Modified: packages/python-markdown/trunk/debian/changelog
===================================================================
--- packages/python-markdown/trunk/debian/changelog	2014-06-06 08:50:34 UTC (rev 29235)
+++ packages/python-markdown/trunk/debian/changelog	2014-06-06 10:43:09 UTC (rev 29236)
@@ -1,3 +1,10 @@
+python-markdown (2.4.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Convert to pybuild.
+
+ -- Andrey Rahmatullin <wrar at wrar.name>  Fri, 30 May 2014 23:36:50 +0600
+
 python-markdown (2.4.1-1) unstable; urgency=medium
 
   * New upstream bugfix release.

Added: packages/python-markdown/trunk/debian/patches/doctest-fix.patch
===================================================================
--- packages/python-markdown/trunk/debian/patches/doctest-fix.patch	                        (rev 0)
+++ packages/python-markdown/trunk/debian/patches/doctest-fix.patch	2014-06-06 10:43:09 UTC (rev 29236)
@@ -0,0 +1,22 @@
+Author: Andrey Rahmatullin <wrar at wrar.name>
+Description: Fix a doctest in fenced_code.py
+Bug: https://github.com/waylan/Python-Markdown/pull/314/
+Last-Update: 2014-05-31
+
+--- a/markdown/extensions/fenced_code.py
++++ b/markdown/extensions/fenced_code.py
+@@ -68,10 +68,10 @@
+     ... line 3
+     ... ```'''
+     >>> print markdown.markdown(text, extensions=['codehilite', 'fenced_code'])
+-    <pre><code><span class="hilight">line 1</span>
+-    line 2
+-    <span class="hilight">line 3</span>
+-    </code></pre>
++    <div class="codehilite"><pre><span class="hll"><span class="n">line</span> <span class="mi">1</span>
++    </span><span class="n">line</span> <span class="mi">2</span>
++    <span class="hll"><span class="n">line</span> <span class="mi">3</span>
++    </span></pre></div>
+ 
+ Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
+ 

Deleted: packages/python-markdown/trunk/debian/python-markdown.install
===================================================================
--- packages/python-markdown/trunk/debian/python-markdown.install	2014-06-06 08:50:34 UTC (rev 29235)
+++ packages/python-markdown/trunk/debian/python-markdown.install	2014-06-06 10:43:09 UTC (rev 29236)
@@ -1,2 +0,0 @@
-usr/lib/python2.*/
-usr/bin/

Deleted: packages/python-markdown/trunk/debian/python3-markdown.install
===================================================================
--- packages/python-markdown/trunk/debian/python3-markdown.install	2014-06-06 08:50:34 UTC (rev 29235)
+++ packages/python-markdown/trunk/debian/python3-markdown.install	2014-06-06 10:43:09 UTC (rev 29236)
@@ -1 +0,0 @@
-usr/lib/python3/

Modified: packages/python-markdown/trunk/debian/rules
===================================================================
--- packages/python-markdown/trunk/debian/rules	2014-06-06 08:50:34 UTC (rev 29235)
+++ packages/python-markdown/trunk/debian/rules	2014-06-06 10:43:09 UTC (rev 29236)
@@ -1,38 +1,23 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-PYTHON2=$(shell pyversions -r)
-PYTHON3=$(shell py3versions -r)
+export PYBUILD_NAME=markdown
+# isn't required with current override_dh_auto_test
+#export PYBUILD_TEST_NOSE=1
 
 %:
-	dh $@ --with python2,python3 --buildsystem=python_distutils
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build/
-
 override_dh_auto_install:
-	set -ex; for python in $(PYTHON3); do \
-		$$python setup.py install --install-layout=deb --root=debian/tmp; \
-	done
 	dh_auto_install
+	rm debian/python3-markdown/usr/bin/markdown_py
 
-override_dh_auto_build:
-	set -ex; for python in $(PYTHON3); do \
-		$$python setup.py build; \
-	done
-	dh_auto_build
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	set -ex; for python in $(PYTHON2) $(PYTHON3); do \
-		$$python /usr/bin/nosetests -v; \
-	done
-	dh_auto_test
-endif
+	# disabling doctests, see #749506
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="{interpreter} -m nose {dir}/tests" dh_auto_test
 
 override_dh_compress:
 	dh_compress -X.txt
 
-.PHONY: override_dh_auto_clean override_dh_auto_install override_dh_auto_test \
-override_dh_compress
+.PHONY: override_dh_auto_test override_dh_compress