[Python-modules-commits] r15301 - in packages/configobj/trunk/debian (6 files)
stefanor-guest at users.alioth.debian.org
stefanor-guest at users.alioth.debian.org
Wed Jan 12 22:08:08 UTC 2011
Date: Wednesday, January 12, 2011 @ 22:08:07
Author: stefanor-guest
Revision: 15301
* Bumped Standards-Version to 3.9.1 (no changes needed).
* Enable test suites.
- Build Depend on python-all, python-unittest2.
- New patch: report-doctest-failure.diff: Fail on failures.
- New patch: py27-test.diff: Convert float-comparing doctests to unit
tests.
* Wrap long lines in debian/control.
Added:
packages/configobj/trunk/debian/patches/py27-test.diff
packages/configobj/trunk/debian/patches/report-doctest-failure.diff
Modified:
packages/configobj/trunk/debian/changelog
packages/configobj/trunk/debian/control
packages/configobj/trunk/debian/patches/series
packages/configobj/trunk/debian/rules
Modified: packages/configobj/trunk/debian/changelog
===================================================================
--- packages/configobj/trunk/debian/changelog 2011-01-12 11:42:53 UTC (rev 15300)
+++ packages/configobj/trunk/debian/changelog 2011-01-12 22:08:07 UTC (rev 15301)
@@ -1,8 +1,15 @@
configobj (4.7.2+ds-2) UNRELEASED; urgency=low
* Don't leak uid and umask into source tarball and set -e.
+ * Bumped Standards-Version to 3.9.1 (no changes needed).
+ * Enable test suites.
+ - Build Depend on python-all, python-unittest2.
+ - New patch: report-doctest-failure.diff: Fail on failures.
+ - New patch: py27-test.diff: Convert float-comparing doctests to unit
+ tests.
+ * Wrap long lines in debian/control.
- -- Stefano Rivera <stefano at rivera.za.net> Fri, 12 Mar 2010 19:54:42 +0200
+ -- Stefano Rivera <stefano at rivera.za.net> Thu, 13 Jan 2011 00:06:22 +0200
configobj (4.7.2+ds-1) unstable; urgency=low
Modified: packages/configobj/trunk/debian/control
===================================================================
--- packages/configobj/trunk/debian/control 2011-01-12 11:42:53 UTC (rev 15300)
+++ packages/configobj/trunk/debian/control 2011-01-12 22:08:07 UTC (rev 15301)
@@ -2,11 +2,17 @@
Section: python
Priority: optional
Maintainer: Daniel Watkins <daniel at daniel-watkins.co.uk>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+Uploaders:
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
Stefano Rivera <stefano at rivera.za.net>
Build-Depends: debhelper (>= 7.0.50~), python-setuptools
-Build-Depends-Indep: python-docutils, python-epydoc, python-support (>= 0.6.4)
-Standards-Version: 3.8.4
+Build-Depends-Indep:
+ python-all,
+ python-docutils,
+ python-epydoc,
+ python-support (>= 0.6.4),
+ python-unittest2
+Standards-Version: 3.9.1
Homepage: http://www.voidspace.org.uk/python/configobj.html
XS-Python-Version: all
Vcs-Svn: svn://svn.debian.org/python-modules/packages/configobj/trunk/
@@ -14,7 +20,7 @@
Package: python-configobj
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
Description: simple but powerful config file reader and writer for Python
ConfigObj is a simple but powerful config file reader and writer: an
ini file round tripper. Its main feature is that it is very easy to
Added: packages/configobj/trunk/debian/patches/py27-test.diff
===================================================================
--- packages/configobj/trunk/debian/patches/py27-test.diff (rev 0)
+++ packages/configobj/trunk/debian/patches/py27-test.diff 2011-01-12 22:08:07 UTC (rev 15301)
@@ -0,0 +1,105 @@
+Description: Fix tests on Python 2.7 by making as_* tests proper unit tests
+Author: Stefan Parviainen <pafcu at iki.fi>
+Origin: http://code.google.com/r/pafcu-configobj/source/detail?r=ccd79e87be5cee5b8a00df75ede01c66ad9308a5
+Last-Update: 2011-01-12
+--- a/configobj.py
++++ b/configobj.py
+@@ -1010,18 +1010,6 @@
+
+ If the value is an invalid literal for ``float``, a ``ValueError`` will
+ be raised.
+-
+- >>> a = ConfigObj()
+- >>> a['a'] = 'fish'
+- >>> a.as_float('a')
+- Traceback (most recent call last):
+- ValueError: invalid literal for float(): fish
+- >>> a['b'] = '1'
+- >>> a.as_float('b')
+- 1.0
+- >>> a['b'] = '3.2'
+- >>> a.as_float('b')
+- 3.2000000000000002
+ """
+ return float(self[key])
+
+--- a/tests/functionaltests/test_configobj.py
++++ b/tests/functionaltests/test_configobj.py
+@@ -99,3 +99,23 @@
+ # This raises a MissingInterpolationOption exception in 4.7.1 and earlier
+ repr(c)
+
++ def test_as_functions(self):
++ a = ConfigObj()
++ a['a'] = 'fish'
++ self.assertRaises(ValueError, a.as_bool, 'a')
++ a['b'] = 'True'
++ self.assertEquals(a.as_bool('b'),True)
++ a['b'] = 'off'
++ self.assertEquals(a.as_bool('b'),False)
++ a['a'] = 'fish'
++ self.assertRaises(ValueError, a.as_int, 'a')
++ a['b'] = '1'
++ self.assertEquals(a.as_int('b'),1)
++ a['b'] = '3.2'
++ self.assertRaises(ValueError,a.as_int,'b')
++ a['a'] = 'fish'
++ self.assertRaises(ValueError,a.as_float, 'a')
++ a['b'] = '1'
++ self.assertEqual(a.as_float('b'),1.0)
++ a['b'] = '3.2'
++ self.assertEqual(a.as_float('b'),3.2)
+--- a/tests/test_configobj.py
++++ b/tests/test_configobj.py
+@@ -576,50 +576,7 @@
+ >>> c = ConfigObj(a, unrepr=True)
+ >>> type(c['k']) == dict
+ 1
+-
+- >>> a = ConfigObj()
+- >>> a['a'] = 'fish'
+- >>> a.as_bool('a')
+- Traceback (most recent call last):
+- ValueError: Value "fish" is neither True nor False
+- >>> a['b'] = 'True'
+- >>> a.as_bool('b')
+- 1
+- >>> a['b'] = 'off'
+- >>> a.as_bool('b')
+- 0
+-
+- >>> a = ConfigObj()
+- >>> a['a'] = 'fish'
+- >>> try:
+- ... a.as_int('a') #doctest: +ELLIPSIS
+- ... except ValueError, e:
+- ... err_mess = str(e)
+- >>> err_mess.startswith('invalid literal for int()')
+- 1
+- >>> a['b'] = '1'
+- >>> a.as_int('b')
+- 1
+- >>> a['b'] = '3.2'
+- >>> try:
+- ... a.as_int('b') #doctest: +ELLIPSIS
+- ... except ValueError, e:
+- ... err_mess = str(e)
+- >>> err_mess.startswith('invalid literal for int()')
+- 1
+-
+- >>> a = ConfigObj()
+- >>> a['a'] = 'fish'
+- >>> a.as_float('a')
+- Traceback (most recent call last):
+- ValueError: invalid literal for float(): fish
+- >>> a['b'] = '1'
+- >>> a.as_float('b')
+- 1.0
+- >>> a['b'] = '3.2'
+- >>> a.as_float('b')
+- 3.2000000000000002
+-
++
+ Test # with unrepr
+ >>> a = '''
+ ... key1 = (1, 2, 3) # comment
Added: packages/configobj/trunk/debian/patches/report-doctest-failure.diff
===================================================================
--- packages/configobj/trunk/debian/patches/report-doctest-failure.diff (rev 0)
+++ packages/configobj/trunk/debian/patches/report-doctest-failure.diff 2011-01-12 22:08:07 UTC (rev 15301)
@@ -0,0 +1,20 @@
+Description: Return failure if doctests fail
+Author: Stefano Rivera <stefano at rivera.za.net>
+Forwarded: http://code.google.com/p/configobj/issues/detail?id=30
+Last-Update: 2011-01-12
+--- a/tests/test_configobj.py
++++ b/tests/test_configobj.py
+@@ -2215,7 +2215,10 @@
+ doctest.testmod(m, globs=globs)
+
+ import configobj
+- doctest.testmod(configobj, globs=globs)
++ failures, tests = doctest.testmod(configobj, globs=globs)
++ print "Ran %i tests. Failures: %i" % (tests, failures)
++ if failures:
++ sys.exit(1)
+
+
+-# Man alive I prefer unittest ;-)
+\ No newline at end of file
++# Man alive I prefer unittest ;-)
Modified: packages/configobj/trunk/debian/patches/series
===================================================================
--- packages/configobj/trunk/debian/patches/series 2011-01-12 11:42:53 UTC (rev 15300)
+++ packages/configobj/trunk/debian/patches/series 2011-01-12 22:08:07 UTC (rev 15301)
@@ -1 +1,3 @@
eggify.diff
+report-doctest-failure.diff
+py27-test.diff
Modified: packages/configobj/trunk/debian/rules
===================================================================
--- packages/configobj/trunk/debian/rules 2011-01-12 11:42:53 UTC (rev 15300)
+++ packages/configobj/trunk/debian/rules 2011-01-12 22:08:07 UTC (rev 15301)
@@ -10,6 +10,21 @@
--url http://www.voidspace.org.uk/python/configobj.html \
-o api configobj
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -e; \
+ export PYTHONPATH=.; \
+ export PYTHONWARNINGS=default; \
+ for py in $(shell pyversions -r); do \
+ $$py tests/test_configobj.py; \
+ if [ "$$py" = "python2.7" ]; then \
+ $$py -m unittest discover -s tests; \
+ else \
+ $$py $(shell which unit2) discover -s tests; \
+ fi; \
+ done
+endif
+
override_dh_compress:
dh_compress -X.js
More information about the Python-modules-commits
mailing list