Merge lp:~jamesodhunt/ubuntu/utopic/isodate/add-dep8-tests into lp:ubuntu/utopic/isodate

Proposed by James Hunt
Status: Merged
Merged at revision: 3
Proposed branch: lp:~jamesodhunt/ubuntu/utopic/isodate/add-dep8-tests
Merge into: lp:ubuntu/utopic/isodate
Diff against target: 70 lines (+26/-3)
5 files modified
debian/changelog (+12/-0)
debian/control (+4/-3)
debian/tests/control (+2/-0)
debian/tests/run-tests (+5/-0)
debian/watch (+3/-0)
To merge this branch: bzr merge lp:~jamesodhunt/ubuntu/utopic/isodate/add-dep8-tests
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+233902@code.launchpad.net

Description of the change

revno: 3
committer: James Hunt <email address hidden>
branch nick: ubuntu-isodate-add-tests
timestamp: Tue 2014-09-09 11:45:38 +0100
message:
  * debian/control:
    - Add XS-Testsuite for DEP-8 tests.
    - Update standards version.
    - Make python 2 and python 3 Descriptions unique to appease lintian.
  * debian/tests/: Basic DEP-8 test to run test suite for python 2 and
    python 3.
  * debian/watch: Added missing watch file.

Changes made as part of bug 1349899.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looking good to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-22 12:09:40 +0000
3+++ debian/changelog 2014-09-09 10:47:17 +0000
4@@ -1,3 +1,15 @@
5+isodate (0.4.6-1ubuntu1) UNRELEASED; urgency=medium
6+
7+ * debian/control:
8+ - Add XS-Testsuite for DEP-8 tests.
9+ - Update standards version.
10+ - Make python 2 and python 3 Descriptions unique to appease lintian.
11+ * debian/tests/: Basic DEP-8 test to run test suite for python 2 and
12+ python 3.
13+ * debian/watch: Added missing watch file.
14+
15+ -- James Hunt <james.hunt@ubuntu.com> Tue, 09 Sep 2014 11:44:49 +0100
16+
17 isodate (0.4.6-1) unstable; urgency=low
18
19 * Initial release. (Closes: #656919)
20
21=== modified file 'debian/control'
22--- debian/control 2012-01-22 12:09:40 +0000
23+++ debian/control 2014-09-09 10:47:17 +0000
24@@ -5,16 +5,17 @@
25 Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-6~), debhelper (>= 7.0.50~)
26 X-Python-Version: >= 2.5
27 X-Python3-Version: >= 3.0
28-Standards-Version: 3.9.2
29+Standards-Version: 3.9.5
30+XS-Testsuite: autopkgtest
31
32 Package: python-isodate
33 Architecture: all
34 Depends: ${misc:Depends}, ${python:Depends}
35 Description: ISO 8601 date/time/duration parser and formatter (Python module)
36- This module implements ISO 8601 date, time and duration parsing.
37+ This python module implements ISO 8601 date, time and duration parsing.
38
39 Package: python3-isodate
40 Architecture: all
41 Depends: ${misc:Depends}, ${python3:Depends}
42 Description: ISO 8601 date/time/duration parser and formatter (Python 3 module)
43- This module implements ISO 8601 date, time and duration parsing.
44+ This python 3 module implements ISO 8601 date, time and duration parsing.
45
46=== added directory 'debian/tests'
47=== added file 'debian/tests/control'
48--- debian/tests/control 1970-01-01 00:00:00 +0000
49+++ debian/tests/control 2014-09-09 10:47:17 +0000
50@@ -0,0 +1,2 @@
51+Tests: run-tests
52+Depends: @, python-setuptools, python3-setuptools
53
54=== added file 'debian/tests/run-tests'
55--- debian/tests/run-tests 1970-01-01 00:00:00 +0000
56+++ debian/tests/run-tests 2014-09-09 10:47:17 +0000
57@@ -0,0 +1,5 @@
58+#!/bin/sh
59+
60+set -e
61+
62+python setup.py test && python3 setup.py test
63
64=== added file 'debian/watch'
65--- debian/watch 1970-01-01 00:00:00 +0000
66+++ debian/watch 2014-09-09 10:47:17 +0000
67@@ -0,0 +1,3 @@
68+version=3
69+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
70+http://pypi.python.org/packages/source/i/isodate/isodate-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))

Subscribers

People subscribed via source and target branches

to all changes: