From 2d50711f052799ff6ebb153d7b6bbbe378249982 Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves@ngraves.fr>
Date: Wed, 23 Jul 2025 22:29:26 +0200
Subject: [PATCH] gnu: python-oslo-config: Enable tests and switch to
 pyproject.

* gnu/packages/openstack.scm (python-oslo-config): Update to 10.0.0.
[build-system]: Switch to pyproject-build-system.
[arguments]: Set <#:test-flags> and 'check phase replacement.
[native-inputs]: Add list python-coverage, python-docutils,
python-fixtures, python-mypy, python-oslo-log-bootstrap,
python-oslotest-bootstrap, python-pbr, python-requests-mock,
python-setuptools, python-sphinx, python-stestr, python-testscenarios,
python-testtools, python-wheel.
[propagated-inputs]: Remove python-debtcollector, reorder.

Change-Id: I7ff62f081784a632ab80bd8d50e2de443f8781e7
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/openstack.scm | 46 +++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index a1ed926ae5e..2e5e0bc9cc9 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -472,18 +472,44 @@ for running external processes.")
        (method url-fetch)
        (uri (pypi-uri "oslo.config" version))
        (sha256
-        (base32
-         "0q3v4yicqls9zsfxkmh5mrgz9dailaz3ir25p458gj6dg3bldhx0"))))
-    (build-system python-build-system)
-    (arguments '(#:tests? #f))          ;XXX circular dependency on oslo.log
+        (base32 "0q3v4yicqls9zsfxkmh5mrgz9dailaz3ir25p458gj6dg3bldhx0"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      ;; XXX: Disable failing tests.
+      #:test-flags
+      #~(list "--exclude-regex" (string-join
+                                 (list "test_print_help"
+                                       "test_print_strOpt_with_choices_help")
+                                 "|"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? test-flags #:allow-other-keys)
+              (when tests?
+                (apply invoke "stestr" "run" test-flags)))))))
     (propagated-inputs
-     (list python-debtcollector
-           python-netaddr
-           python-oslo-i18n
-           python-rfc3986
+     (list python-netaddr
+           python-oslo-i18n-bootstrap
+           python-pyyaml
            python-requests
-           python-stevedore
-           python-pyyaml))
+           python-rfc3986
+           python-stevedore))
+    (native-inputs
+     (list python-coverage
+           python-docutils
+           python-fixtures
+           python-mypy
+           python-oslo-log-bootstrap
+           python-oslotest-bootstrap
+           python-pbr
+           python-requests-mock
+           python-setuptools
+           python-sphinx
+           python-stestr
+           python-testscenarios
+           python-testtools
+           python-wheel))
     (home-page "https://launchpad.net/oslo")
     (synopsis "Oslo Configuration API")
     (description