[Python-modules-commits] r23294 - in packages/pycparser/trunk/debian (10 files)

stefanor at users.alioth.debian.org stefanor at users.alioth.debian.org
Sat Jan 12 17:27:29 UTC 2013 

    Date: Saturday, January 12, 2013 @ 17:27:27
  Author: stefanor
Revision: 23294

* New upstream release.
* Drop patch abort-on-test-failure, superseded upstream.
* Upstream now bundles ply. Strip it.
* Updated homepage (moved to bitbucket).
* Bumped Standards-Version to 3.9.4.
  - Bumped debhelper B-D to 8.1, for build-{arch,indep} support.
* Export PYTHONPATH in debian/rules to avoid running tests against an
  installed pycparser.
* Add an autopkgtest to run the unit tests.

Added:
  packages/pycparser/trunk/debian/patches/system-ply
  packages/pycparser/trunk/debian/tests/
  packages/pycparser/trunk/debian/tests/control
  packages/pycparser/trunk/debian/tests/unittests
Modified:
  packages/pycparser/trunk/debian/changelog
  packages/pycparser/trunk/debian/control
  packages/pycparser/trunk/debian/copyright
  packages/pycparser/trunk/debian/patches/series
  packages/pycparser/trunk/debian/rules
Deleted:
  packages/pycparser/trunk/debian/patches/abort-on-test-failure

