From f223ae5828a7daf39043d621a741e0458ad5a35b Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Thu, 22 Aug 2019 12:08:11 +0100
Subject: [PATCH] setup.cfg: Cleanup

- pbr hasn't need the hook configuration since forever [1]
- We don't distribute eggs, so there's no need to include configuration
  for same
- nova-based entrypoints are grouped
- The 'wheel' group is renamed to 'bdist_wheel' [2]

[1] https://github.com/openstack/pbr/commit/c84876dc0f559a66fec19b2f81f5717204b253e2
[2] https://github.com/pypa/wheel/commit/f7c9878712390414c03c64e9afa55ea4f30e965b

Change-Id: I1bc60eab58055bd6217ddb7c7c5c2e3bd6fb539e
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 setup.cfg | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index d4ba172069b..9dc249a5dcc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,9 +19,9 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
+[extras]
+osprofiler =
+    osprofiler>=1.4.0 # Apache-2.0
 
 [files]
 data_files =
@@ -52,6 +52,14 @@ oslo.policy.policies =
 nova.compute.monitors.cpu =
     virt_driver = nova.compute.monitors.cpu.virt_driver:Monitor
 
+nova.ipv6_backend =
+    rfc2462 = nova.ipv6.rfc2462
+    account_identifier = nova.ipv6.account_identifier
+
+nova.scheduler.driver =
+    filter_scheduler = nova.scheduler.filter_scheduler:FilterScheduler
+    fake_scheduler = nova.tests.unit.scheduler.fakes:FakeScheduler
+
 console_scripts =
     nova-api = nova.cmd.api:main
     nova-api-metadata = nova.cmd.api_metadata:main
@@ -71,23 +79,11 @@ console_scripts =
     nova-spicehtml5proxy = nova.cmd.spicehtml5proxy:main
     nova-status = nova.cmd.status:main
     nova-xvpvncproxy = nova.cmd.xvpvncproxy:main
+
 wsgi_scripts =
     nova-api-wsgi = nova.api.openstack.compute.wsgi:init_application
     nova-metadata-wsgi = nova.api.metadata.wsgi:init_application
 
-nova.ipv6_backend =
-    rfc2462 = nova.ipv6.rfc2462
-    account_identifier = nova.ipv6.account_identifier
-
-nova.scheduler.driver =
-    filter_scheduler = nova.scheduler.filter_scheduler:FilterScheduler
-    fake_scheduler = nova.tests.unit.scheduler.fakes:FakeScheduler
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
 [compile_catalog]
 directory = nova/locale
 domain = nova
@@ -102,9 +98,5 @@ keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = nova/locale/nova.pot
 
-[wheel]
+[bdist_wheel]
 universal = 1
-
-[extras]
-osprofiler =
-  osprofiler>=1.4.0 # Apache-2.0