Merge ~jadonn/ubuntu/+source/placement:master into ~ubuntu-openstack-dev/ubuntu/+source/placement:master
- Git
- lp:~jadonn/ubuntu/+source/placement
- master
- Merge into master
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | e91d16dbe666ba22a69e2e23ea9e77d7fdfb09f3 |
Proposed branch: | ~jadonn/ubuntu/+source/placement:master |
Merge into: | ~ubuntu-openstack-dev/ubuntu/+source/placement:master |
Diff against target: |
439 lines (+158/-128) 13 files modified
.zuul.yaml (+4/-0) ChangeLog (+9/-0) PKG-INFO (+64/-61) debian/changelog (+6/-0) debian/patches/install-missing-db-files.patch (+3/-1) openstack_placement.egg-info/PKG-INFO (+64/-61) openstack_placement.egg-info/entry_points.txt (+1/-0) openstack_placement.egg-info/pbr.json (+1/-1) releasenotes/source/victoria.rst (+1/-1) releasenotes/source/wallaby.rst (+1/-1) releasenotes/source/xena.rst (+1/-1) releasenotes/source/yoga.rst (+1/-1) setup.cfg (+2/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu OpenStack uploaders | Pending | ||
Review via email:
|
Commit message
Description of the change
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 | diff --git a/.zuul.yaml b/.zuul.yaml |
2 | index dcee77e..7650d67 100644 |
3 | --- a/.zuul.yaml |
4 | +++ b/.zuul.yaml |
5 | @@ -43,6 +43,8 @@ |
6 | - ^tox.ini$ |
7 | - grenade: |
8 | irrelevant-files: *gate-irrelevant-files |
9 | + - grenade-skip-level: |
10 | + irrelevant-files: *gate-irrelevant-files |
11 | - tempest-ipv6-only: |
12 | irrelevant-files: *gate-irrelevant-files |
13 | gate: |
14 | @@ -55,6 +57,8 @@ |
15 | irrelevant-files: *gate-irrelevant-files |
16 | - grenade: |
17 | irrelevant-files: *gate-irrelevant-files |
18 | + - grenade-skip-level: |
19 | + irrelevant-files: *gate-irrelevant-files |
20 | - tempest-ipv6-only: |
21 | irrelevant-files: *gate-irrelevant-files |
22 | periodic-weekly: |
23 | diff --git a/ChangeLog b/ChangeLog |
24 | index da58129..1d54708 100644 |
25 | --- a/ChangeLog |
26 | +++ b/ChangeLog |
27 | @@ -1,7 +1,16 @@ |
28 | CHANGES |
29 | ======= |
30 | |
31 | +11.0.0.0rc1 |
32 | +----------- |
33 | + |
34 | +* reno: Update master for unmaintained/xena |
35 | +* reno: Update master for unmaintained/wallaby |
36 | +* reno: Update master for unmaintained/victoria |
37 | +* reno: Update master for unmaintained/yoga |
38 | +* Add upgrade job from 2023.1 |
39 | * Bump hacking |
40 | +* Update python classifier in setup.cfg |
41 | * Add job to test with SQLAlchemy master (2.x) |
42 | * db: Wrap raw SQL query in sqlalchemy.text |
43 | * Update master for stable/2023.2 |
44 | diff --git a/PKG-INFO b/PKG-INFO |
45 | index 4a1418a..a22548d 100644 |
46 | --- a/PKG-INFO |
47 | +++ b/PKG-INFO |
48 | @@ -1,15 +1,75 @@ |
49 | -Metadata-Version: 2.1 |
50 | +Metadata-Version: 1.2 |
51 | Name: openstack-placement |
52 | -Version: 10.1.0.dev7 |
53 | +Version: 11.0.0.0rc1 |
54 | Summary: Resource provider inventory usage and allocation service |
55 | Home-page: https://docs.openstack.org/placement/latest/ |
56 | Author: OpenStack |
57 | Author-email: openstack-discuss@lists.openstack.org |
58 | +License: UNKNOWN |
59 | Project-URL: Bug Tracker, https://bugs.launchpad.net/placement |
60 | Project-URL: Documentation, https://docs.openstack.org/placement/latest/ |
61 | Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/ |
62 | Project-URL: Source Code, https://opendev.org/openstack/placement |
63 | Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/ |
64 | +Description: If you are viewing this README on GitHub, please be aware that placement |
65 | + development happens on `OpenStack git |
66 | + <https://opendev.org/openstack/placement/>`_ and `OpenStack |
67 | + gerrit <https://review.opendev.org>`_. |
68 | + |
69 | + =================== |
70 | + OpenStack Placement |
71 | + =================== |
72 | + |
73 | + .. image:: https://governance.openstack.org/tc/badges/placement.svg |
74 | + :target: https://governance.openstack.org/tc/reference/tags/index.html |
75 | + |
76 | + OpenStack Placement provides an HTTP service for managing, selecting, |
77 | + and claiming providers of classes of inventory representing available |
78 | + resources in a cloud. |
79 | + |
80 | + API |
81 | + --- |
82 | + |
83 | + To learn how to use Placement's API, consult the documentation available |
84 | + online at: |
85 | + |
86 | + - `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__ |
87 | + |
88 | + For more information on OpenStack APIs, SDKs and CLIs in general, refer to: |
89 | + |
90 | + - `OpenStack for App Developers <https://www.openstack.org/appdev/>`__ |
91 | + - `Development resources for OpenStack clouds |
92 | + <https://developer.openstack.org/>`__ |
93 | + |
94 | + Operators |
95 | + --------- |
96 | + |
97 | + To learn how to deploy and configure OpenStack Placement, consult the |
98 | + documentation available online at: |
99 | + |
100 | + - `OpenStack Placement <https://docs.openstack.org/placement/>`__ |
101 | + |
102 | + In the unfortunate event that bugs are discovered, they should be reported to |
103 | + the appropriate bug tracker. If you obtained the software from a 3rd party |
104 | + operating system vendor, it is often wise to use their own bug tracker for |
105 | + reporting problems. In all other cases use the master OpenStack bug tracker, |
106 | + available at: |
107 | + |
108 | + - `Bug Tracker <https://bugs.launchpad.net/placement>`__ |
109 | + - `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__ |
110 | + |
111 | + Developers |
112 | + ---------- |
113 | + |
114 | + For information on how to contribute to Placement, please see the contents of |
115 | + CONTRIBUTING.rst. |
116 | + |
117 | + Further developer focused documentation is available at: |
118 | + |
119 | + - `Official Placement Documentation <https://docs.openstack.org/placement/>`__ |
120 | + |
121 | + |
122 | +Platform: UNKNOWN |
123 | Classifier: Development Status :: 5 - Production/Stable |
124 | Classifier: Environment :: OpenStack |
125 | Classifier: Intended Audience :: Information Technology |
126 | @@ -22,63 +82,6 @@ Classifier: Programming Language :: Python :: 3 :: Only |
127 | Classifier: Programming Language :: Python :: 3 |
128 | Classifier: Programming Language :: Python :: 3.8 |
129 | Classifier: Programming Language :: Python :: 3.9 |
130 | +Classifier: Programming Language :: Python :: 3.10 |
131 | +Classifier: Programming Language :: Python :: 3.11 |
132 | Requires-Python: >=3.8 |
133 | -License-File: LICENSE |
134 | - |
135 | -If you are viewing this README on GitHub, please be aware that placement |
136 | -development happens on `OpenStack git |
137 | -<https://opendev.org/openstack/placement/>`_ and `OpenStack |
138 | -gerrit <https://review.opendev.org>`_. |
139 | - |
140 | -=================== |
141 | -OpenStack Placement |
142 | -=================== |
143 | - |
144 | -.. image:: https://governance.openstack.org/tc/badges/placement.svg |
145 | - :target: https://governance.openstack.org/tc/reference/tags/index.html |
146 | - |
147 | -OpenStack Placement provides an HTTP service for managing, selecting, |
148 | -and claiming providers of classes of inventory representing available |
149 | -resources in a cloud. |
150 | - |
151 | -API |
152 | ---- |
153 | - |
154 | -To learn how to use Placement's API, consult the documentation available |
155 | -online at: |
156 | - |
157 | -- `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__ |
158 | - |
159 | -For more information on OpenStack APIs, SDKs and CLIs in general, refer to: |
160 | - |
161 | -- `OpenStack for App Developers <https://www.openstack.org/appdev/>`__ |
162 | -- `Development resources for OpenStack clouds |
163 | - <https://developer.openstack.org/>`__ |
164 | - |
165 | -Operators |
166 | ---------- |
167 | - |
168 | -To learn how to deploy and configure OpenStack Placement, consult the |
169 | -documentation available online at: |
170 | - |
171 | -- `OpenStack Placement <https://docs.openstack.org/placement/>`__ |
172 | - |
173 | -In the unfortunate event that bugs are discovered, they should be reported to |
174 | -the appropriate bug tracker. If you obtained the software from a 3rd party |
175 | -operating system vendor, it is often wise to use their own bug tracker for |
176 | -reporting problems. In all other cases use the master OpenStack bug tracker, |
177 | -available at: |
178 | - |
179 | -- `Bug Tracker <https://bugs.launchpad.net/placement>`__ |
180 | -- `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__ |
181 | - |
182 | -Developers |
183 | ----------- |
184 | - |
185 | -For information on how to contribute to Placement, please see the contents of |
186 | -CONTRIBUTING.rst. |
187 | - |
188 | -Further developer focused documentation is available at: |
189 | - |
190 | -- `Official Placement Documentation <https://docs.openstack.org/placement/>`__ |
191 | - |
192 | diff --git a/debian/changelog b/debian/changelog |
193 | index 5ec7fb1..15f5ebb 100644 |
194 | --- a/debian/changelog |
195 | +++ b/debian/changelog |
196 | @@ -1,3 +1,9 @@ |
197 | +placement (1:11.0.0~rc1-0ubuntu1) UNRELEASED; urgency=medium |
198 | + |
199 | + * New upstream snapshot for OpenStack Caracal |
200 | + |
201 | + -- Jadon Naas <jadon.naas@canonical.com> Tue, 19 Mar 2024 18:28:23 +0000 |
202 | + |
203 | placement (1:10.0.0+git2024020611.e10099bd-0ubuntu1) noble; urgency=medium |
204 | |
205 | [ Corey Bryant ] |
206 | diff --git a/debian/patches/install-missing-db-files.patch b/debian/patches/install-missing-db-files.patch |
207 | index 97bdfe7..692f05a 100644 |
208 | --- a/debian/patches/install-missing-db-files.patch |
209 | +++ b/debian/patches/install-missing-db-files.patch |
210 | @@ -2,7 +2,9 @@ Description: Install missing db files, including |
211 | placement/db/sqlalchemy/alembic.ini. |
212 | Author: Corey Bryant <corey.bryant@canonical.com> |
213 | |
214 | +Index: placement/MANIFEST.in |
215 | +=================================================================== |
216 | --- /dev/null |
217 | -+++ b/MANIFEST.in |
218 | ++++ placement/MANIFEST.in |
219 | @@ -0,0 +1 @@ |
220 | +recursive-include placement/db/ * |
221 | diff --git a/openstack_placement.egg-info/PKG-INFO b/openstack_placement.egg-info/PKG-INFO |
222 | index 4a1418a..a22548d 100644 |
223 | --- a/openstack_placement.egg-info/PKG-INFO |
224 | +++ b/openstack_placement.egg-info/PKG-INFO |
225 | @@ -1,15 +1,75 @@ |
226 | -Metadata-Version: 2.1 |
227 | +Metadata-Version: 1.2 |
228 | Name: openstack-placement |
229 | -Version: 10.1.0.dev7 |
230 | +Version: 11.0.0.0rc1 |
231 | Summary: Resource provider inventory usage and allocation service |
232 | Home-page: https://docs.openstack.org/placement/latest/ |
233 | Author: OpenStack |
234 | Author-email: openstack-discuss@lists.openstack.org |
235 | +License: UNKNOWN |
236 | Project-URL: Bug Tracker, https://bugs.launchpad.net/placement |
237 | Project-URL: Documentation, https://docs.openstack.org/placement/latest/ |
238 | Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/ |
239 | Project-URL: Source Code, https://opendev.org/openstack/placement |
240 | Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/ |
241 | +Description: If you are viewing this README on GitHub, please be aware that placement |
242 | + development happens on `OpenStack git |
243 | + <https://opendev.org/openstack/placement/>`_ and `OpenStack |
244 | + gerrit <https://review.opendev.org>`_. |
245 | + |
246 | + =================== |
247 | + OpenStack Placement |
248 | + =================== |
249 | + |
250 | + .. image:: https://governance.openstack.org/tc/badges/placement.svg |
251 | + :target: https://governance.openstack.org/tc/reference/tags/index.html |
252 | + |
253 | + OpenStack Placement provides an HTTP service for managing, selecting, |
254 | + and claiming providers of classes of inventory representing available |
255 | + resources in a cloud. |
256 | + |
257 | + API |
258 | + --- |
259 | + |
260 | + To learn how to use Placement's API, consult the documentation available |
261 | + online at: |
262 | + |
263 | + - `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__ |
264 | + |
265 | + For more information on OpenStack APIs, SDKs and CLIs in general, refer to: |
266 | + |
267 | + - `OpenStack for App Developers <https://www.openstack.org/appdev/>`__ |
268 | + - `Development resources for OpenStack clouds |
269 | + <https://developer.openstack.org/>`__ |
270 | + |
271 | + Operators |
272 | + --------- |
273 | + |
274 | + To learn how to deploy and configure OpenStack Placement, consult the |
275 | + documentation available online at: |
276 | + |
277 | + - `OpenStack Placement <https://docs.openstack.org/placement/>`__ |
278 | + |
279 | + In the unfortunate event that bugs are discovered, they should be reported to |
280 | + the appropriate bug tracker. If you obtained the software from a 3rd party |
281 | + operating system vendor, it is often wise to use their own bug tracker for |
282 | + reporting problems. In all other cases use the master OpenStack bug tracker, |
283 | + available at: |
284 | + |
285 | + - `Bug Tracker <https://bugs.launchpad.net/placement>`__ |
286 | + - `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__ |
287 | + |
288 | + Developers |
289 | + ---------- |
290 | + |
291 | + For information on how to contribute to Placement, please see the contents of |
292 | + CONTRIBUTING.rst. |
293 | + |
294 | + Further developer focused documentation is available at: |
295 | + |
296 | + - `Official Placement Documentation <https://docs.openstack.org/placement/>`__ |
297 | + |
298 | + |
299 | +Platform: UNKNOWN |
300 | Classifier: Development Status :: 5 - Production/Stable |
301 | Classifier: Environment :: OpenStack |
302 | Classifier: Intended Audience :: Information Technology |
303 | @@ -22,63 +82,6 @@ Classifier: Programming Language :: Python :: 3 :: Only |
304 | Classifier: Programming Language :: Python :: 3 |
305 | Classifier: Programming Language :: Python :: 3.8 |
306 | Classifier: Programming Language :: Python :: 3.9 |
307 | +Classifier: Programming Language :: Python :: 3.10 |
308 | +Classifier: Programming Language :: Python :: 3.11 |
309 | Requires-Python: >=3.8 |
310 | -License-File: LICENSE |
311 | - |
312 | -If you are viewing this README on GitHub, please be aware that placement |
313 | -development happens on `OpenStack git |
314 | -<https://opendev.org/openstack/placement/>`_ and `OpenStack |
315 | -gerrit <https://review.opendev.org>`_. |
316 | - |
317 | -=================== |
318 | -OpenStack Placement |
319 | -=================== |
320 | - |
321 | -.. image:: https://governance.openstack.org/tc/badges/placement.svg |
322 | - :target: https://governance.openstack.org/tc/reference/tags/index.html |
323 | - |
324 | -OpenStack Placement provides an HTTP service for managing, selecting, |
325 | -and claiming providers of classes of inventory representing available |
326 | -resources in a cloud. |
327 | - |
328 | -API |
329 | ---- |
330 | - |
331 | -To learn how to use Placement's API, consult the documentation available |
332 | -online at: |
333 | - |
334 | -- `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__ |
335 | - |
336 | -For more information on OpenStack APIs, SDKs and CLIs in general, refer to: |
337 | - |
338 | -- `OpenStack for App Developers <https://www.openstack.org/appdev/>`__ |
339 | -- `Development resources for OpenStack clouds |
340 | - <https://developer.openstack.org/>`__ |
341 | - |
342 | -Operators |
343 | ---------- |
344 | - |
345 | -To learn how to deploy and configure OpenStack Placement, consult the |
346 | -documentation available online at: |
347 | - |
348 | -- `OpenStack Placement <https://docs.openstack.org/placement/>`__ |
349 | - |
350 | -In the unfortunate event that bugs are discovered, they should be reported to |
351 | -the appropriate bug tracker. If you obtained the software from a 3rd party |
352 | -operating system vendor, it is often wise to use their own bug tracker for |
353 | -reporting problems. In all other cases use the master OpenStack bug tracker, |
354 | -available at: |
355 | - |
356 | -- `Bug Tracker <https://bugs.launchpad.net/placement>`__ |
357 | -- `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__ |
358 | - |
359 | -Developers |
360 | ----------- |
361 | - |
362 | -For information on how to contribute to Placement, please see the contents of |
363 | -CONTRIBUTING.rst. |
364 | - |
365 | -Further developer focused documentation is available at: |
366 | - |
367 | -- `Official Placement Documentation <https://docs.openstack.org/placement/>`__ |
368 | - |
369 | diff --git a/openstack_placement.egg-info/entry_points.txt b/openstack_placement.egg-info/entry_points.txt |
370 | index 89edc37..7a1ff1a 100644 |
371 | --- a/openstack_placement.egg-info/entry_points.txt |
372 | +++ b/openstack_placement.egg-info/entry_points.txt |
373 | @@ -16,3 +16,4 @@ placement = placement.policies:list_rules |
374 | |
375 | [wsgi_scripts] |
376 | placement-api = placement.wsgi:init_application |
377 | + |
378 | diff --git a/openstack_placement.egg-info/pbr.json b/openstack_placement.egg-info/pbr.json |
379 | index 339be1b..668a4dc 100644 |
380 | --- a/openstack_placement.egg-info/pbr.json |
381 | +++ b/openstack_placement.egg-info/pbr.json |
382 | @@ -1 +1 @@ |
383 | -{"git_version": "e10099bd", "is_release": false} |
384 | \ No newline at end of file |
385 | +{"git_version": "6ac0521e", "is_release": true} |
386 | \ No newline at end of file |
387 | diff --git a/releasenotes/source/victoria.rst b/releasenotes/source/victoria.rst |
388 | index 4efc7b6..8ce9334 100644 |
389 | --- a/releasenotes/source/victoria.rst |
390 | +++ b/releasenotes/source/victoria.rst |
391 | @@ -3,4 +3,4 @@ Victoria Series Release Notes |
392 | ============================= |
393 | |
394 | .. release-notes:: |
395 | - :branch: stable/victoria |
396 | + :branch: unmaintained/victoria |
397 | diff --git a/releasenotes/source/wallaby.rst b/releasenotes/source/wallaby.rst |
398 | index d77b565..bcf35c5 100644 |
399 | --- a/releasenotes/source/wallaby.rst |
400 | +++ b/releasenotes/source/wallaby.rst |
401 | @@ -3,4 +3,4 @@ Wallaby Series Release Notes |
402 | ============================ |
403 | |
404 | .. release-notes:: |
405 | - :branch: stable/wallaby |
406 | + :branch: unmaintained/wallaby |
407 | diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst |
408 | index 1be85be..d19eda4 100644 |
409 | --- a/releasenotes/source/xena.rst |
410 | +++ b/releasenotes/source/xena.rst |
411 | @@ -3,4 +3,4 @@ Xena Series Release Notes |
412 | ========================= |
413 | |
414 | .. release-notes:: |
415 | - :branch: stable/xena |
416 | + :branch: unmaintained/xena |
417 | diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst |
418 | index 7cd5e90..43cafde 100644 |
419 | --- a/releasenotes/source/yoga.rst |
420 | +++ b/releasenotes/source/yoga.rst |
421 | @@ -3,4 +3,4 @@ Yoga Series Release Notes |
422 | ========================= |
423 | |
424 | .. release-notes:: |
425 | - :branch: stable/yoga |
426 | + :branch: unmaintained/yoga |
427 | diff --git a/setup.cfg b/setup.cfg |
428 | index 463eba3..a307078 100644 |
429 | --- a/setup.cfg |
430 | +++ b/setup.cfg |
431 | @@ -26,6 +26,8 @@ classifier = |
432 | Programming Language :: Python :: 3 |
433 | Programming Language :: Python :: 3.8 |
434 | Programming Language :: Python :: 3.9 |
435 | + Programming Language :: Python :: 3.10 |
436 | + Programming Language :: Python :: 3.11 |
437 | |
438 | [files] |
439 | packages = |