Merge ~jadonn/ubuntu/+source/placement:master into ubuntu/+source/placement:ubuntu/devel

Proposed by Jadon Naas
Status: Needs review
Proposed branch: ~jadonn/ubuntu/+source/placement:master
Merge into: ubuntu/+source/placement:ubuntu/devel
Diff against target: 491 lines (+311/-1) (has conflicts)
14 files modified
.launchpad.yaml (+86/-0)
.zuul.yaml (+10/-0)
ChangeLog (+13/-0)
PKG-INFO (+78/-0)
debian/changelog (+9/-0)
debian/patches/install-missing-db-files.patch (+7/-0)
openstack_placement.egg-info/PKG-INFO (+78/-0)
openstack_placement.egg-info/entry_points.txt (+4/-0)
openstack_placement.egg-info/pbr.json (+5/-1)
releasenotes/source/victoria.rst (+4/-0)
releasenotes/source/wallaby.rst (+4/-0)
releasenotes/source/xena.rst (+4/-0)
releasenotes/source/yoga.rst (+4/-0)
setup.cfg (+5/-0)
Conflict in .zuul.yaml
Conflict in ChangeLog
Conflict in PKG-INFO
Conflict in debian/changelog
Conflict in debian/patches/install-missing-db-files.patch
Conflict in openstack_placement.egg-info/PKG-INFO
Conflict in openstack_placement.egg-info/entry_points.txt
Conflict in openstack_placement.egg-info/pbr.json
Conflict in releasenotes/source/victoria.rst
Conflict in releasenotes/source/wallaby.rst
Conflict in releasenotes/source/xena.rst
Conflict in releasenotes/source/yoga.rst
Conflict in setup.cfg
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+462799@code.launchpad.net

Commit message

New release candidate for OpenStack Caracal

To post a comment you must log in.

Unmerged commits

e91d16d... by Jadon Naas

New upstream snapshot for OpenStack Caracal

Failed
[FAILED] ubuntu-build:0 (build)
[WAITING] ubuntu-autopkgtest:0 (build)
[WAITING] cloud-archive-build:0 (build)
[WAITING] cloud-archive-autopkgtest:0 (build)
14 of 4 results
1031d6b... by Jadon Naas

Merge tag '11.0.0_rc1'

Upstream version 11.0.0~rc1

8957edc... by James Page

New upstream version 11.0.0~rc1

4b94ee7... by James Page

New upstream version 10.0.0+git2024030811.8e705fa4

90757f8... by James Page

releasing package placement version 1:10.0.0+git2024020611.e10099bd-0ubuntu1

7be0e1e... by James Page

d/rules: Use --with sphinxdoc to tidy generated documentation.

ddcb299... by James Page

New upstream snapshot for OpenStack Caracal.

60709dc... by James Page

Merge tag '10.0.0+git2024020611.e10099bd'

Upstream version 10.0.0+git2024020611.e10099bd

8052722... by James Page

New upstream version 10.0.0+git2024020611.e10099bd

1f43469... by Corey Bryant

