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

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

    Date: Friday, March 15, 2013 @ 14:36:34
  Author: mitya57-guest
Revision: 23704

* New upstream release, with native Python 3 support.
* Build-depend on python-tidylib instead of python-utidylib,
  and drop python-markdown dependency on python-utidylib.
* debian/rules, debian/tests: use /usr/bin/nosetests for all Python
  versions, and make the tests output more verbose.

Modified:
  packages/python-markdown/trunk/debian/changelog
  packages/python-markdown/trunk/debian/control
  packages/python-markdown/trunk/debian/rules
  packages/python-markdown/trunk/debian/tests/python-markdown
  packages/python-markdown/trunk/debian/tests/python3-markdown
Deleted:
  packages/python-markdown/trunk/debian/patches/

Modified: packages/python-markdown/trunk/debian/changelog
===================================================================
--- packages/python-markdown/trunk/debian/changelog	2013-03-15 06:02:14 UTC (rev 23703)
+++ packages/python-markdown/trunk/debian/changelog	2013-03-15 14:36:34 UTC (rev 23704)
@@ -1,12 +1,15 @@
-python-markdown (2.2.1-4) UNRELEASED; urgency=low
+python-markdown (2.3.0-1) UNRELEASED; urgency=low
 
-  * debian/rules, debian/tests: do not use /usr/bin/nosetests-3.x, and
-    make the tests output more verbose.
+  * New upstream release, with native Python 3 support.
+  * Build-depend on python-tidylib instead of python-utidylib,
+    and drop python-markdown dependency on python-utidylib.
+  * debian/rules, debian/tests: use /usr/bin/nosetests for all Python
+    versions, and make the tests output more verbose.
   * Update debian/README.Debian.
   * Drop obsolete DM-Upload-Allowed flag.
   * Bump Standards-Version to 3.9.4, no changes needed.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 21 Feb 2013 21:12:51 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 15 Mar 2013 18:32:47 +0400
 
 python-markdown (2.2.1-3) unstable; urgency=low
 

Modified: packages/python-markdown/trunk/debian/control
===================================================================
--- packages/python-markdown/trunk/debian/control	2013-03-15 06:02:14 UTC (rev 23703)
+++ packages/python-markdown/trunk/debian/control	2013-03-15 14:36:34 UTC (rev 23704)
@@ -5,7 +5,7 @@
 Uploaders: Fredrik Steen <stone at debian.org>, Bernd Zeimetz <bzed at debian.org>,
  Dmitry Shachnev <mitya57 at gmail.com>
 Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~),
- python-nose, python-utidylib, python3-nose
+ python-nose, python-tidylib, python3-nose
 Standards-Version: 3.9.4
 Homepage: https://github.com/waylan/Python-Markdown
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-markdown/trunk/

Modified: packages/python-markdown/trunk/debian/rules
===================================================================
--- packages/python-markdown/trunk/debian/rules	2013-03-15 06:02:14 UTC (rev 23703)
+++ packages/python-markdown/trunk/debian/rules	2013-03-15 14:36:34 UTC (rev 23704)
@@ -25,15 +25,9 @@
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	set -ex; for python in $(PYTHON2); do \
-		$$python run-tests.py -v; \
+	set -ex; for python in $(PYTHON2) $(PYTHON3); do \
+		$$python /usr/bin/nosetests -v; \
 	done
-	cp -a tests build/lib/tests
-	2to3 -w --no-diffs build/lib/tests
-	set -ex; for python in $(shell py3versions -r); do
-		$$python /usr/bin/nosetests3 -v -w $(CURDIR)/build/lib/tests;
-	done
-	rm -r build/lib/test*
 	dh_auto_test
 endif
 

Modified: packages/python-markdown/trunk/debian/tests/python-markdown
===================================================================
--- packages/python-markdown/trunk/debian/tests/python-markdown	2013-03-15 06:02:14 UTC (rev 23703)
+++ packages/python-markdown/trunk/debian/tests/python-markdown	2013-03-15 14:36:34 UTC (rev 23704)
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 set -eu
-cp -r tests run-tests.py "$ADTTMP/"
+cp -r tests "$ADTTMP/"
 cd "$ADTTMP"
+
 for python in $(pyversions -i); do
-	PYTHONWARNINGS=d $python run-tests.py -v 2>&1
+	PYTHONWARNINGS=d $python /usr/bin/nosetests -v 2>&1
 done

Modified: packages/python-markdown/trunk/debian/tests/python3-markdown
===================================================================
--- packages/python-markdown/trunk/debian/tests/python3-markdown	2013-03-15 06:02:14 UTC (rev 23703)
+++ packages/python-markdown/trunk/debian/tests/python3-markdown	2013-03-15 14:36:34 UTC (rev 23704)
@@ -2,9 +2,8 @@
 
 set -eu
 cp -r tests "$ADTTMP/"
-2to3 -w --no-diffs "$ADTTMP/tests/" 2>&1
 cd "$ADTTMP"
 
 for python in $(py3versions -i); do
-	PYTHONWARNINGS=d $python /usr/bin/nosetests3 -v -w tests 2>&1
+	PYTHONWARNINGS=d $python /usr/bin/nosetests3 -v 2>&1
 done