Merge pull request #58 from stackhpc/upstream/2024.1-2024-10-07

Synchronise 2024.1 with upstream

Author: priteau

global-requirements.txt

@@ -8,7 +8,9 @@ automaton  # Apache-2.0
 autopage  # Apache-2.0
 beautifulsoup4  # MIT
 Babel!=2.4.0  # BSD
-bcrypt  # Apache-2.0
+# NOTE bcrypt is currently pinned at 4.0.1 in upper-constraints due to an issue
+# with passlib: https://foss.heptapod.net/python-libs/passlib/-/issues/190
+bcrypt==4.0.1  # Apache-2.0
 betamax  # Apache-2.0
 blockdiag!=2.0.0  # Apache-2.0
 boto  # MIT

upper-constraints.txt

@@ -213,7 +213,7 @@ tzlocal===5.2
 sphinxcontrib-jsmath===1.0.1
 python-novaclient===18.6.0
 pact===1.12.0
-bcrypt===4.1.2
+bcrypt===4.0.1
 exceptiongroup===1.2.0;python_version=='3.10'
 exceptiongroup===1.2.0;python_version=='3.8'
 exceptiongroup===1.2.0;python_version=='3.9'