Skip to content

Commit f07fbde

Browse files
author
ocaisa
authored
Merge pull request #3519 from easybuilders/dependabot/pip/cryptography-3.2
Bump cryptography from 2.9.2 to 3.2
2 parents e545186 + 3ab023c commit f07fbde

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
# run test suite
165165
python -O -m test.framework.suite 2>&1 | tee test_framework_suite.log
166166
# try and make sure output of running tests is clean (no printed messages/warnings)
167-
IGNORE_PATTERNS="no GitHub token available|skipping SvnRepository test|requires Lmod as modules tool|stty: 'standard input': Inappropriate ioctl for device|CryptographyDeprecationWarning: Python 3.5|from cryptography.*default_backend"
167+
IGNORE_PATTERNS="no GitHub token available|skipping SvnRepository test|requires Lmod as modules tool|stty: 'standard input': Inappropriate ioctl for device|CryptographyDeprecationWarning: Python 3.5|from cryptography.*default_backend|CryptographyDeprecationWarning: Python 2"
168168
# '|| true' is needed to avoid that Travis stops the job on non-zero exit of grep (i.e. when there are no matches)
169169
PRINTED_MSG=$(egrep -v "${IGNORE_PATTERNS}" test_framework_suite.log | grep '\.\n*[A-Za-z]' || true)
170170
test "x$PRINTED_MSG" = "x" || (echo "ERROR: Found printed messages in output of test suite\n${PRINTED_MSG}" && exit 1)

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ requests
5353

5454
archspec; python_version >= '2.7'
5555

56-
# cryptography 3.0 deprecates Python 2.7
57-
# and cryptography is not needed at all for Python 2.6
58-
cryptography==2.9.2; python_version == '2.7'
56+
# cryptography 3.0 deprecates Python 2.7 (but v3.2.1 still works with Python 2.7);
57+
# cryptography is not needed at all for Python 2.6
58+
cryptography==3.2.1; python_version == '2.7'
5959
cryptography; python_version >= '3.5'

0 commit comments

Comments
 (0)