From a85562178191b213d3cbdcaf2a892b07893d4050 Mon Sep 17 00:00:00 2001
From: Jacob Callahan <jacob.callahan05@gmail.com>
Date: Fri, 16 Feb 2024 11:44:51 -0500
Subject: [PATCH] [6.12.z] Updates to requirements.txt

This backport resolves some missed/failed cherry-picks, bringing
requirements back in line with master.
---
 requirements.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 23746698c4c..c14bdf758b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # Version updates managed by dependabot
 
 betelgeuse==1.11.0
-broker[docker]==0.4.1
+# broker[docker]==0.4.1 - Temporarily disabled, see below
 cryptography==42.0.2
 deepdiff==6.7.1
 docker==7.0.0  # Temporary until Broker is back on PyPi
@@ -14,7 +14,8 @@ paramiko==3.4.0  # Temporary until Broker is back on PyPi
 productmd==1.38
 pyotp==2.9.0
 python-box==7.1.1
-pytest==7.4.4
+pytest==8.0.0
+pytest-order==1.2.0
 pytest-services==2.2.1
 pytest-mock==3.12.0
 pytest-reportportal==5.3.1
@@ -31,4 +32,9 @@ wrapanapi==3.6.0
 # Get airgun, nailgun and upgrade from 6.12.z
 git+https://github.com/SatelliteQE/airgun.git@6.12.z#egg=airgun
 git+https://github.com/SatelliteQE/nailgun.git@6.12.z#egg=nailgun
+# Broker currently is unable to push to PyPi due to [1] and [2]
+# In the meantime, we install directly from the repo
+# [1] - https://github.com/ParallelSSH/ssh2-python/issues/193
+# [2] - https://github.com/pypi/warehouse/issues/7136
+git+https://github.com/SatelliteQE/broker.git@0.4.5#egg=broker
 --editable .