From 5706a2237587d9f436256e927ea21d4e6ba7b2a1 Mon Sep 17 00:00:00 2001
From: Ryan Sundberg <ryan@arctype.co>
Date: Mon, 3 May 2021 22:49:27 -0700
Subject: [PATCH 16/55] Update python-oslo.config dependencies

---
 gnu/packages/openstack.scm | 46 +++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 92cdd62078..f4fb214f32 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -390,6 +390,33 @@ common features used in Tempest.")
 ;;; Packages from the Oslo library
 ;;;
 
+(define python-oslo.config-requirements.patch
+  ; Patch out the circular dependency on oslo.log, and max version on hacking
+  (plain-file "python-oslo.config-requirements.patch"
+"diff --git a/test-requirements.txt b/test-requirements.txt
+index 8cb29d3..c54edef 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -2,7 +2,7 @@
+ # of appearance. Changing the order has an impact on the overall integration
+ # process, which may cause wedges in the gate later.
+ 
+-hacking>=3.0.1,<3.1.0 # Apache-2.0
++hacking>=3.0.1 # Apache-2.0
+ 
+ fixtures>=3.0.0 # Apache-2.0/BSD
+ testscenarios>=0.4 # Apache-2.0/BSD
+@@ -14,7 +14,7 @@ mypy>=0.720 # MIT
+ # oslo.log can't be a runtime dep because it would cause a circular dependency,
+ # but we can optionally make use of it so we want to have it installed in our
+ # test environment.
+-oslo.log>=3.36.0  # Apache-2.0
++# oslo.log>=3.36.0  # Apache-2.0
+ 
+ # when we can require tox>= 1.4, this can go into tox.ini:
+ #  [testenv:cover]
+"))
+
 (define-public python-oslo.config
   (package
     (name "python-oslo.config")
@@ -400,15 +427,18 @@ common features used in Tempest.")
        (uri (pypi-uri "oslo.config" version))
        (sha256
         (base32
-         "0a1gk2b83bk2hzn35wm4q85xqi8wplakmgii59i84qkv33m11nys"))))
+         "0a1gk2b83bk2hzn35wm4q85xqi8wplakmgii59i84qkv33m11nys"))
+       (patches (list python-oslo.config-requirements.patch))))
     (build-system python-build-system)
     (arguments
+      ; This test suite is objectively broken, even with all dependencies resolved.
       `(#:tests? #f))
     (propagated-inputs
      `(("python-debtcollector" ,python-debtcollector)
        ("python-netaddr" ,python-netaddr)
        ("python-oslo.i18n" ,python-oslo.i18n)
        ("python-pbr" ,python-pbr)
+       ("python-requests" ,python-requests)
        ("python-rfc3986" ,python-rfc3986)
        ("python-six" ,python-six)
        ("python-stevedore" ,python-stevedore)
@@ -416,12 +446,18 @@ common features used in Tempest.")
     (native-inputs
      `(("python-bandit" ,python-bandit)
        ("python-coverage" ,python-coverage)
-       ("python-mock" ,python-mock)
-       ("python-openstackdocstheme" ,python-openstackdocstheme)
+       ("python-docutils" ,python-docutils)
+       ("python-hacking" ,python-hacking)
+       ;("python-mock" ,python-mock)
+       ("python-mypy" ,python-mypy)
+       ;("python-openstackdocstheme" ,python-openstackdocstheme)
        ("python-oslotest" ,python-oslotest)
-       ("python-reno" ,python-reno)
+       ("python-pre-commit" ,python-pre-commit)
+       ("python-requests-mock" ,python-requests-mock)
+       ;("python-reno" ,python-reno)
        ("python-sphinx" ,python-sphinx)
-       ("python-testrepository" ,python-testrepository)
+       ("python-stestr" ,python-stestr)
+       ;("python-testrepository" ,python-testrepository)
        ("python-testscenarios" ,python-testscenarios)
        ("python-testtools" ,python-testtools)))
     (home-page "https://launchpad.net/oslo")
-- 
2.31.1