[6.14.z] Updates to requirements.txt

This backport resolves some missed/failed cherry-picks, bringing
requirements back in line with master.

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
@@ -29,6 +30,11 @@ wait-for==1.2.0
 wrapanapi==3.6.0
 
 # Get airgun, nailgun and upgrade from master
-git+https://github.com/SatelliteQE/[email protected]#egg=airgun
-git+https://github.com/SatelliteQE/[email protected]#egg=nailgun
+git+https://github.com/SatelliteQE/airgun.git@master#egg=airgun
+git+https://github.com/SatelliteQE/nailgun.git@master#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/[email protected]#egg=broker
 --editable .