From d928c81e15dfe8b60c883b0b17fa39d7875db632 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 9 May 2024 18:00:52 +0900
Subject: [PATCH] Stop pinning gabbi

The issue with gabbi 2.5.0[1] was fixed in 2.5.1. Prohibit 2.5.0 to
avoid installing that bad version (though it was already yanked).

Bump gabbi to the latest 2.x.0 version. We may later bump it to 3.x .

[1] https://github.com/cdent/gabbi/issues/309

Change-Id: If6f23a66d22af1d97a87a280b0bfe8d0578cc39e
---
 global-requirements.txt | 6 ++----
 upper-constraints.txt   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/global-requirements.txt b/global-requirements.txt
index 3c3e5c6265..228d60867d 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -236,10 +236,8 @@ django-nose  # BSD
 docker  # Apache-2.0
 fixtures  # Apache-2.0/BSD
 freezegun  # Apache-2.0
-# The following issue with urllib3 should be fixed to use gabbi 2.5.0.
-# https://github.com/urllib3/urllib3/issues/2534
-# Also see https://github.com/cdent/gabbi/issues/309
-gabbi<2.5.0  # Apache-2.0
+# NOTE(tkajinam): block 2.5.0 because of https://github.com/cdent/gabbi/issues/309
+gabbi!=2.5.0  # Apache-2.0
 keyring  # MIT/PSF
 ldappool  # MPL
 # Do not make mock conditional on Python version: we depend on newer code than
diff --git a/upper-constraints.txt b/upper-constraints.txt
index ac69c83046..699f7057f5 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -290,7 +290,7 @@ pyperclip===1.8.2
 cassandra-driver===3.29.1
 XStatic-Angular-Schema-Form===0.8.13.0
 opentelemetry-exporter-otlp-proto-http===1.24.0
-gabbi===2.4.0
+gabbi===2.11.0
 nwdiag===3.0.0
 XStatic-bootswatch===3.3.7.0
 pytest-xdist===3.5.0