From 2d7dbc55d156fdca4ab98d1c924f929a594c9339 Mon Sep 17 00:00:00 2001
From: Ryan Sundberg <ryan@arctype.co>
Date: Sun, 2 May 2021 23:39:19 -0700
Subject: [PATCH 11/55] python-oslo.log: bring to working order, upgrade to
 4.4.0

---
 gnu/packages/openstack.scm | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 45f1621f47..d986298dd2 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -506,17 +506,43 @@ internationalization (i18n) features, especially translation for text strings
 in an application or library.")
     (license asl2.0)))
 
+(define python-oslo.log-requirements-patch
+  (plain-file "python-oslo.log-requirements.patch"
+"diff --git a/test-requirements.txt b/test-requirements.txt
+index ac16453..5eda8f4 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>=2.0.0,<2.1.0 # Apache-2.0
++hacking>=2.0.0 # Apache-2.0
+ 
+ stestr>=2.0.0 # Apache-2.0
+ testtools>=2.3.0 # MIT
+@@ -11,6 +11,6 @@ oslotest>=3.3.0 # Apache-2.0
+ coverage>=4.5.1 # Apache-2.0
+ 
+ # Bandit security code scanner
+-bandit>=1.6.0,<1.7.0 # Apache-2.0
++bandit>=1.6.0 # Apache-2.0
+ 
+ fixtures>=3.0.0 # Apache-2.0/BSD
+"))
+
 (define-public python-oslo.log
   (package
   (name "python-oslo.log")
-  (version "3.36.0")
+  (version "4.4.0")
   (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "oslo.log" version))
       (sha256
         (base32
-          "0h7hplf1h8k24v75m3mq1jlrl74x5ynyr4hwgffsg5campxnza4x"))))
+          "0j24g2sirpgbw7dnrkxb78j687byc8c40mrvhhbqx7ydk4qbx0q8"))
+      (patches (list python-oslo.log-requirements-patch))))
   (build-system python-build-system)
   (propagated-inputs
    `(("python-dateutil" ,python-dateutil)
@@ -531,8 +557,12 @@ in an application or library.")
      ("python-pyinotify" ,python-pyinotify)
      ("python-six" ,python-six)))
   (native-inputs
-    `(("python-mock" ,python-mock)
+    `(("python-bandit" ,python-bandit)
+      ("python-coverage" ,python-coverage)
+      ("python-hacking" ,python-hacking)
+      ("python-mock" ,python-mock)
       ("python-oslotest" ,python-oslotest)
+      ("python-stestr" ,python-stestr)
       ("python-subunit" ,python-subunit)
       ("python-testrepository" ,python-testrepository)
       ("python-testtools" ,python-testtools)))
-- 
2.31.1