[Python-modules-commits] r27904 - in packages/python-testtools/trunk/debian (8 files)
zigo at users.alioth.debian.org
zigo at users.alioth.debian.org
Mon Feb 24 06:23:06 UTC 2014
Date: Monday, February 24, 2014 @ 06:23:04
Author: zigo
Revision: 27904
* New upstream release.
* Standards-Version: is now 3.9.5.
* Do not remove testtools.egg-info, add extend-diff-ignore =
"^[^/]*[.]egg-info/" in debian/source/options.
* Fixes the way the sphinx doc is built, and now using a specific and
separate doc package to store the documentation: do not use the "make doc"
and call sphinx directly.
* Removed useless dh_auto_build override.
* Added python-mimeparse, python3-mimeparse, python-testresources (>= 0.2.7)
as build-depends.
* Ran wrap-and-sort.
Added:
packages/python-testtools/trunk/debian/python-testtools-doc.doc-base
(from rev 26645, packages/python-testtools/trunk/debian/python-testtools.docbase)
packages/python-testtools/trunk/debian/source/options
Modified:
packages/python-testtools/trunk/debian/changelog
packages/python-testtools/trunk/debian/control
packages/python-testtools/trunk/debian/copyright
packages/python-testtools/trunk/debian/rules
Deleted:
packages/python-testtools/trunk/debian/python-testtools.docbase
packages/python-testtools/trunk/debian/python-testtools.docs
Modified: packages/python-testtools/trunk/debian/changelog
===================================================================
--- packages/python-testtools/trunk/debian/changelog 2014-02-23 23:22:51 UTC (rev 27903)
+++ packages/python-testtools/trunk/debian/changelog 2014-02-24 06:23:04 UTC (rev 27904)
@@ -1,9 +1,23 @@
-python-testtools (0.9.32-3) UNRELEASED; urgency=low
+python-testtools (0.9.35-1) unstable; urgency=medium
+ [ Jelmer Vernooij ]
* Remove myself from uploaders.
- -- Jelmer Vernooij <jelmer at debian.org> Mon, 02 Dec 2013 23:01:40 +0000
+ [ Thomas Goirand ]
+ * New upstream release.
+ * Standards-Version: is now 3.9.5.
+ * Do not remove testtools.egg-info, add extend-diff-ignore =
+ "^[^/]*[.]egg-info/" in debian/source/options.
+ * Fixes the way the sphinx doc is built, and now using a specific and
+ separate doc package to store the documentation: do not use the "make doc"
+ and call sphinx directly.
+ * Removed useless dh_auto_build override.
+ * Added python-mimeparse, python3-mimeparse, python-testresources (>= 0.2.7)
+ as build-depends.
+ * Ran wrap-and-sort.
+ -- Thomas Goirand <zigo at debian.org> Mon, 24 Feb 2014 13:39:29 +0800
+
python-testtools (0.9.32-2) unstable; urgency=low
* Added missing python-mimeparse build-depends.
Modified: packages/python-testtools/trunk/debian/control
===================================================================
--- packages/python-testtools/trunk/debian/control 2014-02-23 23:22:51 UTC (rev 27903)
+++ packages/python-testtools/trunk/debian/control 2014-02-24 06:23:04 UTC (rev 27904)
@@ -1,20 +1,22 @@
Source: python-testtools
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Robert Collins <robertc at robertcollins.net>, Thomas Goirand <zigo at debian.org>
+Uploaders: Robert Collins <robertc at robertcollins.net>,
+ 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-mimeparse,
- python-setuptools,
- python3-setuptools,
- python-extras,
- python-fixtures (>= 0.3.12~),
- python-sphinx,
- python-twisted
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9),
+ python-all (>= 2.6.6-3~),
+ python-extras,
+ python-fixtures (>= 0.3.12~),
+ python-mimeparse,
+ python-setuptools,
+ python-sphinx,
+ python-testresources (>= 0.2.7),
+ python-twisted,
+ python3-all,
+ python3-mimeparse,
+ python3-setuptools
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.0
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-testtools/trunk/
@@ -23,14 +25,12 @@
Package: python-testtools
Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends},
- python-pkg-resources
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
Provides: ${python:Provides}
Breaks: python-subunit (<< 0.0.6)
-Recommends: python-fixtures, libjs-jquery, node-underscore
+Recommends: python-fixtures
Suggests: python-twisted
-Description: Extensions to the Python unittest library (Python 2.x)
+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
@@ -42,11 +42,9 @@
Package: python3-testtools
Architecture: all
-Depends: ${python3:Depends},
- ${misc:Depends},
- python3-pkg-resources
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
Provides: ${python:Provides}
-Description: Extensions to the Python unittest library (Python 3.x)
+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
@@ -55,3 +53,17 @@
unittest features that are not otherwise available to existing unittest users.
.
This package contains the libraries for Python 3.x.
+
+Package: python-testtools-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Extensions to the Python unittest library - doc
+ 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 documentation.
Modified: packages/python-testtools/trunk/debian/copyright
===================================================================
--- packages/python-testtools/trunk/debian/copyright 2014-02-23 23:22:51 UTC (rev 27903)
+++ packages/python-testtools/trunk/debian/copyright 2014-02-24 06:23:04 UTC (rev 27904)
@@ -7,6 +7,7 @@
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>
+ (c) 20013-2014, Thomas Goirand <zigo at debian.org>
License: MIT
Files: testtools/run.py
Copied: packages/python-testtools/trunk/debian/python-testtools-doc.doc-base (from rev 26645, packages/python-testtools/trunk/debian/python-testtools.docbase)
===================================================================
--- packages/python-testtools/trunk/debian/python-testtools-doc.doc-base (rev 0)
+++ packages/python-testtools/trunk/debian/python-testtools-doc.doc-base 2014-02-24 06:23:04 UTC (rev 27904)
@@ -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-doc/html/index.html
+Files: /usr/share/doc/python-testtools-doc/html/*.html
Deleted: packages/python-testtools/trunk/debian/python-testtools.docbase
===================================================================
--- packages/python-testtools/trunk/debian/python-testtools.docbase 2014-02-23 23:22:51 UTC (rev 27903)
+++ packages/python-testtools/trunk/debian/python-testtools.docbase 2014-02-24 06:23:04 UTC (rev 27904)
@@ -1,15 +0,0 @@
-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
Deleted: packages/python-testtools/trunk/debian/python-testtools.docs
===================================================================
--- packages/python-testtools/trunk/debian/python-testtools.docs 2014-02-23 23:22:51 UTC (rev 27903)
+++ packages/python-testtools/trunk/debian/python-testtools.docs 2014-02-24 06:23:04 UTC (rev 27904)
@@ -1 +0,0 @@
-doc/_build/html
Modified: packages/python-testtools/trunk/debian/rules
===================================================================
--- packages/python-testtools/trunk/debian/rules 2014-02-23 23:22:51 UTC (rev 27903)
+++ packages/python-testtools/trunk/debian/rules 2014-02-24 06:23:04 UTC (rev 27904)
@@ -4,17 +4,8 @@
PYTHON3S:=$(shell py3versions -vr)
%:
- dh $@ --with python2,python3
+ dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
-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 \
@@ -28,21 +19,15 @@
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_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+ sphinx-build -b html doc $(CURDIR)/debian/python-testtools-doc/usr/share/doc/python-testtools-doc/html
+ dh_sphinxdoc -O--buildsystem=python_distutils
+endif
-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
+ set -ex && for pyvers in $(PYTHONS) $(PYTHON3S); do \
+ PYTHONPATH=. PYTHON=python$$pyvers $(MAKE) -C $(CURDIR) check ; \
+ done
endif
Added: packages/python-testtools/trunk/debian/source/options
===================================================================
--- packages/python-testtools/trunk/debian/source/options (rev 0)
+++ packages/python-testtools/trunk/debian/source/options 2014-02-24 06:23:04 UTC (rev 27904)
@@ -0,0 +1 @@
+extend-diff-ignore = "^[^/]*[.]egg-info/"
More information about the Python-modules-commits
mailing list