Skip to content

Commit

Permalink
Merge pull request #58 from stackhpc/upstream/2024.1-2024-10-07
Browse files Browse the repository at this point in the history
Synchronise 2024.1 with upstream
  • Loading branch information
priteau authored Oct 7, 2024
2 parents 14d8b2d + 2f72094 commit 0b36f71
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion global-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion upper-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 0b36f71

Please sign in to comment.