Merge lp:~corey.bryant/heat/2014.2-rc1 into lp:~ubuntu-server-dev/heat/juno

Proposed by Corey Bryant on 2014-10-02
Status: Merged
Merged at revision: 73
Proposed branch: lp:~corey.bryant/heat/2014.2-rc1
Merge into: lp:~ubuntu-server-dev/heat/juno
Diff against target: 282 lines (+98/-73)
5 files modified
debian/changelog (+10/-0)
debian/control (+86/-55)
debian/patches/fix-requirements.patch (+0/-16)
debian/rules (+1/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/heat/2014.2-rc1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-10-02 Pending
Review via email: mp+236916@code.launchpad.net
To post a comment you must log in.
lp:~corey.bryant/heat/2014.2-rc1 updated on 2014-10-05
73. By Corey Bryant on 2014-10-05

* New upstream release candidate:
  - d/watch: Change path.
  - d/control: Align requirements with rc1.
  - d/rules: Enable tests.
  - d/patch/fix-requirements.patch: Align requirements with Ubuntu.

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-09-08 13:41:01 +0000
3+++ debian/changelog 2014-10-05 02:14:58 +0000
4@@ -1,3 +1,13 @@
5+heat (2014.2~rc1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * New upstream release candidate:
8+ - d/watch: Change path.
9+ - d/control: Align requirements with rc1.
10+ - d/rules: Enable tests.
11+ - d/patch/fix-requirements.patch: Align requirements with Ubuntu.
12+
13+ -- Corey Bryant <corey.bryant@canonical.com> Thu, 02 Oct 2014 05:59:15 -0400
14+
15 heat (2014.2~b3-0ubuntu1) utopic; urgency=medium
16
17 * New upstream version.
18
19=== modified file 'debian/control'
20--- debian/control 2014-07-25 14:08:16 +0000
21+++ debian/control 2014-10-05 02:14:58 +0000
22@@ -12,54 +12,64 @@
23 Build-Depends:
24 debhelper (>= 9),
25 python-all (>= 2.6.6-3~),
26- python-pbr (>= 0.5.21),
27+ python-pbr (>= 0.6),
28 Build-Depends-Indep:
29- python-babel,
30+ python-alembic,
31+ python-babel (>= 1.3),
32 python-boto (>= 2.4),
33- python-ceilometerclient,
34- python-cinderclient,
35- python-coverage,
36- python-crypto,
37- python-eventlet (>= 0.12.0),
38+ python-ceilometerclient (>= 1.0.6),
39+ python-cinderclient (>= 1:1.0.7),
40+ python-coverage (>= 3.6),
41+ python-crypto (>= 2.6),
42+ python-eventlet (>= 0.13.0),
43 python-extras,
44- python-glanceclient,
45+ python-glanceclient (>= 1:0.14.0),
46 python-greenlet (>= 0.3.2),
47- python-heatclient,
48- python-httplib2,
49- python-iso8601,
50- python-keystoneclient (>= 1:0.2.3),
51- python-kombu,
52+ python-hacking (>= 0.8.0),
53+ python-heatclient (>= 0.2.9),
54+ python-httplib2 (>= 0.7.5),
55+ python-iso8601 (>= 0.1.9),
56+ python-keystoneclient (>= 1:0.10.0),
57+ python-keystonemiddleware (>= 1.0.0),
58+ python-kombu (>=2.4.8),
59 python-lockfile (>= 0.8),
60 python-lxml (>= 2.3),
61 python-memcache,
62- python-migrate,
63- python-mox,
64- python-netaddr,
65- python-neutronclient (>= 1:2.2.0),
66- python-novaclient,
67- python-oslo.config,
68- python-oslo.messaging,
69- python-oslosphinx,
70- python-oslotest,
71+ python-migrate (>= 0.9.1),
72+ python-mock (>= 1.0),
73+ python-mox (>= 0.5.3),
74+ python-mysqldb,
75+ python-netaddr (>= 0.7.12),
76+ python-neutronclient (>= 1:2.3.6),
77+ python-novaclient (>= 1:2.18.0),
78+ python-oslo.config (>= 1:1.4.0),
79+ python-oslo.db (>= 1.0.0),
80+ python-oslo.i18n (>= 1.0.0),
81+ python-oslo.messaging (>= 1.4.0),
82+ python-oslo.utils (>= 1.0.0),
83+ python-oslosphinx (>= 2.2.0),
84+ python-oslotest (>= 1:1.1.0),
85 python-posix-ipc,
86 python-paramiko,
87 python-paste,
88- python-pastedeploy,
89- python-requests,
90- python-routes,
91+ python-pastedeploy (>= 1.5.0),
92+ python-psycopg2,
93+ python-requests (>= 1.2.1),
94+ python-routes (>= 1.12.3),
95+ python-saharaclient (>= 0.7.3),
96 python-setuptools,
97- python-stevedore,
98- python-six,
99- python-sphinx,
100- python-sqlalchemy (>= 0.7.8),
101- python-swiftclient,
102- python-testrepository (>= 0.0.13),
103- python-testscenarios,
104- python-testtools (>= 0.9.29),
105- python-troveclient,
106+ python-stevedore (>= 1.0.0),
107+ python-six (>= 1.7.0),
108+ python-sphinx (>= 1.1.2),
109+ python-sqlalchemy (>= 0.8.4),
110+ python-swiftclient (>= 2.2.0),
111+ python-testrepository (>= 0.0.18),
112+ python-testscenarios (>= 0.4),
113+ python-testtools (>= 0.9.34),
114+ python-troveclient (>= 1:1.0.4),
115 python-webob (>= 1.2.3),
116- python-yaml,
117- testrepository (>= 0.0.13)
118+ python-yaml (>= 3.1.0),
119+ testrepository (>= 0.0.18),
120 Standards-Version: 3.9.4
121 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/juno/files
122 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/heat/juno
123@@ -70,34 +80,55 @@
124 Section: python
125 Architecture: all
126 Depends:
127- python-argparse,
128+ python-alembic,
129+ python-babel (>= 1.3),
130 python-boto (>= 2.4),
131- python-cinderclient,
132- python-crypto,
133- python-eventlet (>= 0.12.0),
134+ python-ceilometerclient (>= 1.0.6),
135+ python-cinderclient (>= 1:1.0.7),
136+ python-coverage (>= 3.6),
137+ python-crypto (>= 2.6),
138+ python-eventlet (>= 0.13.0),
139 python-extras,
140- python-glanceclient,
141+ python-glanceclient (>= 1:0.14.0),
142 python-greenlet (>= 0.3.2),
143- python-httplib2,
144- python-iso8601,
145- python-keystoneclient (>= 1:0.2.3),
146- python-kombu,
147+ python-httplib2 (>= 0.7.5),
148+ python-iso8601 (>= 0.1.9),
149+ python-hacking (>= 0.8.0),
150+ python-heatclient (>= 0.2.9),
151+ python-keystoneclient (>= 1:0.10.0),
152+ python-keystonemiddleware (>= 1.0.0),
153+ python-kombu (>=2.4.8),
154+ python-lockfile (>= 0.8),
155 python-lxml (>= 2.3),
156 python-memcache,
157- python-migrate,
158+ python-migrate (>= 0.9.1),
159 python-mysqldb,
160- python-neutronclient (>= 1:2.2.0),
161- python-novaclient,
162- python-oslo.config,
163+ python-netaddr (>= 0.7.12),
164+ python-neutronclient (>= 1:2.3.6),
165+ python-novaclient (>= 1:2.18.0),
166+ python-oslo.config (>= 1:1.4.0),
167+ python-oslo.db (>= 1.0.0),
168+ python-oslo.i18n (>= 1.0.0),
169+ python-oslo.messaging (>= 1.4.0),
170+ python-oslo.utils (>= 1.0.0),
171+ python-oslosphinx (>= 2.2.0),
172 python-paste,
173- python-pastedeploy,
174- python-routes,
175+ python-pastedeploy (>= 1.5.0),
176+ python-pbr (>= 0.6),
177+ python-posix-ipc,
178+ python-psycopg2,
179+ python-requests (>= 1.2.1),
180+ python-routes (>= 1.12.3),
181+ python-saharaclient (>= 0.7.3),
182 python-setuptools,
183- python-six,
184- python-sqlalchemy (>= 0.7.8),
185- python-swiftclient,
186+ python-six (>= 1.7.0),
187+ python-sphinx (>= 1.1.2),
188+ python-sqlalchemy (>= 0.8.4),
189+ python-stevedore (>= 1.0.0),
190+ python-swiftclient (>= 2.2.0),
191+ python-troveclient (>= 1:1.0.4),
192 python-webob (>= 1.2.3),
193- python-yaml,
194+ python-yaml (>= 3.1.0),
195 ${misc:Depends},
196 ${python:Depends}
197 Description: OpenStack orchestration service - Python files
198
199=== added file 'debian/patches/fix-requirements.patch'
200--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
201+++ debian/patches/fix-requirements.patch 2014-10-05 02:14:58 +0000
202@@ -0,0 +1,37 @@
203+--- a/requirements.txt
204++++ b/requirements.txt
205+@@ -3,9 +3,8 @@
206+ # process, which may cause wedges in the gate later.
207+
208+ pbr>=0.6,!=0.7,<1.0
209+-argparse
210+ Babel>=1.3
211+-eventlet>=0.15.1
212++eventlet>=0.13.0
213+ greenlet>=0.3.2
214+ httplib2>=0.7.5
215+ iso8601>=0.1.9
216+@@ -32,9 +31,8 @@
217+ python-swiftclient>=2.2.0
218+ python-troveclient>=1.0.4
219+ PyYAML>=3.1.0
220+-qpid-python
221+ requests>=1.2.1,!=2.4.0
222+-Routes>=1.12.3,!=2.0
223++Routes>=1.12.3
224+ six>=1.7.0
225+ SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
226+ sqlalchemy-migrate>=0.9.1,!=0.9.2
227+--- a/test-requirements.txt
228++++ b/test-requirements.txt
229+@@ -3,9 +3,8 @@
230+ # process, which may cause wedges in the gate later.
231+
232+ # Hacking already pins down pep8, pyflakes and flake8
233+-hacking>=0.8.0,<0.9
234++hacking>=0.8.0
235+ coverage>=3.6
236+-discover
237+ lockfile>=0.8
238+ mock>=1.0
239+ mox>=0.5.3
240
241=== removed file 'debian/patches/fix-requirements.patch'
242--- debian/patches/fix-requirements.patch 2014-07-21 13:15:33 +0000
243+++ debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
244@@ -1,16 +0,0 @@
245-diff --git a/requirements.txt b/requirements.txt
246-index 7c0c207..180f257 100644
247---- a/requirements.txt
248-+++ b/requirements.txt
249-@@ -23,9 +23,8 @@ python-novaclient>=2.17.0
250- python-swiftclient>=2.0.2
251- python-troveclient>=1.0.4
252- PyYAML>=3.1.0
253--qpid-python
254- requests>=1.1
255--Routes>=1.12.3,!=2.0
256-+Routes>=1.12.3
257- six>=1.7.0
258- SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
259- sqlalchemy-migrate>=0.9.1
260-
261
262=== modified file 'debian/rules'
263--- debian/rules 2014-08-06 17:15:26 +0000
264+++ debian/rules 2014-10-05 02:14:58 +0000
265@@ -7,7 +7,7 @@
266
267 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
268 override_dh_auto_test:
269- testr init && testr run || true
270+ testr init && testr run
271 endif
272
273 override_dh_clean:
274
275=== modified file 'debian/watch'
276--- debian/watch 2013-08-08 13:55:17 +0000
277+++ debian/watch 2014-10-05 02:14:58 +0000
278@@ -1,3 +1,3 @@
279 version=3
280 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
281- https://launchpad.net/heat/+download https://launchpad.net/heat/.*/.*/.*/heat-(.*)\.tar\.gz
282+ http://tarballs.openstack.org/heat heat-(.*)\.tar\.gz

Subscribers

People subscribed via source and target branches