Merge lp:~corey.bryant/ubuntu/trusty/python-heatclient/icehouse-3 into lp:ubuntu/trusty/python-heatclient

Proposed by Corey Bryant
Status: Approved
Approved by: Chuck Short
Approved revision: 12
Proposed branch: lp:~corey.bryant/ubuntu/trusty/python-heatclient/icehouse-3
Merge into: lp:ubuntu/trusty/python-heatclient
Diff against target: 901 lines (+838/-0) (has conflicts)
12 files modified
debian/CHANGELOG (+625/-0)
debian/changelog (+76/-0)
debian/compat (+1/-0)
debian/control (+57/-0)
debian/copyright (+28/-0)
debian/gbp.conf (+9/-0)
debian/patches/fix-tests-ubuntu.patch (+16/-0)
debian/patches/series (+1/-0)
debian/rules (+19/-0)
debian/source/format (+1/-0)
debian/watch (+4/-0)
debian/wheezy_deps (+1/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~corey.bryant/ubuntu/trusty/python-heatclient/icehouse-3
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+209795@code.launchpad.net

Description of the change

  * New upstream release.
  * debian/control: Fix Vcs-Browser and Vcs-Bzr links
  * debain/watch: Completely updated

To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

Needs work

Unmerged revisions

12. By Corey Bryant

* New upstream release.
* debian/control: Fix Vcs-Browser and Vcs-Bzr links
* debain/watch: Completely updated

11. By Chuck Short

debian/patches/fix-tests-ubuntu.patch: Skip failing test.

10. By Chuck Short

Fix typo

9. By Chuck Short

releasing package python-heatclient version 0.2.6-0ubuntu1

8. By James Page

* debian/control:
  - Open icehouse release.
  - Add new BD python-mox3, drop associated patch.

7. By James Page

* d/control: Add missing BD on python-babel.
* d/*: Wrap and sort.

6. By Chuck Short

debian/patches/disable-mox3.patch: Use mox until mox3
hits main.

5. By Chuck Short

debian/control: open icehouse release.

4. By Chuck Short

releasing package python-heatclient version 0.2.4-0ubuntu1

3. By Chuck Short

debian/control: Add python-mock as a build dependency.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== renamed directory 'debian' => 'debian.moved'
3=== added file 'debian/CHANGELOG'
4--- debian/CHANGELOG 1970-01-01 00:00:00 +0000
5+++ debian/CHANGELOG 2014-03-06 21:44:00 +0000
6@@ -0,0 +1,625 @@
7+commit 9354f84e59440e6a6eade085e964a7374c73509f
8+Author: Simon Pasquier <pasquier.simon@gmail.com>
9+Date: Tue Apr 2 17:04:16 2013 +0200
10+
11+ "heat stack-create" doesn't return the error message from server
12+
13+ Change-Id: Icef10df6547e5830abb17edf5ed8c622b3b021b5
14+ Fixes: bug #1163335
15+
16+commit 8eaba001434d85f4b9125524ebf55aa8288aa12e
17+Merge: f3a7dde 1f22278
18+Author: Jenkins <jenkins@review.openstack.org>
19+Date: Mon Apr 1 19:35:37 2013 +0000
20+
21+ Merge "Always pass username, even for --token-only"
22+
23+commit f3a7dde3c1b07113c483a6fecef5cc5a978f6573
24+Merge: 11f24ff bcd0a35
25+Author: Jenkins <jenkins@review.openstack.org>
26+Date: Mon Apr 1 19:33:10 2013 +0000
27+
28+ Merge "Display resource metadata as indented json"
29+
30+commit 11f24ff4253d0acea7b1a7cd810b091be93b5478
31+Merge: bbf58d1 58b96ef
32+Author: Jenkins <jenkins@review.openstack.org>
33+Date: Mon Apr 1 19:33:09 2013 +0000
34+
35+ Merge "Don't use human readable heading labels in tables"
36+
37+commit bbf58d1a41cf6f676e3522ea1054022c2c4aea35
38+Merge: 3740ae9 a5d6df0
39+Author: Jenkins <jenkins@review.openstack.org>
40+Date: Mon Apr 1 17:56:12 2013 +0000
41+
42+ Merge "Return the body as a string instead of an iterable."
43+
44+commit bcd0a35ba067091d27e0f21e38e92a1ee61f406f
45+Author: Steve Baker <sbaker@redhat.com>
46+Date: Wed Mar 27 16:07:56 2013 +1300
47+
48+ Display resource metadata as indented json
49+
50+ displaying as a pretty table wasn't pretty.
51+
52+ Change-Id: Ia25dd7d08b46b6b497f13707430664718f01d1cc
53+ Fixes: bug #1160689
54+
55+commit 58b96efe9545d40ba33f85afbcac07995c52abc3
56+Author: Steve Baker <sbaker@redhat.com>
57+Date: Wed Mar 27 15:59:48 2013 +1300
58+
59+ Don't use human readable heading labels in tables
60+
61+ This is in line with what other OS clients do.
62+ Fixes: bug #1160689
63+
64+ Change-Id: Icbf053bd93ecdbeeb2ea791c32199225803d09be
65+
66+commit a5d6df0630f6df4c5881071a4deebc6f2e32af79
67+Author: Steve Baker <sbaker@redhat.com>
68+Date: Wed Mar 27 16:09:18 2013 +1300
69+
70+ Return the body as a string instead of an iterable.
71+
72+ Heat REST API will never return an application/octet-stream so
73+ this removes some dead code.
74+
75+ Change-Id: Ia0d35c898ba92924ba82d50f1cfde14b299569e5
76+
77+commit 1f2227807fb0cad314b00a9dd9a27e5dc21846f6
78+Author: Steve Baker <sbaker@redhat.com>
79+Date: Wed Mar 27 16:12:55 2013 +1300
80+
81+ Always pass username, even for --token-only
82+
83+ Change-Id: I3cf164a2d6573fe1f8d3e610c859bfa5ad19aaed
84+ Fixes: bug #1160648
85+
86+commit 3740ae9fcb1ed4dc39796ceccbf0e7000be71002
87+Author: Dirk Mueller <dirk@dmllr.de>
88+Date: Fri Mar 15 17:41:41 2013 +0100
89+
90+ Allow for prettytable 0.7.x as well
91+
92+ Relax requirements to >= 0.6, < 0.8, as 0.7.x seems to
93+ work as well. Lower has been raised to 0.6 to match openstack-common/requirements
94+
95+ Change-Id: Ic8ce818016ae7d9fbfeb1548b612f8d9e8ae7c42
96+
97+commit 841ded0a5a1c0ed7ef07b7662381d623ded403c4
98+Author: Angus Salkeld <asalkeld@redhat.com>
99+Date: Thu Mar 7 15:57:44 2013 +1100
100+
101+ Remove warlock from pip-requires as it is not used
102+
103+ This is a hangover from copying from glanceclient
104+
105+ Change-Id: Id81035b5432b65e776217f6b3e7e62c4447d4541
106+ Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
107+
108+commit b6ff6d2eecdaa6840ecadd8bb30a9de1d3dad92b
109+Author: Steven Hardy <shardy@redhat.com>
110+Date: Mon Mar 4 15:53:15 2013 +0000
111+
112+ Change --disable-rollback option to --enable-rollback
113+
114+ Due to bug 1131303, the engine default is changing to disable
115+ rollback by default, so we instead need an option to allow
116+ users to enable this functionality
117+
118+ fixes bug 1144630
119+
120+ Change-Id: I509e616e20a3e4750ffcefe6e72c52e5f60445bc
121+
122+commit ec0a708c998656c1500897436cdcf3bb2a42f2b4
123+Author: Steve Baker <sbaker@redhat.com>
124+Date: Wed Feb 27 10:28:30 2013 +1300
125+
126+ Don't add 'dev' to tag_build
127+
128+ Change-Id: I3b37b4bf29fab29ffcb471b7f9f4707c8d5882fe
129+
130+commit f1baa757c38c21dfb4f6ac43670257729f958200
131+Author: Steven Hardy <shardy@redhat.com>
132+Date: Mon Feb 18 15:07:21 2013 +0000
133+
134+ heatclient : Add --disable-rollback option
135+
136+ Adds -D/--disable-rollback option to align with new heat-cfn
137+ option
138+
139+ Change-Id: I4a997df0b63d19a25f2047710809a80520187f9f
140+ Signed-off-by: Steven Hardy <shardy@redhat.com>
141+
142+commit 776f25099e90d31d05e28eb7f6fdc69b63d74478
143+Author: Steven Hardy <shardy@redhat.com>
144+Date: Mon Feb 18 13:54:42 2013 +0000
145+
146+ heatclient : correct timeout parameter name
147+
148+ The timeout parameter needs to be timeout_mins to match the
149+ engine API or the parameter will not be recognized by the
150+ engine.
151+
152+ fixes bug 1129348
153+
154+ Change-Id: I489364a2abed376f35bf2da24915db30c982e61b
155+ Signed-off-by: Steven Hardy <shardy@redhat.com>
156+
157+commit 84b7969b72af218f948078eb8ee46a97783f24de
158+Author: Dirk Mueller <dirk@dmllr.de>
159+Date: Mon Feb 11 18:01:27 2013 +0100
160+
161+ Return the exit code from tox to callers of run_tests.sh
162+
163+ Invoking PIPESTATUS appears to be volatile in my environment,
164+ after the if condition it is already again 0, even if it was
165+ non-zero before. Capture the result permanently in a variable
166+ and use that one consistently.
167+
168+ Also handle the just-pep8 case correctly.
169+
170+ Change-Id: Icca8c00c8d2189da1a133db277c9071c2d6c880b
171+
172+commit bcaf6c4d9327a221091302fea807860ae538994c
173+Author: Ian Main <imain@redhat.com>
174+Date: Thu Jan 31 15:42:24 2013 -0800
175+
176+ Add switch to disable token authentication.
177+
178+ This patch allows you to disable token authentication with keystone so
179+ that the client can be used with other backends in heat.
180+
181+ Change-Id: I4b35df82a782ddbc8532e85a7b9d532b327d010a
182+ Signed-off-by: Ian Main <imain@redhat.com>
183+
184+commit 8f268e44cdc8b8a434aa510a1c389793a1ea2872
185+Author: Angus Salkeld <asalkeld@redhat.com>
186+Date: Fri Jan 25 12:03:01 2013 +1100
187+
188+ Don't log at all if debugging is not turned on
189+
190+ Else the http module prints this out on each command - yuk
191+
192+ "INFO Starting new HTTP connection (1): 127.0.0.1"
193+
194+ Change-Id: I6e8900106051914b7ddc0a216c6a7864f4ea38e0
195+
196+commit 7f50a72aacd9e48ef682037ab11f372a52cc838a
197+Author: Steve Baker <sbaker@redhat.com>
198+Date: Thu Jan 10 11:07:06 2013 +1300
199+
200+ Fixes required for packaging
201+
202+ - Add versioninfo to the data_files
203+ - Excludes for MANIFEST.in
204+
205+ Part of blueprint rpm-package
206+ Change-Id: Ia629c9e08d070785d8ee0984913e62064e94ebb4
207+
208+commit 706cbdb57b2ed9cca29f04db0cc3700f7a04f985
209+Merge: 15be62b bc972b2
210+Author: Jenkins <jenkins@review.openstack.org>
211+Date: Wed Jan 9 20:01:11 2013 +0000
212+
213+ Merge "Switch to using version.canonical_version_string"
214+
215+commit 15be62b7f78c70829edd464cb0d209572aa040ce
216+Merge: b1b5455 712e172
217+Author: Jenkins <jenkins@review.openstack.org>
218+Date: Wed Jan 9 20:00:28 2013 +0000
219+
220+ Merge "Update to latest oslo-incubator"
221+
222+commit b1b545581dc7bec76ffb5a23a0c6fac6111e492f
223+Author: Steve Baker <sbaker@redhat.com>
224+Date: Wed Jan 9 10:51:40 2013 +1300
225+
226+ Relax the required version of prettytable.
227+
228+ Also add httplib2, iso8601.
229+
230+ Fixes bug 1090403
231+
232+ Change-Id: Ibc2bb3391754907dae9a4c705a53634926739b5b
233+
234+commit bc972b214ee03d2b04ae9fe099e3ad59fd735b4b
235+Author: Steve Baker <sbaker@redhat.com>
236+Date: Fri Jan 4 16:53:10 2013 +1300
237+
238+ Switch to using version.canonical_version_string
239+
240+ Change-Id: Id095c61325b0d64bc77b742abf72958aeb4cde4d
241+
242+commit 712e1726adcf30f48df3f855c14c2a5e80657dbe
243+Author: Steve Baker <sbaker@redhat.com>
244+Date: Fri Jan 4 16:58:11 2013 +1300
245+
246+ Update to latest oslo-incubator
247+
248+ The included changes to version.py are required for
249+ correctly generating the versioninfo file.
250+
251+ Change-Id: I3534f4de099dc6d7462d896e9b18a8f776ee4daf
252+
253+commit c7130de0a979c8adb32fd52efd41ae05456d9d55
254+Author: Steve Baker <sbaker@redhat.com>
255+Date: Tue Dec 11 13:48:55 2012 +1300
256+
257+ Display a better error message on HTTP exception
258+
259+ Instead of just getting the HTTP code, the message from the actual
260+ exception is printed to the console
261+
262+ Change-Id: I43265e1e01e3e972e444778b3058637c0e1fd441
263+
264+commit e1ce4162e48c9de2e1b4edee2d66467e6c3793e6
265+Author: Steve Baker <sbaker@redhat.com>
266+Date: Tue Dec 4 13:15:33 2012 +1300
267+
268+ Fix git repo url
269+
270+ Change-Id: I81e02b80445b4a5a277f94e01478a156e56fd071
271+
272+commit 85b8a6e7524381a58a6b8610f8133b61825e970a
273+Merge: 8179af9 03f9f84
274+Author: Jenkins <jenkins@review.openstack.org>
275+Date: Mon Dec 3 23:26:30 2012 +0000
276+
277+ Merge "Deprecate commands and add unified cli replacements."
278+
279+commit 8179af9b50ec2f82a6a28192bf756d2d3d231415
280+Merge: 400553e 727d07e
281+Author: Jenkins <jenkins@review.openstack.org>
282+Date: Mon Dec 3 23:26:04 2012 +0000
283+
284+ Merge "remove some glanceisms from the docs"
285+
286+commit 03f9f84abfa348bed08ee39d4d0ae1bc8ace5355
287+Author: Steve Baker <sbaker@redhat.com>
288+Date: Tue Dec 4 11:47:02 2012 +1300
289+
290+ Deprecate commands and add unified cli replacements.
291+
292+ This is to bring into line with
293+ http://wiki.openstack.org/UnifiedCLI/Mapping
294+
295+ Here is the mapping, as displayed by 'heat help'
296+ create DEPRECATED! Use stack-create instead
297+ delete DEPRECATED! Use stack-delete instead
298+ describe DEPRECATED! Use stack-show instead
299+ event DEPRECATED! Use event-show instead
300+ event-list List events for a stack
301+ event-show Describe the event
302+ gettemplate DEPRECATED! Use template-show instead
303+ list DEPRECATED! Use stack-list instead
304+ resource DEPRECATED! Use resource-show instead
305+ resource-list Show list of resources belonging to a stack
306+ resource-metadata List resource metadata
307+ resource-show Describe the resource
308+ stack-create Create the stack
309+ stack-delete Delete the stack
310+ stack-list List the user's stacks
311+ stack-show Describe the stack
312+ stack-update Update the stack
313+ template-show Get the template for the specified stack
314+ template-validate Validate a template with parameters
315+ update DEPRECATED! Use stack-update instead
316+ validate DEPRECATED! Use template-validate instead
317+ help Display help about this program or one of its
318+ subcommands.
319+
320+ Change-Id: I1a296de2b935be6cc28fcc49ef8ee7ae333abf1a
321+
322+commit 727d07e667b371bc4a27fe1667c47e907b5d04c4
323+Author: Steve Baker <sbaker@redhat.com>
324+Date: Tue Dec 4 11:46:40 2012 +1300
325+
326+ remove some glanceisms from the docs
327+
328+ Change-Id: Iee3eb218086d3a9810d7f7e0e92500293b90a1f1
329+
330+commit 400553ead101c4de2666e7ab5476b35a5932bc61
331+Author: Steve Baker <sbaker@redhat.com>
332+Date: Tue Dec 4 10:54:35 2012 +1300
333+
334+ add some pypi meta info
335+
336+ Change-Id: I2a7c9e015ac7af35518c2303efcf0c40e9a0f3ee
337+
338+commit 95a0894a3827f06e946c536704b20249fd52cd95
339+Author: Jeremy Stanley <fungi@yuggoth.org>
340+Date: Sun Dec 2 17:47:28 2012 +0000
341+
342+ Update .gitreview for org move.
343+
344+ * .gitreview: The python-heatclient project moved from the heat-api
345+ org to openstack, so this updates the gerrit remote URL accordingly.
346+
347+ Change-Id: I97d8433ceb61cc227ca139ec26f5e30b8daa4052
348+
349+commit 224eafa18e51853eedb28a3a22fbc87bc9a6f330
350+Merge: 2347814 3d122cf
351+Author: Jenkins <jenkins@review.openstack.org>
352+Date: Tue Nov 27 23:35:55 2012 +0000
353+
354+ Merge "Pass template as a string if it is not JSON."
355+
356+commit 23478147aa0c29d8c1bf86b76551b2bd6f3e108a
357+Author: Steve Baker <sbaker@redhat.com>
358+Date: Wed Nov 28 11:55:23 2012 +1300
359+
360+ Support for events list and details
361+
362+ This also replaces resource_id with resource_name in the
363+ resources API.
364+
365+ Change-Id: Ia5ccec5d94fb8106be2dfe89976db0fceeb73b58
366+
367+commit 97b24ccb279a4cb554b092589794e6b0902bccca
368+Author: Steve Baker <sbaker@redhat.com>
369+Date: Wed Nov 28 11:57:23 2012 +1300
370+
371+ Use python-keystoneclient 0.2 series
372+
373+ This is required to not clash with keystone git master
374+
375+ Change-Id: I775e9f1b02d4ae15323db8930b1adeb4b8296970
376+
377+commit 3d122cfb54343ce717c70d67fc0d4701927bb8ee
378+Author: Steve Baker <sbaker@redhat.com>
379+Date: Mon Nov 26 13:50:38 2012 +1300
380+
381+ Pass template as a string if it is not JSON.
382+
383+ Test for JSON is whether the first character is '{'
384+
385+ Change-Id: I109d5f12d3874517561631eefac514342761714b
386+
387+commit 03e5e7e3c19ff6fb306dd97fc9d49d3924406a9a
388+Author: Steve Baker <sbaker@redhat.com>
389+Date: Mon Nov 26 13:45:13 2012 +1300
390+
391+ Ignore heatclient/versioninfo
392+
393+ Change-Id: I862cbc8e6b37ea90d3e13bfba1e94a20819ccec6
394+
395+commit f5ffc5f254d58879686b3a48015c6788958b895e
396+Author: Steve Baker <sbaker@redhat.com>
397+Date: Tue Nov 20 11:24:02 2012 +1300
398+
399+ Implement client resource support.
400+
401+ CLI now supports commands:
402+ resource-list
403+ resource
404+ resource-metadata
405+
406+ Change-Id: I6c366279456f35e40928fc8f3654ab63ae0af6ca
407+
408+commit cfb2205a965c610abafe39ced35584be42e22717
409+Author: Dan Radez <dradez@redhat.com>
410+Date: Tue Nov 13 18:24:12 2012 -0500
411+
412+ adding test coverage for common/http, improving the redirect handling
413+
414+commit 116e1afd36585b72dcfef7ff8e9298eb2a24b169
415+Merge: b5aba71 c14e082
416+Author: Jenkins <jenkins@review.openstack.org>
417+Date: Tue Nov 13 19:53:20 2012 +0000
418+
419+ Merge "Support name or id for stack operations."
420+
421+commit b5aba716477be8083d94629cb3e759120f1afa25
422+Merge: 2122bd1 c1dbaa9
423+Author: Jenkins <jenkins@review.openstack.org>
424+Date: Tue Nov 13 19:49:09 2012 +0000
425+
426+ Merge "Pass username and password as well as token."
427+
428+commit c14e082d785d35a702e96249773e1c5ca74d28fd
429+Author: Steve Baker <sbaker@redhat.com>
430+Date: Tue Nov 13 14:07:15 2012 +1300
431+
432+ Support name or id for stack operations.
433+
434+ Includes the followig changes:
435+ - move format_parameters to common/utils.py
436+ - Separate columns for ID and Name in list pretty print table
437+ - Accept ID or Name for all operations
438+ - Fix from radaz to correctly respond to redirects
439+
440+ Change-Id: Ie2d7c03f682d43454cb1348188fa56ad001e1bb1
441+
442+commit c1dbaa986dfaed0d0b98e047632dceb98563d2f0
443+Author: Steve Baker <sbaker@redhat.com>
444+Date: Wed Nov 7 16:21:23 2012 +1300
445+
446+ Pass username and password as well as token.
447+
448+ This matches the behaviour of heat-cfn.
449+ One day Heat will support doing all operations with only a token. Today is not that day.
450+ Also add a --token-only option to suppress sending username/password.
451+
452+ Change-Id: Ib439d770e90d381ffc83babf7fca85c9f1e32e64
453+
454+commit 2122bd1753f7913464133d0e2ed4ba6f0c53bb61
455+Author: Monty Taylor <mordred@inaugust.com>
456+Date: Tue Oct 30 12:08:34 2012 +0100
457+
458+ Add .gitreview file.
459+
460+commit 0d4f3565a89a042154bb8fdf9a85c7acea036f29
461+Author: Steve Baker <sbaker@redhat.com>
462+Date: Sat Oct 27 06:53:56 2012 +1300
463+
464+ pep8 and more tests
465+
466+commit 6499a9a834efe5a9f5b0d3f286039bc182cb2f22
467+Author: Steve Baker <sbaker@redhat.com>
468+Date: Fri Oct 26 13:20:54 2012 +1300
469+
470+ - Comment out commands that don't yet have a REST API equivalent
471+ - Use Name/ID when specifying a stack
472+
473+commit 7021e3055a97bccff6062d92b539a782d7dc3561
474+Author: Steve Baker <sbaker@redhat.com>
475+Date: Thu Oct 25 16:47:39 2012 +1300
476+
477+ Feature parity with REST API
478+ - Give a nice message for 404 for non-existent stack id
479+ - implement delete, gettemplate, validate
480+ - run do_list after create, delete
481+ - don't encode the json template as a json string
482+
483+commit 801616330fcdc861be56c4c68a864dedf92fd919
484+Author: Steve Baker <sbaker@redhat.com>
485+Date: Thu Oct 25 16:44:07 2012 +1300
486+
487+ set up default logging even when not debugging
488+
489+commit 73f153570be786ab7d9bff9bac7c28614e8d7509
490+Author: Steve Baker <sbaker@redhat.com>
491+Date: Thu Oct 25 16:43:49 2012 +1300
492+
493+ Allow sort column to be specified
494+
495+commit 74a66ca04e382a21259aa2c397c1f7d1f99abfb0
496+Author: Steve Baker <sbaker@redhat.com>
497+Date: Thu Oct 25 16:43:32 2012 +1300
498+
499+ An error response shouldn't be logged as an error, since it is part of the REST API
500+
501+commit 2462f281ab1def1d2492d5216dd887e9a6e781a1
502+Author: Steve Baker <sbaker@redhat.com>
503+Date: Thu Oct 25 13:33:16 2012 +1300
504+
505+ Implement describe, and format the results
506+
507+commit 2a15eda5929fa2f43d4e8d23005c542788ce7a08
508+Author: Steve Baker <sbaker@redhat.com>
509+Date: Thu Oct 25 13:32:52 2012 +1300
510+
511+ Allow pretty_dict to take optional formatters
512+
513+commit fe8fa481c6787e800ba107e4ba400ebc736a35ec
514+Author: Steve Baker <sbaker@redhat.com>
515+Date: Tue Oct 23 16:52:23 2012 +1300
516+
517+ Shell unit tests, remove unused code, display real results from REST API
518+
519+commit 5ad7e90817f2d386eae705e6e6d157e3479f532e
520+Author: Steve Baker <sbaker@redhat.com>
521+Date: Tue Oct 23 16:50:30 2012 +1300
522+
523+ Allow labels to be specified separately from field keys
524+
525+commit a66f891e1ece389ab5dab4abe63f52ce4661f346
526+Author: Steve Baker <sbaker@redhat.com>
527+Date: Fri Oct 19 06:16:36 2012 +1000
528+
529+ resolve test template file path no matter where it is run from
530+
531+commit 675b8a4f71daba780efdaf6c800fb2cbc1b0ec1b
532+Author: Steve Baker <sbaker@redhat.com>
533+Date: Thu Oct 18 13:50:22 2012 +1000
534+
535+ Some slightly more realistic mock responses.
536+ Regexp asserts to check pretty print is printing something
537+
538+commit 231cfc4fbff2fe0f34be81fa892e742f2e9f2700
539+Author: Steve Baker <sbaker@redhat.com>
540+Date: Thu Oct 18 13:46:05 2012 +1000
541+
542+ pass the dict to print_dict
543+
544+commit b6debe5cb0621220bfedf94b28acc13c90151406
545+Author: Steve Baker <sbaker@redhat.com>
546+Date: Thu Oct 18 11:56:24 2012 +1000
547+
548+ Properly configure debug logging
549+
550+commit 317757c1646635de29b622f422432c1fc74dc6fb
551+Author: Steve Baker <sbaker@redhat.com>
552+Date: Tue Oct 16 06:51:23 2012 +1000
553+
554+ Mock at the json request level instead of the http connection level. Test create.
555+
556+commit b03183ce3fa1e7d0c505179e7cc7972b677ff36c
557+Author: Steve Baker <sbaker@redhat.com>
558+Date: Fri Oct 12 16:54:06 2012 +1300
559+
560+ setup tweaks
561+
562+commit 3c9c859e817695d3833c522ef4fcb386f70ebe60
563+Author: Steve Baker <sbaker@redhat.com>
564+Date: Fri Oct 12 16:50:43 2012 +1300
565+
566+ Get fakes and mox working so that any http request/response sequence can be
567+ test scripted
568+
569+commit 70619f8945b48dcd2ef9c115e1f1aa9a8ee32f15
570+Author: Steve Baker <sbaker@redhat.com>
571+Date: Fri Oct 12 16:49:41 2012 +1300
572+
573+ pyc files should not have been committed
574+
575+commit 4ba8e466314d18717de63980ac05b5d000e8ef19
576+Author: Steve Baker <sbaker@redhat.com>
577+Date: Thu Oct 11 13:09:56 2012 +1300
578+
579+ Format parameters for create call
580+
581+commit 622719c144c0b64a5de6854af3f8b593e7d180f1
582+Author: Steve Baker <sbaker@redhat.com>
583+Date: Wed Oct 10 12:53:05 2012 +1300
584+
585+ add some more non-functioning skeleton code
586+
587+commit afff6d66d85c30c291bfc85c91e3b69fafbb706e
588+Author: Steve Baker <sbaker@redhat.com>
589+Date: Wed Oct 10 12:52:35 2012 +1300
590+
591+ fix readme path
592+
593+commit 7cbfd721d527de8f09a7795ae64461ed0aeb7469
594+Author: Steve Baker <sbaker@redhat.com>
595+Date: Wed Oct 10 10:49:45 2012 +1300
596+
597+ Swap readme files
598+
599+commit 00cdfcb868686828ece8fe2e54d494d970e4d546
600+Merge: dddbbd9 3e82cb6
601+Author: Steve Baker <sbaker@redhat.com>
602+Date: Wed Oct 10 10:47:54 2012 +1300
603+
604+ Merge branch 'master' of https://github.com/steveb/python-heatclient
605+
606+commit dddbbd95ea588f11c2753be48111594758d48a4f
607+Author: Steve Baker <sbaker@redhat.com>
608+Date: Wed Oct 10 10:46:53 2012 +1300
609+
610+ Define CLI commands and arguments for entire API.
611+
612+ Should match the legacy client except for how resource id is specified for resource
613+ subcommand
614+
615+commit 69d70c4426f2ea0e3b6edac824886f261d984717
616+Author: Steve Baker <sbaker@redhat.com>
617+Date: Wed Oct 10 10:45:56 2012 +1300
618+
619+ initial version
620+
621+commit 1269bb20c770ca9869f54da9e1db9af7173b9809
622+Author: Steve Baker <sbaker@redhat.com>
623+Date: Wed Oct 10 08:55:03 2012 +1300
624+
625+ Initial import
626+
627+commit 3e82cb6bbc39ff48e73bb55a0f00e8ef72599dd0
628+Author: Steven Dake <sdake@redhat.com>
629+Date: Mon Oct 8 17:37:58 2012 -0700
630+
631+ first commit
632
633=== added file 'debian/changelog'
634--- debian/changelog 1970-01-01 00:00:00 +0000
635+++ debian/changelog 2014-03-06 21:44:00 +0000
636@@ -0,0 +1,76 @@
637+python-heatclient (0.2.8-0ubuntu1) trusty; urgency=medium
638+
639+ [ Chuck Short ]
640+ * debian/patches/fix-tests-ubuntu.patch: Skip failing test.
641+
642+ [ Corey Bryant ]
643+ * New upstream release.
644+ * debian/control: Fix Vcs-Browser and Vcs-Bzr links
645+ * debain/watch: Completely updated
646+
647+ -- Corey Bryant <corey.bryant@canonical.com> Thu, 06 Mar 2014 14:52:29 -0500
648+
649+python-heatclient (0.2.6-0ubuntu1) trusty; urgency=low
650+
651+ [ Chuck Short ]
652+ * New upstream release.
653+ * debian/control:
654+ - Open icehouse release.
655+ - Add new BD python-mox3, drop associated patch.
656+
657+ [ James Page ]
658+ * d/control: Add missing BD on python-babel.
659+ * d/*: Wrap and sort.
660+
661+ -- Chuck Short <zulcss@ubuntu.com> Tue, 21 Jan 2014 10:04:22 -0500
662+
663+python-heatclient (0.2.4-0ubuntu1) saucy; urgency=low
664+
665+ * New upstream release.
666+ * debian/{control,rules}: Dropped openstack-pkg-tools no longer
667+ needed.
668+ * debian/control: Add python-mock as a build dependency.
669+
670+ -- Chuck Short <zulcss@ubuntu.com> Fri, 06 Sep 2013 14:01:45 -0400
671+
672+python-heatclient (0.2.3-0ubuntu1) saucy; urgency=low
673+
674+ * New upstream release.
675+ * Enabled testsuite.
676+ * debian/control:
677+ - Dropped python-nose.
678+ - Add python-fixtures.
679+ - Add python-testscenarios.
680+ - Add python-testrepository.
681+ - Add python-testtools.
682+ - Add python-d2to1.
683+ - Add python-pbr.
684+
685+ -- Chuck Short <zulcss@ubuntu.com> Fri, 19 Jul 2013 12:27:58 -0400
686+
687+python-heatclient (0.2.2-3) unstable; urgency=low
688+
689+ [ Prach Pongpanich ]
690+ * Drop dependency on python-argparse (Closes: #710718)
691+
692+ [ Thomas Goirand ]
693+ * Make the drop of the python-argparse conditional (eg: it don't drop the
694+ dependency if building in Wheezy).
695+ * Allow the unit tests to fail if running in Wheezy (because of the lack of
696+ the python-argparse build-depends).
697+
698+ -- Prach Pongpanich <prachpub@gmail.com> Sun, 02 Jun 2013 07:01:12 +0700
699+
700+python-heatclient (0.2.2-2) unstable; urgency=low
701+
702+ * Added missing dependency python-setuptools-git (Closes: #710576), thanks to
703+ Jeremy Bicha for reporting.
704+ * Ran wrap-and-sort.
705+
706+ -- Thomas Goirand <zigo@debian.org> Sat, 01 Jun 2013 09:23:44 +0800
707+
708+python-heatclient (0.2.2-1) unstable; urgency=low
709+
710+ * Initial release. (Closes: #705231)
711+
712+ -- Prach Pongpanich <prachpub@gmail.com> Thu, 11 Apr 2013 12:03:51 +0700
713
714=== added file 'debian/compat'
715--- debian/compat 1970-01-01 00:00:00 +0000
716+++ debian/compat 2014-03-06 21:44:00 +0000
717@@ -0,0 +1,1 @@
718+9
719
720=== added file 'debian/control'
721--- debian/control 1970-01-01 00:00:00 +0000
722+++ debian/control 2014-03-06 21:44:00 +0000
723@@ -0,0 +1,57 @@
724+Source: python-heatclient
725+Section: python
726+Priority: optional
727+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
728+XSBC-Original-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
729+Uploaders:
730+ Thomas Goirand <zigo@debian.org>,
731+ Prach Pongpanich <prachpub@gmail.com>,
732+ Julien Danjou <acid@debian.org>,
733+ Ghe Rivero <ghe.rivero@stackops.com>
734+Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3~)
735+Build-Depends-Indep:
736+ lsb-release,
737+ python-babel,
738+ python-coverage,
739+ python-fixtures,
740+ python-httplib2,
741+ python-iso8601,
742+ python-keystoneclient (>= 1:0.2),
743+ python-mock,
744+ python-mox,
745+ python-mox3,
746+ python-pbr,
747+ python-prettytable (<< 0.8),
748+ python-prettytable (>= 0.5),
749+ python-setuptools (>= 0.6.24),
750+ python-setuptools-git,
751+ python-testscenarios,
752+ python-testtools,
753+ python-yaml,
754+ testrepository
755+Standards-Version: 3.9.4
756+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-heatclient/icehouse/files
757+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/python-heatclient/icehouse
758+
759+Package: python-heatclient
760+Architecture: all
761+Pre-Depends: dpkg (>= 1.15.6~)
762+Depends:
763+ python (>= 2.7),
764+ python-httplib2,
765+ python-iso8601,
766+ python-keystoneclient (>= 1:0.2),
767+ python-pkg-resources,
768+ python-prettytable (<< 0.8),
769+ python-prettytable (>= 0.5),
770+ ${misc:Depends},
771+ ${python:Depends},
772+ ${wheezy-added-deps}
773+Description: client library and CLI for OpenStack Heat
774+ Heat is a service to orchestrate multiple composite cloud applications
775+ using templates, through both an OpenStack-native ReST API and
776+ a CloudFormation-compatible Query API.
777+ .
778+ This is a client for the OpenStack Heat API. There's a Python API (the
779+ heatclient module), and a command-line script (heat). Each implements 100% of
780+ the OpenStack Heat API.
781
782=== added file 'debian/copyright'
783--- debian/copyright 1970-01-01 00:00:00 +0000
784+++ debian/copyright 2014-03-06 21:44:00 +0000
785@@ -0,0 +1,28 @@
786+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
787+Upstream-Name: python-heatclient
788+Source: https://github.com/openstack/python-heatclient
789+
790+Files: debian/*
791+Copyright: (c) 2012-2013, Prach Pongpanich <prachpub@gmail.com>
792+ (c) 2013, Thomas Goirand <zigo@debian.org>
793+License: Apache-2
794+
795+Files: *
796+Copyright: 2013, Openstack LLC
797+License: Apache-2
798+
799+License: Apache-2
800+ Licensed under the Apache License, Version 2.0 (the "License");
801+ you may not use this file except in compliance with the License.
802+ You may obtain a copy of the License at
803+ .
804+ http://www.apache.org/licenses/LICENSE-2.0
805+ .
806+ Unless required by applicable law or agreed to in writing, software
807+ distributed under the License is distributed on an "AS IS" BASIS,
808+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
809+ See the License for the specific language governing permissions and
810+ limitations under the License.
811+ .
812+ On Debian-based systems the full text of the Apache version 2.0 license
813+ can be found in `/usr/share/common-licenses/Apache-2.0'.
814
815=== added file 'debian/gbp.conf'
816--- debian/gbp.conf 1970-01-01 00:00:00 +0000
817+++ debian/gbp.conf 2014-03-06 21:44:00 +0000
818@@ -0,0 +1,9 @@
819+[DEFAULT]
820+upstream-branch = master
821+debian-branch = debian/unstable
822+upstream-tag = %(version)s
823+compression = xz
824+
825+[git-buildpackage]
826+export-dir = ../build-area/
827+cleaner = true
828
829=== added directory 'debian/patches'
830=== added file 'debian/patches/fix-tests-ubuntu.patch'
831--- debian/patches/fix-tests-ubuntu.patch 1970-01-01 00:00:00 +0000
832+++ debian/patches/fix-tests-ubuntu.patch 2014-03-06 21:44:00 +0000
833@@ -0,0 +1,16 @@
834+Description: Skip test because it fails in the lab.
835+Author: Chuck Short <zulcss@ubuntu.com>
836+Forwarded: Not needed.
837+diff --git a/heatclient/tests/test_template_utils.py b/heatclient/tests/test_template_utils.py
838+index 6073e9d..46a2429 100644
839+--- a/heatclient/tests/test_template_utils.py
840++++ b/heatclient/tests/test_template_utils.py
841+@@ -463,6 +463,7 @@ class TestURLFunctions(testtools.TestCase):
842+ self.addCleanup(self.m.UnsetStubs)
843+
844+ def test_normalise_file_path_to_url_relative(self):
845++ self.skipTest('Skipped by Ubuntu')
846+ self.assertEqual(
847+ 'file://%s/foo' % os.getcwd(),
848+ template_utils.normalise_file_path_to_url(
849+
850
851=== added file 'debian/patches/series'
852--- debian/patches/series 1970-01-01 00:00:00 +0000
853+++ debian/patches/series 2014-03-06 21:44:00 +0000
854@@ -0,0 +1,1 @@
855+fix-tests-ubuntu.patch
856
857=== added file 'debian/rules'
858--- debian/rules 1970-01-01 00:00:00 +0000
859+++ debian/rules 2014-03-06 21:44:00 +0000
860@@ -0,0 +1,19 @@
861+#!/usr/bin/make -f
862+
863+#export DH_VERBOSE=1
864+
865+
866+%:
867+ dh $@ --with python2
868+
869+override_dh_auto_clean:
870+ dh_auto_clean
871+ rm -f heatclient/versioninfo
872+ rm -rf setuptools_git-*-py*.egg/
873+
874+override_dh_install:
875+ dh_install
876+ rm -rf $(CURDIR)/debian/python-heatclient/usr/heatclient
877+
878+override_dh_auto_test:
879+ testr init && testr run
880
881=== added directory 'debian/source'
882=== added file 'debian/source/format'
883--- debian/source/format 1970-01-01 00:00:00 +0000
884+++ debian/source/format 2014-03-06 21:44:00 +0000
885@@ -0,0 +1,1 @@
886+3.0 (quilt)
887
888=== added file 'debian/watch'
889--- debian/watch 1970-01-01 00:00:00 +0000
890+++ debian/watch 2014-03-06 21:44:00 +0000
891@@ -0,0 +1,4 @@
892+version=3
893+opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-heatclient/+download https://launchpad.net/python-heatclient/.*/.*/.*/python-heatclient-(.*)\.tar\.gz
894+http://tarballs.openstack.org/python-heatclient/ python-heatclient-(\d.*).tar.gz
895+http://pypi.python.org/packages/source/p/python-heatclient/python-heatclient-(.*).tar.gz
896
897=== added file 'debian/wheezy_deps'
898--- debian/wheezy_deps 1970-01-01 00:00:00 +0000
899+++ debian/wheezy_deps 2014-03-06 21:44:00 +0000
900@@ -0,0 +1,1 @@
901+wheezy-added-deps= python-argparse

Subscribers

People subscribed via source and target branches

to all changes: