OpenStack DBaaS (Trove)

Merge lp:~corey.bryant/trove/2015.1-b1 into lp:~ubuntu-server-dev/trove/kilo

  1. 2015.1-b1
  2. Merge into kilo
Proposed by Corey Bryant on 2015-01-06
Status: Merged
Merged at revision: 41
Proposed branch: lp:~corey.bryant/trove/2015.1-b1
Merge into: lp:~ubuntu-server-dev/trove/kilo
Diff against target: 223 lines (+106/-58)
5 files modified
debian/changelog (+10/-2)
debian/control (+69/-55)
debian/patches/fix-requirements.patch (+25/-0)
debian/patches/series (+1/-0)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/trove/2015.1-b1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2015-01-06 Pending
Review via email: mp+245693@code.launchpad.net
To post a comment you must log in.

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 2014-10-28 14:05:27 +0000
3+++ debian/changelog 2015-01-06 20:23:49 +0000
4@@ -1,9 +1,17 @@
5-openstack-trove (2014.2-0ubuntu2) UNRELEASED; urgency=medium
6+openstack-trove (2015.1~b1-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ Chuck Short ]
9 * Open up for vivid.
10 * debian/control: Update bzr branches.
11
12- -- Chuck Short <zulcss@ubuntu.com> Tue, 28 Oct 2014 10:05:07 -0400
13+ [ Corey Bryant ]
14+ * New upstream release.
15+ - d/control: Align requirements with upstream.
16+ - d/watch: Update uversionmangle for kilo beta naming.
17+ - d/p/fix-requirements: Align requirements with Ubuntu.
18+ * d/control: Bumped Standards-Version to 3.9.6.
19+
20+ -- Corey Bryant <corey.bryant@canonical.com> Tue, 06 Jan 2015 13:39:46 -0500
21
22 openstack-trove (2014.2-0ubuntu1) utopic; urgency=medium
23
24
25=== modified file 'debian/control'
26--- debian/control 2014-10-28 14:05:27 +0000
27+++ debian/control 2015-01-06 20:23:49 +0000
28@@ -9,46 +9,53 @@
29 Build-Depends: debhelper (>= 9~),
30 dh-exec,
31 python-all (>= 2.6.6-3~),
32- python-pbr (>= 0.5.21),
33+ python-pbr (>= 0.6),
34 python-setuptools
35-Build-Depends-Indep: python-cinderclient (>= 1:1.0.6),
36+Build-Depends-Indep: python-babel (>= 1.3),
37+ python-cinderclient (>= 1:1.1.0),
38+ python-coverage (>= 3.6),
39 python-designateclient,
40- python-eventlet,
41+ python-eventlet (>= 0.15.2),
42 python-extras,
43- python-heatclient (>= 0.2.3),
44- python-httplib2,
45- python-iso8601,
46- python-jinja2,
47- python-jsonschema,
48- python-keystoneclient,
49- python-kombu (>= 2.5),
50- python-lxml,
51- python-migrate,
52- python-mock,
53- python-mockito,
54- python-mox,
55+ python-hacking (>= 0.8.0),
56+ python-heatclient (>= 0.2.9),
57+ python-httplib2 (>= 0.7.5),
58+ python-iso8601 (>= 0.1.9),
59+ python-jinja2 (>= 2.6),
60+ python-jsonschema (>= 2.0.0),
61+ python-keystoneclient (>= 1:0.11.1),
62+ python-kombu (>= 2.5.0),
63+ python-lxml (>= 2.3),
64+ python-keystonemiddleware (>= 1.0.0),
65+ python-migrate (>= 0.9.1),
66+ python-mock (>= 1.0),
67+ python-mox3 (>= 0.7.0),
68 python-mysqldb,
69- python-netaddr,
70- python-netifaces,
71- python-neutronclient (>= 1:2.3.5),
72- python-novaclient,
73- python-oslo.config (>= 1.2.0),
74+ python-netaddr (>= 0.7.12),
75+ python-netifaces (>= 0.10.4),
76+ python-neutronclient (>= 1:2.3.6),
77+ python-nose,
78+ python-nosexcover,
79+ python-novaclient (>= 1:2.18.0),
80+ python-oslo.config (>= 1:1.4.0),
81+ python-oslo.utils (>= 1.1.0),
82+ python-oslosphinx (>= 2.2.0),
83 python-passlib,
84 python-paste,
85- python-pastedeploy,
86- python-pexpect,
87- python-proboscis,
88- python-routes,
89- python-sphinx,
90- python-sqlalchemy,
91- python-swiftclient,
92- python-testtools (>= 0.9.22),
93+ python-pastedeploy (>= 1.5.0),
94+ python-pexpect (>= 3.1),
95+ python-routes (>= 1.12.3),
96+ python-six (>= 1.7.0),
97+ python-sphinx (>= 1.1.2),
98+ python-sqlalchemy (>= 0.9.7),
99+ python-stevedore (>= 1.1.0),
100+ python-swiftclient (>= 1:2.2.0),
101+ python-testtools (>= 0.9.36),
102 python-troveclient,
103- python-webob,
104- python-webtest,
105- python-wsgi-intercept,
106- testrepository (>=0.0.17)
107-Standards-Version: 3.9.5
108+ python-webob (>= 1.2.3),
109+ python-webtest (>= 2.0),
110+ testrepository (>= 0.0.18)
111+Standards-Version: 3.9.6
112 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/trove/kilo/files
113 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/trove/kilo
114 Homepage: http://github.com/openstack/trove
115@@ -56,32 +63,39 @@
116 Package: python-trove
117 Architecture: all
118 Section: python
119-Depends: python-cinderclient (>= 1:1.0.5),
120+Depends: python-babel (>= 1.3),
121+ python-cinderclient (>= 1:1.1.0),
122 python-designateclient,
123- python-eventlet,
124+ python-eventlet (>= 0.15.2),
125 python-extras,
126- python-heatclient (>= 0.2.3),
127- python-httplib2,
128- python-iso8601,
129- python-jinja2,
130- python-jsonschema,
131- python-keystoneclient,
132- python-kombu (>= 2.5),
133- python-lxml,
134- python-migrate,
135+ python-heatclient (>= 0.2.9),
136+ python-httplib2 (>= 0.7.5),
137+ python-iso8601 (>= 0.1.9),
138+ python-jinja2 (>= 2.6),
139+ python-jsonschema (>= 2.0.0),
140+ python-keystoneclient (>= 1:0.11.1),
141+ python-kombu (>= 2.5.0),
142+ python-lxml (>= 2.3),
143+ python-keystonemiddleware (>= 1.0.0),
144+ python-migrate (>= 0.9.1),
145 python-mysqldb,
146- python-netaddr,
147- python-netifaces,
148- python-neutronclient (>= 1:2.3.5),
149- python-novaclient,
150- python-oslo.config (>= 1.2.0a3),
151+ python-netaddr (>= 0.7.12),
152+ python-netifaces (>= 0.10.4),
153+ python-neutronclient (>= 1:2.3.6),
154+ python-novaclient (>= 1:2.18.0),
155+ python-oslo.config (>= 1:1.4.0),
156+ python-oslo.utils (>= 1.1.0),
157 python-paste,
158- python-pastedeploy,
159- python-pexpect,
160- python-routes,
161- python-sqlalchemy,
162- python-swiftclient,
163- python-webob,
164+ python-pastedeploy (>= 1.5.0),
165+ python-passlib,
166+ python-pbr (>= 0.6),
167+ python-pexpect (>= 3.1),
168+ python-routes (>= 1.12.3),
169+ python-six (>= 1.7.0),
170+ python-sqlalchemy (>= 0.9.7),
171+ python-stevedore (>= 1.1.0),
172+ python-swiftclient (>= 1:2.2.0),
173+ python-webob (>= 1.2.3),
174 ${misc:Depends},
175 ${python:Depends}
176 Suggests: python-suds (>= 0.4.0)
177
178=== added file 'debian/patches/fix-requirements.patch'
179--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
180+++ debian/patches/fix-requirements.patch 2015-01-06 20:23:49 +0000
181@@ -0,0 +1,25 @@
182+--- a/requirements.txt
183++++ b/requirements.txt
184+@@ -33,4 +33,3 @@
185+ Babel>=1.3
186+ six>=1.7.0
187+ stevedore>=1.1.0 # Apache-2.0
188+-ordereddict
189+--- a/test-requirements.txt
190++++ b/test-requirements.txt
191+@@ -9,15 +9,10 @@
192+ coverage>=3.6
193+ nose
194+ nosexcover
195+-openstack-doc-tools>=0.20
196+-openstack.nose_plugin>=0.7
197+ WebTest>=2.0
198+-wsgi_intercept>=0.6.1 # MIT License
199+-proboscis==1.2.5.3
200+ http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.gz#egg=python-troveclient
201+ mock>=1.0
202+ mox3>=0.7.0
203+ testtools>=0.9.36,!=1.2.0
204+-discover
205+ testrepository>=0.0.18
206+
207
208=== modified file 'debian/patches/series'
209--- debian/patches/series 2014-10-03 19:08:41 +0000
210+++ debian/patches/series 2015-01-06 20:23:49 +0000
211@@ -1,2 +1,3 @@
212+fix-requirements.patch
213 patch-default-config-file.patch
214 fix-tests.patch
215
216=== modified file 'debian/watch'
217--- debian/watch 2014-10-13 18:41:14 +0000
218+++ debian/watch 2015-01-06 20:23:49 +0000
219@@ -1,3 +1,3 @@
220 version=3
221-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
222+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/" \
223 http://tarballs.openstack.org/trove trove-(\d.*)\.tar\.gz

Subscribers

People subscribed via source and target branches