[Python-modules-commits] r20310 - in packages/nose/trunk/debian (16 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Sat Feb 4 21:44:09 UTC 2012
Date: Saturday, February 4, 2012 @ 21:44:08
Author: stefanor
Revision: 20310
* Rework porthose's changelog entries
* Remove Google Analytics js from documentation template.
* Clean correctly after unit tests.
* Wrap and sort long fields in debian/control.
* Respect nocheck in DEB_BUILD_OPTIONS.
* Ensure seteup.py doesn't use distribute_setup.
* Rework python 3 package, not to use alternatives.
* Provide rst symlink in python-nose-doc.
Added:
packages/nose/trunk/debian/clean
packages/nose/trunk/debian/patches/manpage-formatting
packages/nose/trunk/debian/patches/no-distribute_setup
packages/nose/trunk/debian/patches/no-google-analytics
packages/nose/trunk/debian/patches/no-install-data
packages/nose/trunk/debian/python-nose-doc.links
Modified:
packages/nose/trunk/debian/changelog
packages/nose/trunk/debian/control
packages/nose/trunk/debian/copyright
packages/nose/trunk/debian/patches/series
packages/nose/trunk/debian/rules
Deleted:
packages/nose/trunk/debian/patches/01_setup.py_fix.patch
packages/nose/trunk/debian/patches/02_manpage_fix.patch
packages/nose/trunk/debian/python-nose.postinst
packages/nose/trunk/debian/python3-nose.postinst
packages/nose/trunk/debian/python3-nose.prerm
Modified: packages/nose/trunk/debian/changelog
===================================================================
--- packages/nose/trunk/debian/changelog 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/changelog 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,35 +1,35 @@
-nose (1.1.2-1) UNRELEASED; urgency=low
+nose (1.1.2-1) unstable; urgency=low
[ Charlie Smotherman ]
* New Upstream release. Closes: #646394
+ - B-D on python-coverage for unittests.
* Switched to source format 3.0 (quilt).
* Package builds twice in a row now. Closes: #608678
- * Increased debian/compat to 7.
- * Removed debian/pyversions, check for pyversions in debian/rules.
- * Updated debian/copyright to DEP5.
- * Updated debian/watch so it now works.
- * debian/control
- - update to build py3 package. Closes: #604038, #647920
- - added X-P-V and X-P3-V.
- - increased debhelper version to >= 7.0.50~
- - increased python version to python-all (>= 2.6.6-3~)
- - B-D on python3-all
- - B-D on python3-setuptools
- - B-D on python-coverage for unittests.
- - use dh_sphinxdoc Closes: #636079
- - create a python-nose-doc package
- - remove B-D on cdbs and python-support
- - added python3-nose binary stanza
- - depend on python3-pkg-resources for py3 package.
- - removed python-coverage from py3-nose Suggest: field
- - updated py3-nose Description.
- - add myself to uploaders
- * debian/rules
- - updated to use dh_python2, dh_sphinxdoc, and dh7 tiny rules.
- Closes: #631406
+ * Increased debhelper compat level to 7.
+ * Migrated from debian/pyversions to X-P-V
+ * Migrated debian/copyright to DEP5.
+ * Pointed debian/watch at PyPI
+ * Use dh7 tiny rules. Bumped debhelper B-D to >= 7.0.50~
+ * Use dh_python2. Closes: #631406
+ - Bump python B-D to python-all (>= 2.6.6-3~)
+ * Use dh_sphinxdoc. Closes: #636079
+ * Build python 3 package. Closes: #604038, #647920
+ - B-D on python3-all, python3-setuptools.
+ - Break documentation into a separate python-nose-doc package.
+ * Add myself to Uploaders.
+ * Install manpages from debian/rules
- -- Charlie Smotherman <cjsmo at cableone.net> Tue, 10 Jan 2012 12:57:42 -0500
+ [ Stefano Rivera ]
+ * Remove Google Analytics js from documentation template.
+ * Clean correctly after unit tests.
+ * Wrap and sort long fields in debian/control.
+ * Respect nocheck in DEB_BUILD_OPTIONS.
+ * Ensure seteup.py doesn't use distribute_setup.
+ * Rework python 3 package, not to use alternatives.
+ * Provide rst symlink in python-nose-doc.
+ -- Charlie Smotherman <cjsmo at cableone.net> Fri, 03 Feb 2012 21:35:46 +0200
+
nose (1.0.0-1) unstable; urgency=low
* Team upload.
@@ -39,7 +39,7 @@
[ Piotr Ożarowski ]
* New upstream release (closes: #608677)
- - adds Python 2.7 (closes: #608679)
+ - adds Python 2.7 (closes: #608679)
* Remove build dir in clean target
-- Piotr Ożarowski <piotr at debian.org> Sun, 17 Apr 2011 22:13:12 +0200
Added: packages/nose/trunk/debian/clean
===================================================================
--- packages/nose/trunk/debian/clean (rev 0)
+++ packages/nose/trunk/debian/clean 2012-02-04 21:44:08 UTC (rev 20310)
@@ -0,0 +1,4 @@
+*.egg-info/*
+.coverage
+functional_tests/doc_tests/test_xunit_plugin/support/nosetests.xml
+functional_tests/support/xunit.xml
Modified: packages/nose/trunk/debian/control
===================================================================
--- packages/nose/trunk/debian/control 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/control 2012-02-04 21:44:08 UTC (rev 20310)
@@ -2,16 +2,19 @@
Section: python
Priority: optional
Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
- Torsten Marek <shlomme at debian.org>, Charlie Smotherman <cjsmo at cableone.net>
-Build-Depends: debhelper (>= 7.0.50~),
+Uploaders:
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+ Torsten Marek <shlomme at debian.org>,
+ Charlie Smotherman <cjsmo at cableone.net>
+Build-Depends:
+ debhelper (>= 7.0.50~),
python-all (>= 2.6.6-3~),
- python3-all,
+ python-coverage,
+ python-nose,
python-setuptools (>= 0.6a9),
- python3-setuptools,
python-sphinx (>= 1.0.7+dfsg),
- python-nose,
- python-coverage
+ python3-all,
+ python3-setuptools
X-Python-Version: >= 2.5
X-Python3-Version: >= 3.2
Standards-Version: 3.9.2
@@ -32,8 +35,8 @@
Package: python-nose
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
-Suggests: python-nose-doc
+Depends: python-pkg-resources, ${misc:Depends}, ${python:Depends}
+Suggests: python-coverage, python-nose-doc
Description: test discovery and running of Python's unittest
nose provides an alternate test discovery and running process for
unittest, one that is intended to mimic the behavior of py.test as
@@ -41,7 +44,7 @@
Package: python3-nose
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources
+Depends: python3-pkg-resources, ${misc:Depends}, ${python3:Depends}
Suggests: python-nose-doc
Description: test discovery and running for Python3 unittest
nose provides an alternate test discovery and running process for Python3
Modified: packages/nose/trunk/debian/copyright
===================================================================
--- packages/nose/trunk/debian/copyright 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/copyright 2012-02-04 21:44:08 UTC (rev 20310)
@@ -18,16 +18,13 @@
License: Expat
Files: doc/manpage.py
-Copyright: Engelbert Gruber <grubert at users.sourceforge.net>
-License: public-domain
-Comment: The author explicitly placed their work in the public domain.
-
-Files: nose/ext/dtcompat.py
-Copyright: Tim Peters (tim at python.org),
- Jim Fulton,
+ nose/ext/dtcompat.py
+Copyright: Tim Peters (tim at python.org)
+ Jim Fulton
Edward Loper
+ Engelbert Gruber <grubert at users.sourceforge.net>
License: public-domain
-Comment: The author explicitly placed their work in the public domain.
+ The authors explicitly placed their work in the public domain.
License: LGPL
This library is free software; you can redistribute it and/or modify it under
@@ -64,8 +61,3 @@
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.
-
-License: public-domain
- The author explicitly placed their work in the public domain, no license is
- required for any purpose, the work is not subject to copyright in any
- jurisdiction.
Deleted: packages/nose/trunk/debian/patches/01_setup.py_fix.patch
===================================================================
--- packages/nose/trunk/debian/patches/01_setup.py_fix.patch 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/patches/01_setup.py_fix.patch 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,18 +0,0 @@
-Description: Not install manpage with setup.py.
- Use debhelper to install manpage so we can use update-alternatives to
- manage the manpages.
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
-Index: nose-1.1.2/setup.py
-===================================================================
---- nose-1.1.2.orig/setup.py 2011-07-30 18:49:15.000000000 -0500
-+++ nose-1.1.2/setup.py 2011-12-23 23:34:11.931711403 -0600
-@@ -102,7 +102,7 @@
- license = 'GNU LGPL',
- keywords = 'test unittest doctest automatic discovery',
- url = 'http://readthedocs.org/docs/nose/',
-- data_files = [('man/man1', ['nosetests.1'])],
-+ #data_files = [('man/man1', ['nosetests.1'])],
- package_data = {'': ['*.txt',
- 'examples/*.py',
- 'examples/*/*.py']},
Deleted: packages/nose/trunk/debian/patches/02_manpage_fix.patch
===================================================================
--- packages/nose/trunk/debian/patches/02_manpage_fix.patch 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/patches/02_manpage_fix.patch 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,34 +0,0 @@
-Description: Fixes manpage formatting errors.
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
-Index: nose-1.1.2/nosetests.1
-===================================================================
---- nose-1.1.2.orig/nosetests.1 2011-12-24 00:39:58.000000000 -0600
-+++ nose-1.1.2/nosetests.1 2011-12-24 01:24:15.387678280 -0600
-@@ -2,16 +2,10 @@
- .SH NAME
- nosetests \- nicer testing for python
- .\" Man page generated from reStructeredText.
--.INDENT 0.0
--.UNINDENT
-
- .SH SYNOPSIS
--.INDENT 0.0
--.INDENT 3.5
--nosetests [options] [names]
-
--.UNINDENT
--.UNINDENT
-+nosetests [options] [names]
-
- .SH DESCRIPTION
- nose collects tests automatically from python source files,
-@@ -82,7 +76,7 @@
- In addition to passing command\-line options, you may also put
- configuration options in your project\'s \fIsetup.cfg\fP file, or a .noserc
- or nose.cfg file in your home directory. In any of these standard
--.ini\-style config files, you put your nosetests configuration in a
-+ini\-style config files, you put your nosetests configuration in a
- \fB[nosetests]\fP section. Options are the same as on the command line,
- with the \-\- prefix removed. For options that are simple switches, you
- must supply a value:
Added: packages/nose/trunk/debian/patches/manpage-formatting
===================================================================
--- packages/nose/trunk/debian/patches/manpage-formatting (rev 0)
+++ packages/nose/trunk/debian/patches/manpage-formatting 2012-02-04 21:44:08 UTC (rev 20310)
@@ -0,0 +1,32 @@
+Description: Fixes manpage formatting errors.
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+--- a/nosetests.1
++++ b/nosetests.1
+@@ -2,16 +2,10 @@
+ .SH NAME
+ nosetests \- nicer testing for python
+ .\" Man page generated from reStructeredText.
+-.INDENT 0.0
+-.UNINDENT
+
+ .SH SYNOPSIS
+-.INDENT 0.0
+-.INDENT 3.5
+-nosetests [options] [names]
+
+-.UNINDENT
+-.UNINDENT
++nosetests [options] [names]
+
+ .SH DESCRIPTION
+ nose collects tests automatically from python source files,
+@@ -82,7 +76,7 @@
+ In addition to passing command\-line options, you may also put
+ configuration options in your project\'s \fIsetup.cfg\fP file, or a .noserc
+ or nose.cfg file in your home directory. In any of these standard
+-.ini\-style config files, you put your nosetests configuration in a
++ini\-style config files, you put your nosetests configuration in a
+ \fB[nosetests]\fP section. Options are the same as on the command line,
+ with the \-\- prefix removed. For options that are simple switches, you
+ must supply a value:
Added: packages/nose/trunk/debian/patches/no-distribute_setup
===================================================================
--- packages/nose/trunk/debian/patches/no-distribute_setup (rev 0)
+++ packages/nose/trunk/debian/patches/no-distribute_setup 2012-02-04 21:44:08 UTC (rev 20310)
@@ -0,0 +1,20 @@
+Description: Don't even think about using distribute_setup to download things during build
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-02-03
+
+--- a/setup.py
++++ b/setup.py
+@@ -7,11 +7,7 @@
+ test_dirs = ['functional_tests', 'unit_tests', os.path.join('doc','doc_tests'), 'nose']
+
+ if sys.version_info >= (3,):
+- try:
+- import setuptools
+- except ImportError:
+- from distribute_setup import use_setuptools
+- use_setuptools()
++ import setuptools
+
+ extra = {'use_2to3': True,
+ 'test_dirs': test_dirs,
Added: packages/nose/trunk/debian/patches/no-google-analytics
===================================================================
--- packages/nose/trunk/debian/patches/no-google-analytics (rev 0)
+++ packages/nose/trunk/debian/patches/no-google-analytics 2012-02-04 21:44:08 UTC (rev 20310)
@@ -0,0 +1,22 @@
+Description: Remove Google Analytics tracking JS
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-02-03
+
+--- a/doc/.templates/layout.html
++++ b/doc/.templates/layout.html
+@@ -3,14 +3,3 @@
+ {%- block relbar1 %}
+ {% if pagename != 'index' %}{{ super() }}{% endif %}
+ {% endblock %}
+-
+-{%- block footer %}
+-{{ super() }}
+-<script src="http://www.google-analytics.com/urchin.js"
+- type="text/javascript">
+-</script>
+-<script type="text/javascript">
+- _uacct = "UA-2236166-1";
+- urchinTracker();
+-</script>
+-{%- endblock %}
Added: packages/nose/trunk/debian/patches/no-install-data
===================================================================
--- packages/nose/trunk/debian/patches/no-install-data (rev 0)
+++ packages/nose/trunk/debian/patches/no-install-data 2012-02-04 21:44:08 UTC (rev 20310)
@@ -0,0 +1,16 @@
+Description: Don't install manpage with setup.py.
+ Use debhelper to install manpage so we can use update-alternatives to
+ manage the manpages.
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+--- a/setup.py
++++ b/setup.py
+@@ -102,7 +102,7 @@
+ license = 'GNU LGPL',
+ keywords = 'test unittest doctest automatic discovery',
+ url = 'http://readthedocs.org/docs/nose/',
+- data_files = [('man/man1', ['nosetests.1'])],
++ #data_files = [('man/man1', ['nosetests.1'])],
+ package_data = {'': ['*.txt',
+ 'examples/*.py',
+ 'examples/*/*.py']},
Modified: packages/nose/trunk/debian/patches/series
===================================================================
--- packages/nose/trunk/debian/patches/series 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/patches/series 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,2 +1,4 @@
-02_manpage_fix.patch
-01_setup.py_fix.patch
+manpage-formatting
+no-install-data
+no-google-analytics
+no-distribute_setup
Added: packages/nose/trunk/debian/python-nose-doc.links
===================================================================
--- packages/nose/trunk/debian/python-nose-doc.links (rev 0)
+++ packages/nose/trunk/debian/python-nose-doc.links 2012-02-04 21:44:08 UTC (rev 20310)
@@ -0,0 +1 @@
+/usr/share/doc/python-nose-doc/html/_sources /usr/share/doc/python-nose-doc/rst
Deleted: packages/nose/trunk/debian/python-nose.postinst
===================================================================
--- packages/nose/trunk/debian/python-nose.postinst 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/python-nose.postinst 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- #make sure /usr/bin/nosetests is removed then let
- #update-alternatives create the needed symlink.
- if [ -f /usr/bin/nosetests ] && [ ! -h /usr/bin/nosetests ]; then
- rm -f /usr/bin/nosetests
- fi
- update-alternatives --install /usr/bin/nosetests \
- nosetests \
- /usr/bin/nosetests_py2 10 \
- --slave /usr/share/man/man1/nosetests.1.gz \
- nosetests.1.gz \
- /usr/share/man/man1/nosetests_py2.1.gz
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/nose/trunk/debian/python3-nose.postinst
===================================================================
--- packages/nose/trunk/debian/python3-nose.postinst 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/python3-nose.postinst 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- #make sure /usr/bin/nosetests is removed then let
- #update-alternatives create the needed symlink.
- if [ -f /usr/bin/nosetests ] && [ ! -h /usr/bin/nosetests ]; then
- rm -f /usr/bin/nosetests
- fi
- update-alternatives --install /usr/bin/nosetests \
- nosetests \
- /usr/bin/nosetests_py3 10 \
- --slave /usr/share/man/man1/nosetests.1.gz \
- nosetests.1.gz \
- /usr/share/man/man1/nosetests_py3.1.gz
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/nose/trunk/debian/python3-nose.prerm
===================================================================
--- packages/nose/trunk/debian/python3-nose.prerm 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/python3-nose.prerm 2012-02-04 21:44:08 UTC (rev 20310)
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove|deconfigure)
- update-alternatives --remove nosetests /usr/bin/nosetests_py3
- ;;
-
- upgrade|failed-upgrade)
- ;;
-
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: packages/nose/trunk/debian/rules
===================================================================
--- packages/nose/trunk/debian/rules 2012-02-04 20:50:52 UTC (rev 20309)
+++ packages/nose/trunk/debian/rules 2012-02-04 21:44:08 UTC (rev 20310)
@@ -7,49 +7,43 @@
DESTDIR3 := $(CURDIR)/debian/python3-nose
%:
- dh $@ --with sphinxdoc,python2,python3
+ dh $@ --with python2,python3,sphinxdoc
override_dh_auto_build:
- set -e; \
+ set -ex; \
for py in $(PYVERS) $(PY3VERS); do \
$$py setup.py build; \
done
- set -e; \
- for py in $(PYVERS); do\
- $$py setup.py build_sphinx; \
- done
+ python setup.py build_sphinx
override_dh_auto_test:
- set -e; \
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ # There doesn't appear to be a simple way to run the test suite under Py3k
+ # yet
+ set -ex; \
for py in $(PYVERS); do \
$$py setup.py nosetests; \
done
+endif
override_dh_auto_clean:
rm -rf build
+ dh_auto_clean
override_dh_auto_install:
- set -e; \
+ set -ex; \
for py in $(PYVERS); do \
$$py setup.py install --skip-build --root debian/python-nose \
- --install-layout deb; \
+ --install-layout deb; \
done
- set -e; \
+ set -ex; \
for py in $(PY3VERS); do \
$$py setup.py install --skip-build --root debian/python3-nose \
- --install-layout deb; \
+ --install-layout deb; \
done
- mv $(DESTDIR2)/usr/bin/nosetests \
- $(DESTDIR2)/usr/bin/nosetests_py2
- mv $(DESTDIR3)/usr/bin/nosetests \
- $(DESTDIR3)/usr/bin/nosetests_py3
- rm $(DESTDIR2)/usr/bin/nosetests-*
- rm $(DESTDIR3)/usr/bin/nosetests-*
+ cd $(DESTDIR3)/usr/bin/ && mv nosetests nosetests3
override_dh_installman:
- cp nosetests.1 nosetests_py2.1
- dh_installman -p python-nose nosetests_py2.1
- cp nosetests.1 nosetests_py3.1
- dh_installman -p python3-nose nosetests_py3.1
-
-
+ dh_installman -p python-nose nosetests.1
+ dh_installman -p python3-nose nosetests.1
+ cd $(DESTDIR3)/usr/share/man/man1 && mv nosetests.1 nosetests3.1
More information about the Python-modules-commits
mailing list