d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for caracal.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.launchpad.yaml b/.launchpad.yaml
0new file mode 1006440new file mode 100644
index 0000000..eebe217
--- /dev/null
+++ b/.launchpad.yaml
@@ -0,0 +1,86 @@
1# This file is managed centrally by cloud-archive-tools and should not be
2# modified within individual package repos. See the 'cloud_global' dir:
3# https://git.launchpad.net/~ubuntu-cloud-archive/+git/cloud-archive-tools
4#
5# Pipelines can be run locally with:
6# lpci run --output-directory out
7
8pipeline:
9- ubuntu-build
10- ubuntu-autopkgtest
11- cloud-archive-build
12- cloud-archive-autopkgtest
13
14jobs:
15 ubuntu-build:
16 series: devel
17 architectures: amd64
18 packages:
19 - lsb-release
20 environment:
21 no_proxy: localhost,127.0.0.0/8
22 run: |
23 cat <<EOF >/etc/apt/sources.list.d/ubuntu-$(lsb_release -cs)-proposed.list
24 deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-proposed restricted main multiverse universe
25 EOF
26 apt update
27 apt build-dep ./ --yes
28 rm -rf .git
29 dpkg-buildpackage -b -uc -us
30 mv ../*.deb ../*.changes ./
31 output:
32 paths: ["*.deb", "*.changes"]
33
34 ubuntu-autopkgtest:
35 series: devel
36 architectures: amd64
37 packages:
38 - autopkgtest
39 environment:
40 no_proxy: localhost,127.0.0.0/8
41 input:
42 job-name: ubuntu-build
43 target-directory: ./
44 run: |
45 [ ! -d debian/tests ] || autopkgtest ./files/*.changes -- null
46
47 cloud-archive-build:
48 series: jammy
49 architectures: amd64
50 packages:
51 - dirmngr
52 - git
53 - software-properties-common
54 environment:
55 no_proxy: localhost,127.0.0.0/8
56 run: |
57 openstack_series="caracal"
58 package_name=$(dpkg-parsechangelog --show-field Source)
59 ca_patches="https://git.launchpad.net/~ubuntu-cloud-archive/+git/ca-patches"
60 [ ! -d $HOME/ca-patches ] && git clone "$ca_patches" $HOME/ca-patches
61 patch_file="$HOME/ca-patches/${openstack_series}/${package_name}.patch"
62 [ -e "$patch_file" ] && patch -p1 -t --verbose < $patch_file
63 add-apt-repository ppa:ubuntu-cloud-archive/${openstack_series}-staging --yes
64 apt build-dep ./ --yes
65 rm -rf .git
66 dpkg-buildpackage -b -uc -us
67 mv ../*.deb ../*.changes ./
68 output:
69 paths: ["*.deb", "*.changes"]
70
71 cloud-archive-autopkgtest:
72 series: jammy
73 architectures: amd64
74 packages:
75 - autopkgtest
76 - dirmngr
77 - software-properties-common
78 environment:
79 no_proxy: localhost,127.0.0.0/8
80 input:
81 job-name: cloud-archive-build
82 target-directory: ./
83 run: |
84 openstack_series="caracal"
85 add-apt-repository ppa:ubuntu-cloud-archive/${openstack_series}-staging --yes
86 [ ! -d debian/tests ] || autopkgtest ./files/*.changes -- null
diff --git a/.zuul.yaml b/.zuul.yaml
index dcee77e..cdb9f63 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -43,6 +43,11 @@
43 - ^tox.ini$43 - ^tox.ini$
44 - grenade:44 - grenade:
45 irrelevant-files: *gate-irrelevant-files45 irrelevant-files: *gate-irrelevant-files
46<<<<<<< .zuul.yaml
47=======
48 - grenade-skip-level:
49 irrelevant-files: *gate-irrelevant-files
50>>>>>>> .zuul.yaml
46 - tempest-ipv6-only:51 - tempest-ipv6-only:
47 irrelevant-files: *gate-irrelevant-files52 irrelevant-files: *gate-irrelevant-files
48 gate:53 gate:
@@ -55,6 +60,11 @@
55 irrelevant-files: *gate-irrelevant-files60 irrelevant-files: *gate-irrelevant-files
56 - grenade:61 - grenade:
57 irrelevant-files: *gate-irrelevant-files62 irrelevant-files: *gate-irrelevant-files
63<<<<<<< .zuul.yaml
64=======
65 - grenade-skip-level:
66 irrelevant-files: *gate-irrelevant-files
67>>>>>>> .zuul.yaml
58 - tempest-ipv6-only:68 - tempest-ipv6-only:
59 irrelevant-files: *gate-irrelevant-files69 irrelevant-files: *gate-irrelevant-files
60 periodic-weekly:70 periodic-weekly:
diff --git a/ChangeLog b/ChangeLog
index da58129..ab477c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,20 @@
1CHANGES1CHANGES
2=======2=======
33
4<<<<<<< ChangeLog
4* Bump hacking5* Bump hacking
6=======
711.0.0.0rc1
8-----------
9
10* reno: Update master for unmaintained/xena
11* reno: Update master for unmaintained/wallaby
12* reno: Update master for unmaintained/victoria
13* reno: Update master for unmaintained/yoga
14* Add upgrade job from 2023.1
15* Bump hacking
16* Update python classifier in setup.cfg
17>>>>>>> ChangeLog
5* Add job to test with SQLAlchemy master (2.x)18* Add job to test with SQLAlchemy master (2.x)
6* db: Wrap raw SQL query in sqlalchemy.text19* db: Wrap raw SQL query in sqlalchemy.text
7* Update master for stable/2023.220* Update master for stable/2023.2
diff --git a/PKG-INFO b/PKG-INFO
index 4a1418a..87aa654 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,15 +1,87 @@
1<<<<<<< PKG-INFO
1Metadata-Version: 2.12Metadata-Version: 2.1
2Name: openstack-placement3Name: openstack-placement
3Version: 10.1.0.dev74Version: 10.1.0.dev7
5=======
6Metadata-Version: 1.2
7Name: openstack-placement
8Version: 11.0.0.0rc1
9>>>>>>> PKG-INFO
4Summary: Resource provider inventory usage and allocation service10Summary: Resource provider inventory usage and allocation service
5Home-page: https://docs.openstack.org/placement/latest/11Home-page: https://docs.openstack.org/placement/latest/
6Author: OpenStack12Author: OpenStack
7Author-email: openstack-discuss@lists.openstack.org13Author-email: openstack-discuss@lists.openstack.org
14<<<<<<< PKG-INFO
15=======
16License: UNKNOWN
17>>>>>>> PKG-INFO
8Project-URL: Bug Tracker, https://bugs.launchpad.net/placement18Project-URL: Bug Tracker, https://bugs.launchpad.net/placement
9Project-URL: Documentation, https://docs.openstack.org/placement/latest/19Project-URL: Documentation, https://docs.openstack.org/placement/latest/
10Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/20Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/
11Project-URL: Source Code, https://opendev.org/openstack/placement21Project-URL: Source Code, https://opendev.org/openstack/placement
12Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/22Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/
23<<<<<<< PKG-INFO
24=======
25Description: If you are viewing this README on GitHub, please be aware that placement
26 development happens on `OpenStack git
27 <https://opendev.org/openstack/placement/>`_ and `OpenStack
28 gerrit <https://review.opendev.org>`_.
29
30 ===================
31 OpenStack Placement
32 ===================
33
34 .. image:: https://governance.openstack.org/tc/badges/placement.svg
35 :target: https://governance.openstack.org/tc/reference/tags/index.html
36
37 OpenStack Placement provides an HTTP service for managing, selecting,
38 and claiming providers of classes of inventory representing available
39 resources in a cloud.
40
41 API
42 ---
43
44 To learn how to use Placement's API, consult the documentation available
45 online at:
46
47 - `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__
48
49 For more information on OpenStack APIs, SDKs and CLIs in general, refer to:
50
51 - `OpenStack for App Developers <https://www.openstack.org/appdev/>`__
52 - `Development resources for OpenStack clouds
53 <https://developer.openstack.org/>`__
54
55 Operators
56 ---------
57
58 To learn how to deploy and configure OpenStack Placement, consult the
59 documentation available online at:
60
61 - `OpenStack Placement <https://docs.openstack.org/placement/>`__
62
63 In the unfortunate event that bugs are discovered, they should be reported to
64 the appropriate bug tracker. If you obtained the software from a 3rd party
65 operating system vendor, it is often wise to use their own bug tracker for
66 reporting problems. In all other cases use the master OpenStack bug tracker,
67 available at:
68
69 - `Bug Tracker <https://bugs.launchpad.net/placement>`__
70 - `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__
71
72 Developers
73 ----------
74
75 For information on how to contribute to Placement, please see the contents of
76 CONTRIBUTING.rst.
77
78 Further developer focused documentation is available at:
79
80 - `Official Placement Documentation <https://docs.openstack.org/placement/>`__
81
82
83Platform: UNKNOWN
84>>>>>>> PKG-INFO
13Classifier: Development Status :: 5 - Production/Stable85Classifier: Development Status :: 5 - Production/Stable
14Classifier: Environment :: OpenStack86Classifier: Environment :: OpenStack
15Classifier: Intended Audience :: Information Technology87Classifier: Intended Audience :: Information Technology
@@ -22,6 +94,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
22Classifier: Programming Language :: Python :: 394Classifier: Programming Language :: Python :: 3
23Classifier: Programming Language :: Python :: 3.895Classifier: Programming Language :: Python :: 3.8
24Classifier: Programming Language :: Python :: 3.996Classifier: Programming Language :: Python :: 3.9
97<<<<<<< PKG-INFO
25Requires-Python: >=3.898Requires-Python: >=3.8
26License-File: LICENSE99License-File: LICENSE
27100
@@ -82,3 +155,8 @@ Further developer focused documentation is available at:
82155
83- `Official Placement Documentation <https://docs.openstack.org/placement/>`__156- `Official Placement Documentation <https://docs.openstack.org/placement/>`__
84157
158=======
159Classifier: Programming Language :: Python :: 3.10
160Classifier: Programming Language :: Python :: 3.11
161Requires-Python: >=3.8
162>>>>>>> PKG-INFO
diff --git a/debian/changelog b/debian/changelog
index 5ec7fb1..b493bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1<<<<<<< debian/changelog
2=======
3placement (1:11.0.0~rc1-0ubuntu1) UNRELEASED; urgency=medium
4
5 * New upstream snapshot for OpenStack Caracal
6
7 -- Jadon Naas <jadon.naas@canonical.com> Tue, 19 Mar 2024 18:28:23 +0000
8
9>>>>>>> debian/changelog
1placement (1:10.0.0+git2024020611.e10099bd-0ubuntu1) noble; urgency=medium10placement (1:10.0.0+git2024020611.e10099bd-0ubuntu1) noble; urgency=medium
211
3 [ Corey Bryant ]12 [ Corey Bryant ]
diff --git a/debian/patches/install-missing-db-files.patch b/debian/patches/install-missing-db-files.patch
index 97bdfe7..9f69a47 100644
--- a/debian/patches/install-missing-db-files.patch
+++ b/debian/patches/install-missing-db-files.patch
@@ -2,7 +2,14 @@ Description: Install missing db files, including
2 placement/db/sqlalchemy/alembic.ini.2 placement/db/sqlalchemy/alembic.ini.
3Author: Corey Bryant <corey.bryant@canonical.com>3Author: Corey Bryant <corey.bryant@canonical.com>
44
5<<<<<<< debian/patches/install-missing-db-files.patch
5--- /dev/null6--- /dev/null
6+++ b/MANIFEST.in7+++ b/MANIFEST.in
8=======
9Index: placement/MANIFEST.in
10===================================================================
11--- /dev/null
12+++ placement/MANIFEST.in
13>>>>>>> debian/patches/install-missing-db-files.patch
7@@ -0,0 +1 @@14@@ -0,0 +1 @@
8+recursive-include placement/db/ *15+recursive-include placement/db/ *
diff --git a/openstack_placement.egg-info/PKG-INFO b/openstack_placement.egg-info/PKG-INFO
index 4a1418a..c90b99c 100644
--- a/openstack_placement.egg-info/PKG-INFO
+++ b/openstack_placement.egg-info/PKG-INFO
@@ -1,15 +1,87 @@
1<<<<<<< openstack_placement.egg-info/PKG-INFO
1Metadata-Version: 2.12Metadata-Version: 2.1
2Name: openstack-placement3Name: openstack-placement
3Version: 10.1.0.dev74Version: 10.1.0.dev7
5=======
6Metadata-Version: 1.2
7Name: openstack-placement
8Version: 11.0.0.0rc1
9>>>>>>> openstack_placement.egg-info/PKG-INFO
4Summary: Resource provider inventory usage and allocation service10Summary: Resource provider inventory usage and allocation service
5Home-page: https://docs.openstack.org/placement/latest/11Home-page: https://docs.openstack.org/placement/latest/
6Author: OpenStack12Author: OpenStack
7Author-email: openstack-discuss@lists.openstack.org13Author-email: openstack-discuss@lists.openstack.org
14<<<<<<< openstack_placement.egg-info/PKG-INFO
15=======
16License: UNKNOWN
17>>>>>>> openstack_placement.egg-info/PKG-INFO
8Project-URL: Bug Tracker, https://bugs.launchpad.net/placement18Project-URL: Bug Tracker, https://bugs.launchpad.net/placement
9Project-URL: Documentation, https://docs.openstack.org/placement/latest/19Project-URL: Documentation, https://docs.openstack.org/placement/latest/
10Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/20Project-URL: API Reference, https://docs.openstack.org/api-ref/placement/
11Project-URL: Source Code, https://opendev.org/openstack/placement21Project-URL: Source Code, https://opendev.org/openstack/placement
12Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/22Project-URL: Release Notes, https://docs.openstack.org/releasenotes/placement/
23<<<<<<< openstack_placement.egg-info/PKG-INFO
24=======
25Description: If you are viewing this README on GitHub, please be aware that placement
26 development happens on `OpenStack git
27 <https://opendev.org/openstack/placement/>`_ and `OpenStack
28 gerrit <https://review.opendev.org>`_.
29
30 ===================
31 OpenStack Placement
32 ===================
33
34 .. image:: https://governance.openstack.org/tc/badges/placement.svg
35 :target: https://governance.openstack.org/tc/reference/tags/index.html
36
37 OpenStack Placement provides an HTTP service for managing, selecting,
38 and claiming providers of classes of inventory representing available
39 resources in a cloud.
40
41 API
42 ---
43
44 To learn how to use Placement's API, consult the documentation available
45 online at:
46
47 - `Placement API Reference <https://docs.openstack.org/api-ref/placement/>`__
48
49 For more information on OpenStack APIs, SDKs and CLIs in general, refer to:
50
51 - `OpenStack for App Developers <https://www.openstack.org/appdev/>`__
52 - `Development resources for OpenStack clouds
53 <https://developer.openstack.org/>`__
54
55 Operators
56 ---------
57
58 To learn how to deploy and configure OpenStack Placement, consult the
59 documentation available online at:
60
61 - `OpenStack Placement <https://docs.openstack.org/placement/>`__
62
63 In the unfortunate event that bugs are discovered, they should be reported to
64 the appropriate bug tracker. If you obtained the software from a 3rd party
65 operating system vendor, it is often wise to use their own bug tracker for
66 reporting problems. In all other cases use the master OpenStack bug tracker,
67 available at:
68
69 - `Bug Tracker <https://bugs.launchpad.net/placement>`__
70 - `File new Bug <https://bugs.launchpad.net/placement/+filebug>`__
71
72 Developers
73 ----------
74
75 For information on how to contribute to Placement, please see the contents of
76 CONTRIBUTING.rst.
77
78 Further developer focused documentation is available at:
79
80 - `Official Placement Documentation <https://docs.openstack.org/placement/>`__
81
82
83Platform: UNKNOWN
84>>>>>>> openstack_placement.egg-info/PKG-INFO
13Classifier: Development Status :: 5 - Production/Stable85Classifier: Development Status :: 5 - Production/Stable
14Classifier: Environment :: OpenStack86Classifier: Environment :: OpenStack
15Classifier: Intended Audience :: Information Technology87Classifier: Intended Audience :: Information Technology
@@ -22,6 +94,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
22Classifier: Programming Language :: Python :: 394Classifier: Programming Language :: Python :: 3
23Classifier: Programming Language :: Python :: 3.895Classifier: Programming Language :: Python :: 3.8
24Classifier: Programming Language :: Python :: 3.996Classifier: Programming Language :: Python :: 3.9
97<<<<<<< openstack_placement.egg-info/PKG-INFO
25Requires-Python: >=3.898Requires-Python: >=3.8
26License-File: LICENSE99License-File: LICENSE
27100
@@ -82,3 +155,8 @@ Further developer focused documentation is available at:
82155
83- `Official Placement Documentation <https://docs.openstack.org/placement/>`__156- `Official Placement Documentation <https://docs.openstack.org/placement/>`__
84157
158=======
159Classifier: Programming Language :: Python :: 3.10
160Classifier: Programming Language :: Python :: 3.11
161Requires-Python: >=3.8
162>>>>>>> openstack_placement.egg-info/PKG-INFO
diff --git a/openstack_placement.egg-info/entry_points.txt b/openstack_placement.egg-info/entry_points.txt
index 89edc37..1188085 100644
--- a/openstack_placement.egg-info/entry_points.txt
+++ b/openstack_placement.egg-info/entry_points.txt
@@ -16,3 +16,7 @@ placement = placement.policies:list_rules
1616
17[wsgi_scripts]17[wsgi_scripts]
18placement-api = placement.wsgi:init_application18placement-api = placement.wsgi:init_application
19<<<<<<< openstack_placement.egg-info/entry_points.txt
20=======
21
22>>>>>>> openstack_placement.egg-info/entry_points.txt
diff --git a/openstack_placement.egg-info/pbr.json b/openstack_placement.egg-info/pbr.json
index 339be1b..ae2544c 100644
--- a/openstack_placement.egg-info/pbr.json
+++ b/openstack_placement.egg-info/pbr.json
@@ -1 +1,5 @@
1{"git_version": "e10099bd", "is_release": false}
2\ No newline at end of file1\ No newline at end of file
2<<<<<<< openstack_placement.egg-info/pbr.json
3{"git_version": "e10099bd", "is_release": false}
4=======
5{"git_version": "6ac0521e", "is_release": true}
6>>>>>>> openstack_placement.egg-info/pbr.json
diff --git a/releasenotes/source/victoria.rst b/releasenotes/source/victoria.rst
index 4efc7b6..d4b81d6 100644
--- a/releasenotes/source/victoria.rst
+++ b/releasenotes/source/victoria.rst
@@ -3,4 +3,8 @@ Victoria Series Release Notes
3=============================3=============================
44
5.. release-notes::5.. release-notes::
6<<<<<<< releasenotes/source/victoria.rst
6 :branch: stable/victoria7 :branch: stable/victoria
8=======
9 :branch: unmaintained/victoria
10>>>>>>> releasenotes/source/victoria.rst
diff --git a/releasenotes/source/wallaby.rst b/releasenotes/source/wallaby.rst
index d77b565..64d5431 100644
--- a/releasenotes/source/wallaby.rst
+++ b/releasenotes/source/wallaby.rst
@@ -3,4 +3,8 @@ Wallaby Series Release Notes
3============================3============================
44
5.. release-notes::5.. release-notes::
6<<<<<<< releasenotes/source/wallaby.rst
6 :branch: stable/wallaby7 :branch: stable/wallaby
8=======
9 :branch: unmaintained/wallaby
10>>>>>>> releasenotes/source/wallaby.rst
diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst
index 1be85be..8ccc7f0 100644
--- a/releasenotes/source/xena.rst
+++ b/releasenotes/source/xena.rst
@@ -3,4 +3,8 @@ Xena Series Release Notes
3=========================3=========================
44
5.. release-notes::5.. release-notes::
6<<<<<<< releasenotes/source/xena.rst
6 :branch: stable/xena7 :branch: stable/xena
8=======
9 :branch: unmaintained/xena
10>>>>>>> releasenotes/source/xena.rst
diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst
index 7cd5e90..2b7e9ed 100644
--- a/releasenotes/source/yoga.rst
+++ b/releasenotes/source/yoga.rst
@@ -3,4 +3,8 @@ Yoga Series Release Notes
3=========================3=========================
44
5.. release-notes::5.. release-notes::
6<<<<<<< releasenotes/source/yoga.rst
6 :branch: stable/yoga7 :branch: stable/yoga
8=======
9 :branch: unmaintained/yoga
10>>>>>>> releasenotes/source/yoga.rst
diff --git a/setup.cfg b/setup.cfg
index 463eba3..9930385 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,6 +26,11 @@ classifier =
26 Programming Language :: Python :: 326 Programming Language :: Python :: 3
27 Programming Language :: Python :: 3.827 Programming Language :: Python :: 3.8
28 Programming Language :: Python :: 3.928 Programming Language :: Python :: 3.9
29<<<<<<< setup.cfg
30=======
31 Programming Language :: Python :: 3.10
32 Programming Language :: Python :: 3.11
33>>>>>>> setup.cfg
2934
30[files]35[files]
31packages = 36packages =

Subscribers

People subscribed via source and target branches