Skip to content

Commit ae699b1

Browse files
committed
Address Github Dependabot warnings about dnspython<2.6.1 vulnerability. We cannot use 2.x on py2 so comments can only emphasize that one should really use one of the patched 1.x versions in that case. Let's see if that makes Dependabot happy. Added some more version rules and notes about version compatibility. Synchronized the latest changes to recommended.txt for consistency.
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6110 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 1d37a3e commit ae699b1

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

recommended.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
# migrid core dependencies on a format suitable for pip install as described on
22
# https://pip.pypa.io/en/stable/reference/requirement-specifiers/
33
future
4+
# NOTE: python-3.6 and earlier versions require older pyotp, whereas 3.7+
5+
# should work with any modern version. We tested 2.9.0 to work.
46
pyotp;python_version >= "3"
7+
pyotp<2.8;python_version > "3" and python_version < "3.7"
58
pyotp<2.4;python_version < "3"
69
pyyaml
7-
email-validator
10+
# NOTE: python-2.7 requires older dnspython, whereas 3.x should work with any
11+
# modern version. We tested 2.6.1 to work.
12+
# IMPORTANT: there's a known security issue (CVE-2023-29483) in dnspython<2.6.1
13+
# as explained on https://www.dnspython.org/news/2.6.1/
14+
dnspython>=2.6.1;python_version >= "3"
15+
# NOTE: one should use a patched 1.x version e.g. from RHEL/Rocky 8 if on python2
16+
dnspython<2;python_version < "3"
17+
# NOTE: python-3.6 and earlier versions require older email-validator, whereas
18+
# 3.7+ should work with any modern version. We tested 2.2.0 to work.
19+
email-validator;python_version >= "3.7"
20+
email-validator<2.0;python_version >= "3" and python_version < "3.7"
21+
email-validator<1.3;python_version < "3"
822

923
# migrid recommended libs on a format suitable for pip install as described on
1024
# https://pip.pypa.io/en/stable/reference/requirement-specifiers/
@@ -29,7 +43,6 @@ nbconvert
2943
papermill
3044
notebook_parameterizer
3145
psutil
32-
dnspython
3346
# sslkeylog requires libssl-dev or similar system package to build
3447
#sslkeylog
3548
pyenchant

requirements.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
# migrid core dependencies on a format suitable for pip install as described on
22
# https://pip.pypa.io/en/stable/reference/requirement-specifiers/
33
future
4+
# NOTE: python-3.6 and earlier versions require older pyotp, whereas 3.7+
5+
# should work with any modern version. We tested 2.9.0 to work.
46
pyotp;python_version >= "3"
7+
pyotp<2.8;python_version > "3" and python_version < "3.7"
58
pyotp<2.4;python_version < "3"
69
pyyaml
7-
dnspython;python_version >= "3"
10+
# NOTE: python-2.7 requires older dnspython, whereas 3.x should work with any
11+
# modern version. We tested 2.6.1 to work.
12+
# IMPORTANT: there's a known security issue (CVE-2023-29483) in dnspython<2.6.1
13+
# as explained on https://www.dnspython.org/news/2.6.1/
14+
dnspython>=2.6.1;python_version >= "3"
15+
# NOTE: one should use a patched 1.x version e.g. from RHEL/Rocky 8 if on python2
816
dnspython<2;python_version < "3"
9-
email-validator<2.1;python_version >= "3.7"
17+
# NOTE: python-3.6 and earlier versions require older email-validator, whereas
18+
# 3.7+ should work with any modern version. We tested 2.2.0 to work.
19+
email-validator;python_version >= "3.7"
1020
email-validator<2.0;python_version >= "3" and python_version < "3.7"
1121
email-validator<1.3;python_version < "3"
1222

0 commit comments

Comments
 (0)