From fa528aa0e59f6ac8afc5868c49939009b1ae5cda Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 3 Oct 2024 18:20:50 +0900
Subject: [PATCH 1/3] Get rid of pkg_resources

... because it was removed in Python 3.12 [1].

[1] https://docs.python.org/3/whatsnew/3.12.html#ensurepip

(cherry picked from commit 7c90f348d7aba9155e50da4886f93c45c8d9f381)
---
 gnocchi/__init__.py |  6 +++---
 gnocchi/opts.py     | 21 ++++++++++++++-------
 gnocchi/rest/app.py |  5 ++---
 setup.cfg           |  1 +
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/gnocchi/__init__.py b/gnocchi/__init__.py
index f56466ff6..23810067e 100644
--- a/gnocchi/__init__.py
+++ b/gnocchi/__init__.py
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pkg_resources
+import importlib.metadata
 
 try:
-    __version__ = pkg_resources.get_distribution(__name__).version
-except pkg_resources.DistributionNotFound:
+    __version__ = importlib.metadata.version('gnocchi')
+except importlib.metadata.PackageNotFoundError:
     # package is not installed
     pass
diff --git a/gnocchi/opts.py b/gnocchi/opts.py
index 3fd07e8a7..37ad150ea 100644
--- a/gnocchi/opts.py
+++ b/gnocchi/opts.py
@@ -14,7 +14,7 @@
 import copy
 import itertools
 import operator
-import pkg_resources
+import sys
 import uuid
 
 from oslo_config import cfg
@@ -29,6 +29,11 @@
 import gnocchi.storage.s3
 import gnocchi.storage.swift
 
+if sys.version_info < (3, 10, 0):
+    import importlib_metadata
+else:
+    from importlib import metadata as importlib_metadata
+
 
 # NOTE(sileht): The oslo.config interpolation is buggy when the value
 # is None, this replaces it by the expected empty string.
@@ -182,12 +187,14 @@ def list_opts():
             cfg.StrOpt('paste_config',
                        default="api-paste.ini",
                        help='Path to API Paste configuration.'),
-            cfg.StrOpt('auth_mode',
-                       default="basic",
-                       choices=list(map(operator.attrgetter("name"),
-                                    pkg_resources.iter_entry_points(
-                                        "gnocchi.rest.auth_helper"))),
-                       help='Authentication mode to use.'),
+            cfg.StrOpt(
+                'auth_mode',
+                default="basic",
+                choices=list(map(
+                    operator.attrgetter("name"),
+                    importlib_metadata.entry_points(
+                        group='gnocchi.rest.auth_helper'))),
+                help='Authentication mode to use.'),
             cfg.IntOpt('max_limit',
                        default=1000,
                        required=True,
diff --git a/gnocchi/rest/app.py b/gnocchi/rest/app.py
index 86c3747c3..33c13e7de 100644
--- a/gnocchi/rest/app.py
+++ b/gnocchi/rest/app.py
@@ -15,7 +15,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import os
-import pkg_resources
 import threading
 import uuid
 
@@ -166,8 +165,8 @@ def load_app(conf, not_implemented_middleware=True):
 
     if cfg_path is None or not os.path.exists(cfg_path):
         LOG.debug("No api-paste configuration file found! Using default.")
-        cfg_path = os.path.abspath(pkg_resources.resource_filename(
-            __name__, "api-paste.ini"))
+        cfg_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                                'api-paste.ini')
 
     config = dict(conf=conf,
                   not_implemented_middleware=not_implemented_middleware)
diff --git a/setup.cfg b/setup.cfg
index e637650d1..ae5d59620 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -52,6 +52,7 @@ install_requires =
     lz4>=0.9.0
     tooz>=1.38
     cachetools
+    importlib_metadata>=3.6; python_version<"3.10"
 
 [options.extras_require]
 keystone =

From ce282402bed598a9210f48ca87c7ba6e18ea38cf Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 14 Oct 2024 18:03:04 +0900
Subject: [PATCH 2/3] Replace remaming usage of pkg_resources in doc build

(cherry picked from commit 5db0a5795735a64345a89335ad16f1cf3ddb477f)
---
 doc/source/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index b221f9cb4..478c632a7 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -10,7 +10,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import pkg_resources
+import importlib.metadata
 
 # -- General configuration -----------------------------------------------------
 
@@ -38,7 +38,7 @@
 # built documents.
 #
 # The short X.Y version.
-release = pkg_resources.get_distribution('gnocchi').version
+release = importlib.metadata.version('gnocchi')
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

From 8d334bce2a6d924a55afa1a0a269461021c04ebb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 1 Mar 2026 18:55:18 +0900
Subject: [PATCH 3/3] stable-only: Cap cotyledon

cotyledon 2.2.0 removed its support for Python 3.9 .
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index ae5d59620..9edf8cdc5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     pytimeparse
     pecan>=0.9
     jsonpatch
-    cotyledon>=1.5.0
+    cotyledon>=1.5.0,<2.2.0
     stevedore
     ujson
     voluptuous>=0.8.10