Modified: packages/pycparser/trunk/debian/changelog
===================================================================
--- packages/pycparser/trunk/debian/changelog	2013-01-12 15:43:42 UTC (rev 23293)
+++ packages/pycparser/trunk/debian/changelog	2013-01-12 17:27:27 UTC (rev 23294)
@@ -1,3 +1,17 @@
+pycparser (2.09.1+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Drop patch abort-on-test-failure, superseded upstream.
+  * Upstream now bundles ply. Strip it.
+  * Updated homepage (moved to bitbucket).
+  * Bumped Standards-Version to 3.9.4.
+    - Bumped debhelper B-D to 8.1, for build-{arch,indep} support.
+  * Export PYTHONPATH in debian/rules to avoid running tests against an
+    installed pycparser.
+  * Add an autopkgtest to run the unit tests.
+
+ -- Stefano Rivera <stefanor at debian.org>  Sun, 24 Jun 2012 19:22:21 +0200
+
 pycparser (2.07+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #581847)

Modified: packages/pycparser/trunk/debian/control
===================================================================
--- packages/pycparser/trunk/debian/control	2013-01-12 15:43:42 UTC (rev 23293)
+++ packages/pycparser/trunk/debian/control	2013-01-12 17:27:27 UTC (rev 23294)
@@ -4,15 +4,16 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefanor at debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1),
  python-all (>= 2.6.6-3~),
  python-ply,
  python3-all (>= 3.1.2-6~),
  python3-ply
-Standards-Version: 3.9.3
-Homepage: https://code.google.com/p/pycparser/
+Standards-Version: 3.9.4
+Homepage: https://bitbucket.org/eliben/pycparser
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
+XS-Testsuite: autopkgtest
 
 Package: python-pycparser
 Architecture: all

Modified: packages/pycparser/trunk/debian/copyright
===================================================================
--- packages/pycparser/trunk/debian/copyright	2013-01-12 15:43:42 UTC (rev 23293)
+++ packages/pycparser/trunk/debian/copyright	2013-01-12 17:27:27 UTC (rev 23294)
@@ -4,13 +4,14 @@
 Source: http://pypi.python.org/pypi/pycparser
  lcc.exe was removed from the source package, as the license isn't DFSG-free
  and it isn't needed on Debian.
+ The bundled ply was also dropped.
 
 Files: *
-Copyright: 2008-2012, Eli Bendersky <eliben at gmail.com>
+Copyright: 2008-2013, Eli Bendersky <eliben at gmail.com>
 License: bsd-3-bendersky
 
 Files: debian/*
-Copyright: 2012, Stefano Rivera <stefanor at debian.org>
+Copyright: 2012-2013, Stefano Rivera <stefanor at debian.org>
 License: bsd-3-bendersky
 
 License: bsd-3-bendersky

Deleted: packages/pycparser/trunk/debian/patches/abort-on-test-failure
===================================================================
--- packages/pycparser/trunk/debian/patches/abort-on-test-failure	2013-01-12 15:43:42 UTC (rev 23293)
+++ packages/pycparser/trunk/debian/patches/abort-on-test-failure	2013-01-12 17:27:27 UTC (rev 23294)
@@ -1,16 +0,0 @@
-Description: Return a non-zero exit code if tests fail
-Author: Stefano Rivera <stefanor at debian.org>
-Forwarded: https://code.google.com/p/pycparser/issues/detail?id=69
-
---- a/tests/all_tests.py
-+++ b/tests/all_tests.py
-@@ -14,5 +14,7 @@
-         'test_c_parser',
-     ]
- )
--    
--unittest.TextTestRunner(verbosity=1).run(suite)
-+
-+r = unittest.TextTestRunner(verbosity=1).run(suite)
-+if r.failures:
-+    sys.exit(1)

Modified: packages/pycparser/trunk/debian/patches/series
===================================================================
--- packages/pycparser/trunk/debian/patches/series	2013-01-12 15:43:42 UTC (rev 23293)
+++ packages/pycparser/trunk/debian/patches/series	2013-01-12 17:27:27 UTC (rev 23294)
@@ -1 +1 @@
-abort-on-test-failure
+system-ply

Added: packages/pycparser/trunk/debian/patches/system-ply
===================================================================
--- packages/pycparser/trunk/debian/patches/system-ply	                        (rev 0)
+++ packages/pycparser/trunk/debian/patches/system-ply	2013-01-12 17:27:27 UTC (rev 23294)
@@ -0,0 +1,41 @@
+Description: Use Debian's ply instead of the bundled ply
+ We prefer to avoid bundled libraries in Debian, don't use the bundled ply.
+Author: Stefano Rivera <stefanor at debian.org>
+Last-Update: 2013-01-12
+Forwarded: not-needed
+
+--- a/pycparser/c_lexer.py
++++ b/pycparser/c_lexer.py
+@@ -9,8 +9,8 @@
+ import re
+ import sys
+ 
+-from .ply import lex
+-from .ply.lex import TOKEN
++from ply import lex
++from ply.lex import TOKEN
+ 
+ 
+ class CLexer(object):
+--- a/pycparser/c_parser.py
++++ b/pycparser/c_parser.py
+@@ -8,7 +8,7 @@
+ #------------------------------------------------------------------------------
+ import re
+ 
+-from .ply import yacc
++from ply import yacc
+ 
+ from . import c_ast
+ from .c_lexer import CLexer
+--- a/setup.py
++++ b/setup.py
+@@ -22,7 +22,7 @@
+     classifiers = [
+         'Programming Language :: Python :: 2',
+         'Programming Language :: Python :: 3',],    
+-    packages=['pycparser', 'pycparser.ply'],
++    packages=['pycparser'],
+     package_data={'pycparser': ['*.cfg']},
+ )
+ 

Modified: packages/pycparser/trunk/debian/rules
===================================================================
--- packages/pycparser/trunk/debian/rules	2013-01-12 15:43:42 UTC (rev 23293)
+++ packages/pycparser/trunk/debian/rules	2013-01-12 17:27:27 UTC (rev 23294)
@@ -3,6 +3,9 @@
 PYVERS = $(shell pyversions -r)
 PY3VERS = $(shell py3versions -r)
 
+# Don't accidentally run tests against the existing pycparser
+export PYTHONPATH=$(CURDIR)
+
 %:
 	dh $@ --with python2,python3
 
@@ -37,7 +40,7 @@
 	set -e -x; \
 	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
 	uscan --noconf --force-download --rename --download-version=$$VER --destdir=.; \
-	tar -x --exclude=utils/cpp.exe -f pycparser_$$VER.orig.tar.gz; \
+	tar -x --exclude=utils/cpp.exe --exclude=pycparser/ply -f pycparser_$$VER.orig.tar.gz; \
 	rm -f pycparser_$$VER.orig.tar.gz; \
 	GZIP=--best tar -cz --owner root --group root --mode a+rX \
 		-f pycparser_$$VER+dfsg.orig.tar.gz pycparser-$$VER; \

Added: packages/pycparser/trunk/debian/tests/control
===================================================================
--- packages/pycparser/trunk/debian/tests/control	                        (rev 0)
+++ packages/pycparser/trunk/debian/tests/control	2013-01-12 17:27:27 UTC (rev 23294)
@@ -0,0 +1,2 @@
+Tests: unittests
+Depends: @, python-all, python3-all

Added: packages/pycparser/trunk/debian/tests/unittests
===================================================================
--- packages/pycparser/trunk/debian/tests/unittests	                        (rev 0)
+++ packages/pycparser/trunk/debian/tests/unittests	2013-01-12 17:27:27 UTC (rev 23294)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -efu
+
+pythons="$(pyversions -rv) $(py3versions -rv)"
+
+cp -a tests $ADTTMP
+mkdir $ADTTMP/utils
+ln -s /usr/share/python-pycparser/fake_libc_include $ADTTMP/utils
+cd "$ADTTMP"
+
+for py in $pythons; do
+	echo "=== python$py ==="
+	python$py tests/all_tests.py 2>&1
+done


Property changes on: packages/pycparser/trunk/debian/tests/unittests
___________________________________________________________________
Added: svn:executable
   + *

More information about the Python-modules-commits mailing list