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

Proposed by Corey Bryant on 2014-12-19
Status: Merged
Approved by: Chuck Short on 2015-01-06
Approved revision: 83
Merged at revision: 83
Proposed branch: lp:~corey.bryant/heat/2015.1-b1
Merge into: lp:~ubuntu-server-dev/heat/kilo
Diff against target: 292 lines (+89/-42)
8 files modified
debian/changelog (+13/-2)
debian/control (+31/-29)
debian/patches/default-log-dir.patch (+2/-2)
debian/patches/fix-requirements.patch (+6/-6)
debian/patches/remove-gettextutils-import.patch (+31/-0)
debian/patches/series (+2/-1)
debian/rules (+3/-1)
debian/watch (+1/-1)
To merge this branch: bzr merge lp:~corey.bryant/heat/2015.1-b1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-12-19 Pending
Review via email: mp+245251@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-11-21 14:56:07 +0000
3+++ debian/changelog 2015-01-05 20:56:20 +0000
4@@ -1,5 +1,6 @@
5-heat (2014.2-0ubuntu2) UNRELEASED; urgency=medium
6+heat (2015.1~b1-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ Chuck Short ]
9 * Open up for vivid.
10 * debian/control: Update bzr branch.
11 * debian/control: Add python-saharaclient,
12@@ -8,7 +9,17 @@
13 * debian/patches/skip-tests.patch: Updated to skip more tests.
14 * debian/rules: Skip integration tests.
15
16- -- Chuck Short <zulcss@ubuntu.com> Tue, 28 Oct 2014 10:00:07 -0400
17+ [ Corey Bryant ]
18+ * New upstream release.
19+ - d/control: Align requirements with upstream.
20+ - d/watch: Update uversionmangle for kilo beta naming.
21+ - d/rules: Generate heat.conf.sample and apply patch before copy.
22+ - d/rules: Run base tests instead of integration tests.
23+ - d/p/fix-requirements.patch: Refreshed.
24+ - d/p/remove-gettextutils-import.patch: Cherry picked from master.
25+ * d/control: Bumped Standards-Version to 3.9.6.
26+
27+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 19 Dec 2014 17:16:01 -0500
28
29 heat (2014.2-0ubuntu1) utopic; urgency=medium
30
31
32=== modified file 'debian/control'
33--- debian/control 2014-11-19 18:03:00 +0000
34+++ debian/control 2015-01-05 20:56:20 +0000
35@@ -18,20 +18,20 @@
36 python-babel (>= 1.3),
37 python-boto (>= 2.4),
38 python-ceilometerclient (>= 1.0.6),
39- python-cinderclient (>= 1:1.0.7),
40+ python-cinderclient (>= 1:1.1.0),
41 python-coverage (>= 3.6),
42 python-crypto (>= 2.6),
43- python-eventlet (>= 0.13.0),
44+ python-eventlet (>= 0.15.2),
45 python-extras,
46- python-glanceclient (>= 1:0.14.0),
47+ python-glanceclient (>= 1:0.15.0),
48 python-greenlet (>= 0.3.2),
49 python-hacking (>= 0.8.0),
50 python-heatclient (>= 0.2.9),
51 python-httplib2 (>= 0.7.5),
52 python-iso8601 (>= 0.1.9),
53- python-keystoneclient (>= 1:0.10.0),
54+ python-keystoneclient (>= 1:0.11.1),
55 python-keystonemiddleware (>= 1.0.0),
56- python-kombu (>=2.4.8),
57+ python-kombu (>=2.5.0),
58 python-lockfile (>= 0.8),
59 python-lxml (>= 2.3),
60 python-memcache,
61@@ -42,14 +42,14 @@
62 python-netaddr (>= 0.7.12),
63 python-neutronclient (>= 1:2.3.6),
64 python-novaclient (>= 1:2.18.0),
65- python-osprofiler,
66- python-oslo.middleware,
67- python-oslo.serialization,
68+ python-osprofiler (>= 0.3.0),
69+ python-oslo.middleware (>= 0.1.0),
70+ python-oslo.serialization (>= 1.0.0),
71 python-oslo.config (>= 1:1.4.0),
72- python-oslo.db (>= 1.0.0),
73+ python-oslo.db (>= 1.1.0),
74 python-oslo.i18n (>= 1.0.0),
75 python-oslo.messaging (>= 1.4.0),
76- python-oslo.utils (>= 1.0.0),
77+ python-oslo.utils (>= 1.1.0),
78 python-oslosphinx (>= 2.2.0),
79 python-oslotest (>= 1:1.1.0),
80 python-posix-ipc,
81@@ -57,25 +57,24 @@
82 python-paste,
83 python-pastedeploy (>= 1.5.0),
84 python-psycopg2,
85- python-requests (>= 1.2.1),
86+ python-requests (>= 2.2.0),
87 python-routes (>= 1.12.3),
88- python-saharaclient (>= 0.7.3),
89+ python-saharaclient (>= 0.7.6),
90 python-setuptools,
91- python-saharaclient,
92- python-stevedore (>= 1.0.0),
93+ python-stevedore (>= 1.1.0),
94 python-six (>= 1.7.0),
95 python-sphinx (>= 1.1.2),
96- python-sqlalchemy (>= 0.8.4),
97+ python-sqlalchemy (>= 0.9.7),
98 python-swiftclient (>= 2.2.0),
99 python-testrepository (>= 0.0.18),
100 python-testscenarios (>= 0.4),
101 python-testtools (>= 0.9.34),
102- python-troveclient (>= 1:1.0.4),
103+ python-troveclient (>= 1:1.0.7),
104 python-webob (>= 1.2.3),
105 python-yaml (>= 3.1.0),
106 subunit,
107 testrepository (>= 0.0.18),
108-Standards-Version: 3.9.4
109+Standards-Version: 3.9.6
110 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/heat/kilo/files
111 Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/heat/kilo
112 Homepage: http://wiki.openstack.org/Heat
113@@ -89,20 +88,20 @@
114 python-babel (>= 1.3),
115 python-boto (>= 2.4),
116 python-ceilometerclient (>= 1.0.6),
117- python-cinderclient (>= 1:1.0.7),
118+ python-cinderclient (>= 1:1.1.0),
119 python-coverage (>= 3.6),
120 python-crypto (>= 2.6),
121- python-eventlet (>= 0.13.0),
122+ python-eventlet (>= 0.15.2),
123 python-extras,
124- python-glanceclient (>= 1:0.14.0),
125+ python-glanceclient (>= 1:0.15.0),
126 python-greenlet (>= 0.3.2),
127 python-httplib2 (>= 0.7.5),
128 python-iso8601 (>= 0.1.9),
129 python-hacking (>= 0.8.0),
130 python-heatclient (>= 0.2.9),
131- python-keystoneclient (>= 1:0.10.0),
132+ python-keystoneclient (>= 1:0.11.1),
133 python-keystonemiddleware (>= 1.0.0),
134- python-kombu (>=2.4.8),
135+ python-kombu (>=2.5.0),
136 python-lockfile (>= 0.8),
137 python-lxml (>= 2.3),
138 python-memcache,
139@@ -111,27 +110,30 @@
140 python-netaddr (>= 0.7.12),
141 python-neutronclient (>= 1:2.3.6),
142 python-novaclient (>= 1:2.18.0),
143+ python-osprofiler (>= 0.3.0),
144 python-oslo.config (>= 1:1.4.0),
145- python-oslo.db (>= 1.0.0),
146+ python-oslo.db (>= 1.1.0),
147 python-oslo.i18n (>= 1.0.0),
148 python-oslo.messaging (>= 1.4.0),
149- python-oslo.utils (>= 1.0.0),
150+ python-oslo.middleware (>= 0.1.0),
151+ python-oslo.serialization (>= 1.0.0),
152+ python-oslo.utils (>= 1.1.0),
153 python-oslosphinx (>= 2.2.0),
154 python-paste,
155 python-pastedeploy (>= 1.5.0),
156 python-pbr (>= 0.6),
157 python-posix-ipc,
158 python-psycopg2,
159- python-requests (>= 1.2.1),
160+ python-requests (>= 2.2.0),
161 python-routes (>= 1.12.3),
162- python-saharaclient (>= 0.7.3),
163+ python-saharaclient (>= 0.7.6),
164 python-setuptools,
165 python-six (>= 1.7.0),
166 python-sphinx (>= 1.1.2),
167- python-sqlalchemy (>= 0.8.4),
168- python-stevedore (>= 1.0.0),
169+ python-sqlalchemy (>= 0.9.7),
170+ python-stevedore (>= 1.1.0),
171 python-swiftclient (>= 2.2.0),
172- python-troveclient (>= 1:1.0.4),
173+ python-troveclient (>= 1:1.0.7),
174 python-webob (>= 1.2.3),
175 python-yaml (>= 3.1.0),
176 ${misc:Depends},
177
178=== modified file 'debian/patches/default-log-dir.patch'
179--- debian/patches/default-log-dir.patch 2014-10-09 15:38:53 +0000
180+++ debian/patches/default-log-dir.patch 2015-01-05 20:56:20 +0000
181@@ -1,5 +1,5 @@
182---- a/etc/heat/heat.conf.sample
183-+++ b/etc/heat/heat.conf.sample
184+--- etc/heat/heat.conf.sample
185++++ etc/heat/heat.conf.sample
186 @@ -505,7 +505,7 @@
187 # (Optional) The base directory used for relative --log-file
188 # paths. (string value)
189
190=== modified file 'debian/patches/fix-requirements.patch'
191--- debian/patches/fix-requirements.patch 2014-11-19 18:03:00 +0000
192+++ debian/patches/fix-requirements.patch 2015-01-05 20:56:20 +0000
193@@ -1,8 +1,6 @@
194-diff --git a/requirements.txt b/requirements.txt
195-index 61e4a31..a63133a 100644
196 --- a/requirements.txt
197 +++ b/requirements.txt
198-@@ -35,9 +35,8 @@ python-saharaclient>=0.7.5
199+@@ -35,11 +35,10 @@
200 python-swiftclient>=2.2.0
201 python-troveclient>=1.0.7
202 PyYAML>=3.1.0
203@@ -11,6 +9,8 @@
204 -Routes>=1.12.3,!=2.0
205 +Routes>=1.12.3
206 six>=1.7.0
207- SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
208- sqlalchemy-migrate>=0.9.1,!=0.9.2
209-
210+ SQLAlchemy>=0.9.7,<=0.9.99
211+-sqlalchemy-migrate>=0.9.1,!=0.9.2
212++sqlalchemy-migrate>=0.9.1
213+ stevedore>=1.1.0 # Apache-2.0
214+ WebOb>=1.2.3
215
216=== added file 'debian/patches/remove-gettextutils-import.patch'
217--- debian/patches/remove-gettextutils-import.patch 1970-01-01 00:00:00 +0000
218+++ debian/patches/remove-gettextutils-import.patch 2015-01-05 20:56:20 +0000
219@@ -0,0 +1,31 @@
220+From 213ed63a240e04cdbf757a7379a69b47452113b6 Mon Sep 17 00:00:00 2001
221+From: Tetiana Lashchova <tlashchova@mirantis.com>
222+Date: Fri, 19 Dec 2014 16:19:55 +0200
223+Subject: [PATCH] Remove gettextutils import
224+
225+Change-Id: I48846926cc5eb2a1f81db6a2becb310bdf61daa7
226+Closes-Bug: #1404206
227+---
228+ heat/openstack/common/config/generator.py | 3 ---
229+ 1 file changed, 3 deletions(-)
230+
231+diff --git a/heat/openstack/common/config/generator.py b/heat/openstack/common/config/generator.py
232+index 43113b3..0bf9849 100644
233+--- a/heat/openstack/common/config/generator.py
234++++ b/heat/openstack/common/config/generator.py
235+@@ -31,12 +31,9 @@ from oslo.config import cfg
236+ import six
237+ import stevedore.named
238+
239+-from heat.openstack.common import gettextutils
240+ from heat.common import i18n
241+ from heat.openstack.common import importutils
242+
243+-gettextutils.install('heat')
244+-
245+ STROPT = "StrOpt"
246+ BOOLOPT = "BoolOpt"
247+ INTOPT = "IntOpt"
248+--
249+2.1.0
250+
251
252=== modified file 'debian/patches/series'
253--- debian/patches/series 2014-07-21 09:40:58 +0000
254+++ debian/patches/series 2015-01-05 20:56:20 +0000
255@@ -1,4 +1,5 @@
256+remove-gettextutils-import.patch
257 #default-sqlite.patch
258 fix-requirements.patch
259 sudoers_patch.patch
260-default-log-dir.patch
261+#default-log-dir.patch
262
263=== modified file 'debian/rules'
264--- debian/rules 2014-11-21 14:56:07 +0000
265+++ debian/rules 2015-01-05 20:56:20 +0000
266@@ -11,7 +11,7 @@
267 testr init && \
268 set -e && \
269 TEMP_REZ=`mktemp -t` && \
270- testr run --testr-args='--concurrency=1 ^heat_integrationtests' --subunit | tee $$TEMP_REZ | subunit2pyunit; \
271+ testr run --subunit '^(?!heat_integrationtests)' | tee $$TEMP_REZ | subunit2pyunit; \
272 rm -f $$TEMP_REZ
273 endif
274
275@@ -25,6 +25,8 @@
276 rm -f etc/heat/heat.conf
277
278 override_dh_install:
279+ bash tools/config/generate_sample.sh -b . -p heat -o etc/heat
280+ patch -p0 < debian/patches/default-log-dir.patch
281 cp etc/heat/heat.conf.sample etc/heat/heat.conf
282 dh_install
283
284
285=== modified file 'debian/watch'
286--- debian/watch 2014-10-09 15:00:05 +0000
287+++ debian/watch 2015-01-05 20:56:20 +0000
288@@ -1,3 +1,3 @@
289 version=3
290-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
291+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/" \
292 http://tarballs.openstack.org/heat heat-(\d.*)\.tar\.gz

Subscribers

People subscribed via source and target branches