Merge lp:~james-page/cinder/havana-pep8-deps into lp:~openstack-ubuntu-testing/cinder/havana

Proposed by James Page on 2013-05-03
Status: Merged
Approved by: Chuck Short on 2013-05-03
Approved revision: 101
Merged at revision: 100
Proposed branch: lp:~james-page/cinder/havana-pep8-deps
Merge into: lp:~openstack-ubuntu-testing/cinder/havana
Diff against target: 56 lines (+8/-4)
3 files modified
debian/changelog (+7/-0)
debian/control (+0/-3)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~james-page/cinder/havana-pep8-deps
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers 2013-05-03 Pending
Review via email: mp+162309@code.launchpad.net

Description of the change

Misc dependency tidyup

Remove pep8 testing; this adds little value in the distro

To post a comment you must log in.
101. By James Page on 2013-05-03

Drop -v as well

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 2013-04-30 13:11:39 +0000
3+++ debian/changelog 2013-05-03 16:33:22 +0000
4@@ -1,9 +1,16 @@
5 cinder (1:2013.2.a163.ga4ba17b-0ubuntu1) UNRELEASED; urgency=low
6
7+ [ Chuck Short ]
8 * New upstream version.
9 * debian/patches/fix_cinder_dependencies.patch: Refreshed.
10 * debian/control: Bump standards version to 3.9.4.
11
12+ [ James Page ]
13+ * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
14+ * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
15+ package build process (its just way to late).
16+ * debian/control: Drop surplus BD on python-cheetah.
17+
18 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 08:09:08 -0500
19
20 cinder (1:2013.1-0ubuntu2) raring; urgency=low
21
22=== modified file 'debian/control'
23--- debian/control 2013-04-30 13:11:39 +0000
24+++ debian/control 2013-05-03 16:33:22 +0000
25@@ -4,10 +4,8 @@
26 Maintainer: Chuck Short <zulcss@ubuntu.com>
27 Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
28 Build-Depends-Indep:
29- pep8,
30 python-amqplib,
31 python-anyjson,
32- python-cheetah,
33 python-coverage,
34 python-eventlet,
35 python-glanceclient,
36@@ -46,7 +44,6 @@
37 python-amqplib,
38 python-anyjson,
39 python-eventlet,
40- python-glance,
41 python-glanceclient,
42 python-keystoneclient,
43 python-oslo.config,
44
45=== modified file 'debian/rules'
46--- debian/rules 2013-03-25 13:31:36 +0000
47+++ debian/rules 2013-05-03 16:33:22 +0000
48@@ -15,7 +15,7 @@
49
50 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
51 override_dh_auto_test:
52- PYTHONPATH=$(CURDIR) bash run_tests.sh -N -v
53+ PYTHONPATH=$(CURDIR) bash run_tests.sh -N -P
54 endif
55
56 override_dh_install:

Subscribers

People subscribed via source and target branches