[Python-modules-commits] r23511 - in packages/python-testtools/trunk (12 files)

zigo at users.alioth.debian.org zigo at users.alioth.debian.org
Mon Feb 18 03:53:02 UTC 2013


    Date: Monday, February 18, 2013 @ 03:52:59
  Author: zigo
Revision: 23511

[svn-inject] Applying Debian modifications (0.9.29-1) to trunk

Added:
  packages/python-testtools/trunk/debian/
  packages/python-testtools/trunk/debian/3xcompat.patch
  packages/python-testtools/trunk/debian/changelog
  packages/python-testtools/trunk/debian/compat
  packages/python-testtools/trunk/debian/control
  packages/python-testtools/trunk/debian/copyright
  packages/python-testtools/trunk/debian/python-testtools.docbase
  packages/python-testtools/trunk/debian/python-testtools.docs
  packages/python-testtools/trunk/debian/rules
  packages/python-testtools/trunk/debian/source/
  packages/python-testtools/trunk/debian/source/format
  packages/python-testtools/trunk/debian/watch


Property changes on: packages/python-testtools/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages/python-testtools/trunk/debian/3xcompat.patch
===================================================================
--- packages/python-testtools/trunk/debian/3xcompat.patch	                        (rev 0)
+++ packages/python-testtools/trunk/debian/3xcompat.patch	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,39 @@
+=== removed file 'testtools/_compat2x.py'
+--- old/testtools/_compat2x.py	2011-07-26 23:08:51 +0000
++++ new/testtools/_compat2x.py	1970-01-01 00:00:00 +0000
+@@ -1,17 +0,0 @@
+-# Copyright (c) 2011 testtools developers. See LICENSE for details.
+-
+-"""Compatibility helpers that are valid syntax in Python 2.x.
+-
+-Only add things here if they *only* work in Python 2.x or are Python 2
+-alternatives to things that *only* work in Python 3.x.
+-"""
+-
+-__all__ = [
+-    'reraise',
+-    ]
+-
+-
+-def reraise(exc_class, exc_obj, exc_tb, _marker=object()):
+-    """Re-raise an exception received from sys.exc_info() or similar."""
+-    raise exc_class, exc_obj, exc_tb
+-
+
+=== modified file 'testtools/compat.py'
+--- old/testtools/compat.py	2011-12-05 15:21:33 +0000
++++ new/testtools/compat.py	2012-03-12 20:13:03 +0000
+@@ -32,11 +32,7 @@
+ BytesIO = try_imports(['StringIO.StringIO', 'io.BytesIO'])
+ StringIO = try_imports(['StringIO.StringIO', 'io.StringIO'])
+ 
+-try:
+-    from testtools import _compat2x as _compat
+-    _compat
+-except SyntaxError:
+-    from testtools import _compat3x as _compat
++from testtools import _compat3x as _compat
+ 
+ reraise = _compat.reraise
+ 
+

Added: packages/python-testtools/trunk/debian/changelog
===================================================================
--- packages/python-testtools/trunk/debian/changelog	                        (rev 0)
+++ packages/python-testtools/trunk/debian/changelog	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,93 @@
+python-testtools (0.9.29-1) experimental; urgency=low
+
+  * New upstream release.
+  * Rewrote debian/copyright using parsable format 1.0.
+  * Now using source format 3.0 (quilt).
+  * Standard-Version is now 3.9.4.
+  * Compat and debhelper are now 9.
+  * X-Python-Version: >= 2.6 instead of 2.5.
+  * Removes embedded version of jquery.js and underscore.js, and recommends
+    corresponding Debian packages.
+  * Sets the Debian Python Modules Team as new Maintainer:, switches the VCS
+    field to the SVN of the team, removed debian/bzr-builddeb.conf.
+  * Added minor changes in long and short descriptions (so that python 2 and 3
+    modules don't have the same descriptions).
+  * The watch file now uses tags from github.
+  * Cleans now does rm -rf build testtools.egg-info doc/_build.
+  * Added doc-base registration.
+
+ -- Thomas Goirand <zigo at debian.org>  Fri, 15 Feb 2013 12:18:38 +0000
+
+python-testtools (0.9.21-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Fri, 07 Dec 2012 01:06:06 +0100
+
+python-testtools (0.9.14-2) unstable; urgency=low
+
+  * Add python3-testtools package.
+  * Migrate to debhelper 7, for easier packaging for Python3.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 12 Mar 2012 20:58:59 +0100
+
+python-testtools (0.9.14-1) unstable; urgency=low
+
+  * Add watch file.
+  * New upstream release.
+   + Now uses super to call setUp()/tearDown() for compatibility with
+     multiple inheritance and Python 2.7. LP: #771508
+  * Add myself to uploaders.
+  * Bump standards version to 3.9.3 (no changes).
+  * Add Vcs-Bzr header. Closes: #574603
+  * Migrate to dh_python2. Closes: #617036
+  * Only install for Python 2.5 and later. LP: #847827
+  * Run testsuite during package build.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sun, 11 Mar 2012 23:25:35 +0100
+
+python-testtools (0.9.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Ship new html docs instead of the (gone) ReST MANUAL.
+
+ -- Robert Collins <robertc at robertcollins.net>  Sun, 12 Jun 2011 13:15:23 +1200
+
+python-testtools (0.9.8-1) unstable; urgency=low
+
+  * New upstream release. Closes: #606479
+
+ -- Robert Collins <robertc at robertcollins.net>  Sat, 18 Dec 2010 21:11:40 +1300
+
+python-testtools (0.9.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Robert Collins <robertc at robertcollins.net>  Sun, 04 Jul 2010 20:28:41 +1000
+
+python-testtools (0.9.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Include the manual in the package.
+
+ -- Robert Collins <robertc at robertcollins.net>  Wed, 16 Dec 2009 10:10:03 +1100
+
+python-testtools (0.9.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Robert Collins <robertc at robertcollins.net>  Sun, 22 Nov 2009 14:31:14 +1100
+
+python-testtools (0.1~r16-1) unstable; urgency=low
+
+  * Add to Debian. Closes: #547479
+  * Change Maintainer to me.
+
+ -- Robert Collins <robertc at robertcollins.net>  Sun, 20 Sep 2009 16:45:45 +1000
+
+python-testtools (0.1~r16-0ubuntu1) karmic; urgency=low
+
+  * Initial release (LP: #359308)
+  * This is r16 from lp:~statik/testtools/add-manifest
+
+ -- Elliot Murphy (personal) <elliot.murphy at gmail.com>  Wed, 08 Apr 2009 15:07:49 -0400

Added: packages/python-testtools/trunk/debian/compat
===================================================================
--- packages/python-testtools/trunk/debian/compat	                        (rev 0)
+++ packages/python-testtools/trunk/debian/compat	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1 @@
+9

Added: packages/python-testtools/trunk/debian/control
===================================================================
--- packages/python-testtools/trunk/debian/control	                        (rev 0)
+++ packages/python-testtools/trunk/debian/control	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,53 @@
+Source: python-testtools
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Robert Collins <robertc at robertcollins.net>, Jelmer Vernooij <jelmer at debian.org>, Thomas Goirand <zigo at debian.org>
+Section: python
+Priority: optional
+Standards-Version: 3.9.4
+Build-Depends:
+    debhelper (>= 9),
+    python-all (>= 2.6.6-3~),
+    python3-all,
+    python-fixtures,
+    python-sphinx,
+    python-twisted
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.0
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-testtools/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-testtools/trunk/
+Homepage: http://pypi.python.org/pypi/testtools
+
+Package: python-testtools
+Architecture: all
+Depends: ${python:Depends},
+    ${misc:Depends},
+    python-pkg-resources
+Provides: ${python:Provides}
+Breaks: python-subunit (<< 0.0.6)
+Recommends: python-fixtures, libjs-jquery, node-underscore
+Suggests: python-twisted
+Description: Extensions to the Python unittest library (Python 2.x)
+ testtools (formerly pyunit3k) is a set of extensions to the Python standard
+ library's unit testing framework. These extensions have been derived from
+ years of experience with unit testing in Python and come from many different
+ sources. It's hoped that these extensions will make their way into the
+ standard library eventually. Also included are backports from Python trunk of
+ unittest features that are not otherwise available to existing unittest users.
+ .
+ This package contains the libraries for Python 2.x.
+
+Package: python3-testtools
+Architecture: all
+Depends: ${python3:Depends},
+    ${misc:Depends},
+    python3-pkg-resources
+Provides: ${python:Provides}
+Description: Extensions to the Python unittest library (Python 3.x)
+ testtools (formerly pyunit3k) is a set of extensions to the Python standard
+ library's unit testing framework. These extensions have been derived from
+ years of experience with unit testing in Python and come from many different
+ sources. It's hoped that these extensions will make their way into the
+ standard library eventually. Also included are backports from Python trunk of
+ unittest features that are not otherwise available to existing unittest users.
+ .
+ This package contains the libraries for Python 3.x.

Added: packages/python-testtools/trunk/debian/copyright
===================================================================
--- packages/python-testtools/trunk/debian/copyright	                        (rev 0)
+++ packages/python-testtools/trunk/debian/copyright	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,67 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: testtools
+Upstream-Contact: Jonathan M. Lange <jml at mumak.net>
+Source: https://github.com/testing-cabal/testtools
+
+Files: debian/*
+Copyright: (c) 2009, Elliot Murphy <elliot.murphy at gmail.com>
+	(c) 2009-2011, Robert Collins <robertc at robertcollins.net>
+	(c) 2012, Jelmer Vernooij <jelmer at debian.org>
+License: MIT
+
+Files: testtools/run.py
+Copyright: (c) 1999-2003 Steve Purcell
+	(c) 2003-2010 Python Software Foundation
+License: Python-license
+
+Files: *
+Copyright: (c) Canonical Ltd
+	(c) Twisted Matrix Labs
+	(c) 2008-2013, Jonathan M. Lange <jml at mumak.net>
+	(c) Robert Collins <robertc at robertcollins.net>
+	(c) Andrew Bennetts
+	(c) Benjamin Peterson
+	(c) Jamu Kakar
+	(c) James Westby
+	(c) Martin [gz]
+	(c) Michael Hudson-Doyle
+	(c) Aaron Bentley
+	(c) Christian Kampka
+	(c) Gavin Panella
+	(c) Martin Pool
+License: MIT
+
+License: Python-license
+ This module is free software, and you may redistribute it and/or modify
+ it under the same terms as Python itself, so long as this copyright message
+ and disclaimer are retained in their original form.
+ .
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+ .
+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.

Added: packages/python-testtools/trunk/debian/python-testtools.docbase
===================================================================
--- packages/python-testtools/trunk/debian/python-testtools.docbase	                        (rev 0)
+++ packages/python-testtools/trunk/debian/python-testtools.docbase	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,15 @@
+Document: python-testtools
+Title: testtools: tasteful testing for Python
+Author: Python Testtools authors
+Abstract: Testtools is a set of extensions to the Python standard library unit testing
+ framework. These extensions have been derived from many years of experience
+ with unit testing in Python and come from many different sources. testtools
+ also ports recent unittest changes all the way back to Python 2.4.  The next
+ release of testtools will change that to support versions that are maintained
+ by the Python community instead, to allow the use of modern language features
+ within testtools.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-testtools/html/index.html
+Files: /usr/share/doc/python-testtools/html/*.html

Added: packages/python-testtools/trunk/debian/python-testtools.docs
===================================================================
--- packages/python-testtools/trunk/debian/python-testtools.docs	                        (rev 0)
+++ packages/python-testtools/trunk/debian/python-testtools.docs	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1 @@
+doc/_build/html

Added: packages/python-testtools/trunk/debian/rules
===================================================================
--- packages/python-testtools/trunk/debian/rules	                        (rev 0)
+++ packages/python-testtools/trunk/debian/rules	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,48 @@
+#!/usr/bin/make -f
+
+PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
+
+%:
+	dh $@ --with python2,python3
+
+override_dh_auto_build:
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py build; \
+	done
+	set -e && for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py build; \
+	done
+	$(MAKE) docs
+
+override_dh_auto_install:
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-testtools; \
+	done
+	set -e && for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-testtools; \
+	done
+	# Remove 2x compat file as it causes errors during byte compilation on installation.
+	echo 'raise SyntaxError' > \
+		$(CURDIR)/debian/python3-testtools/usr/lib/python3/dist-packages/testtools/_compat2x.py
+
+override_dh_installdocs:
+	dh_installdocs
+	# Replaces embedded copy of Jquery and Underscore javascript libs by
+	# symlinks to available Debian packages.
+	rm $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/jquery.js
+	ln -s ../../../../javascript/jquery/jquery.js $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/jquery.js
+	rm $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/underscore.js
+	ln -s ../../../../javascript/underscore.js $(CURDIR)/debian/python-testtools/usr/share/doc/python-testtools/html/_static/underscore.js
+	install -D -m 0644 debian/python-testtools.docbase $(CURDIR)/debian/python-testtools/usr/share/doc-base/python-testtools
+
+override_dh_clean:
+	dh_clean
+	rm -rf build testtools.egg-info doc/_build
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	$(MAKE) -C $(CURDIR) check
+endif


Property changes on: packages/python-testtools/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages/python-testtools/trunk/debian/source/format
===================================================================
--- packages/python-testtools/trunk/debian/source/format	                        (rev 0)
+++ packages/python-testtools/trunk/debian/source/format	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: packages/python-testtools/trunk/debian/watch
===================================================================
--- packages/python-testtools/trunk/debian/watch	                        (rev 0)
+++ packages/python-testtools/trunk/debian/watch	2013-02-18 03:52:59 UTC (rev 23511)
@@ -0,0 +1,2 @@
+version=3
+https://github.com/testing-cabal/testtools/tags .*/testtools-(\d[\d\.]+)\.tar\.gz




More information about the Python-modules-commits mailing list