From 96d2e75db59c0e6fc26ffa383f66fc05cc577b73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 May 2025 09:07:06 +0000
Subject: [PATCH 1/2] python3Packages.oslo-context: 5.7.1 -> 6.0.0

---
 pkgs/development/python-modules/oslo-context/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix
index b0f254c09b63..de49df9cfb75 100644
--- a/pkgs/development/python-modules/oslo-context/default.nix
+++ b/pkgs/development/python-modules/oslo-context/default.nix
@@ -2,22 +2,22 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  debtcollector,
   oslotest,
   stestr,
   pbr,
   setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "oslo-context";
-  version = "5.7.1";
+  version = "6.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "oslo_context";
-    hash = "sha256-DFEf4VNzKv8MGztEq9L1EAioPHB7uSm+4B4SVayWSIk=";
+    hash = "sha256-FR6CKJgtOIXtP+0ojozdsm+JT7QMuBMhKfqeWz4O8L0=";
   };
 
   postPatch = ''
@@ -29,8 +29,8 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    debtcollector
     pbr
+    typing-extensions
   ];
 
   nativeCheckInputs = [

From 931899f5a62b9d3c69de71f7a323722ed9ae2cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 23 May 2025 14:44:09 +0200
Subject: [PATCH 2/2] python313Packages.oslo-log: fix test failure

---
 pkgs/development/python-modules/oslo-log/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix
index 7e34fb1f7cc3..936af70c2e87 100644
--- a/pkgs/development/python-modules/oslo-log/default.nix
+++ b/pkgs/development/python-modules/oslo-log/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -35,6 +36,14 @@ buildPythonPackage rec {
     hash = "sha256-ybWrNwP9L7iOzft10TgRFxA4mCRDVozVC2ZAopgITqo=";
   };
 
+  patches = [
+    # remove removed alias from tests
+    (fetchpatch {
+      url = "https://github.com/openstack/oslo.log/commit/69a285a8c830712b4b8aafc8ecd4e2d7654e1ffe.patch";
+      hash = "sha256-e0kRSHJPHITP/XgPHhY5kGzCupE00oBnCJYiUCs3Yks=";
+    })
+  ];
+
   # Manually set version because prb wants to get it from the git upstream repository (and we are
   # installing from tarball instead)
   PBR_VERSION = version;