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

Proposed by James Page
Status: Merged
Approved by: Chuck Short
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 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

Drop -v as well

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-30 13:11:39 +0000
+++ debian/changelog 2013-05-03 16:33:22 +0000
@@ -1,9 +1,16 @@
1cinder (1:2013.2.a163.ga4ba17b-0ubuntu1) UNRELEASED; urgency=low1cinder (1:2013.2.a163.ga4ba17b-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Chuck Short ]
3 * New upstream version.4 * New upstream version.
4 * debian/patches/fix_cinder_dependencies.patch: Refreshed.5 * debian/patches/fix_cinder_dependencies.patch: Refreshed.
5 * debian/control: Bump standards version to 3.9.4.6 * debian/control: Bump standards version to 3.9.4.
67
8 [ James Page ]
9 * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
10 * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
11 package build process (its just way to late).
12 * debian/control: Drop surplus BD on python-cheetah.
13
7 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 08:09:08 -050014 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 08:09:08 -0500
815
9cinder (1:2013.1-0ubuntu2) raring; urgency=low16cinder (1:2013.1-0ubuntu2) raring; urgency=low
1017
=== modified file 'debian/control'
--- debian/control 2013-04-30 13:11:39 +0000
+++ debian/control 2013-05-03 16:33:22 +0000
@@ -4,10 +4,8 @@
4Maintainer: Chuck Short <zulcss@ubuntu.com>4Maintainer: Chuck Short <zulcss@ubuntu.com>
5Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)5Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
6Build-Depends-Indep:6Build-Depends-Indep:
7 pep8,
8 python-amqplib,7 python-amqplib,
9 python-anyjson,8 python-anyjson,
10 python-cheetah,
11 python-coverage,9 python-coverage,
12 python-eventlet,10 python-eventlet,
13 python-glanceclient,11 python-glanceclient,
@@ -46,7 +44,6 @@
46 python-amqplib,44 python-amqplib,
47 python-anyjson,45 python-anyjson,
48 python-eventlet,46 python-eventlet,
49 python-glance,
50 python-glanceclient,47 python-glanceclient,
51 python-keystoneclient,48 python-keystoneclient,
52 python-oslo.config,49 python-oslo.config,
5350
=== modified file 'debian/rules'
--- debian/rules 2013-03-25 13:31:36 +0000
+++ debian/rules 2013-05-03 16:33:22 +0000
@@ -15,7 +15,7 @@
1515
16ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))16ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
17override_dh_auto_test:17override_dh_auto_test:
18 PYTHONPATH=$(CURDIR) bash run_tests.sh -N -v18 PYTHONPATH=$(CURDIR) bash run_tests.sh -N -P
19endif19endif
2020
21override_dh_install:21override_dh_install:

Subscribers

People subscribed via source and target branches