Skip to content

Commit 90a6134

Browse files
committed
last try with dnspython version hell - if it still complains we should really investigate dropping the dnspython dependency and go with the custom resolver arg in the email-validator function (thanks for the suggestion albu-diku).
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6112 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent a5b2d1e commit 90a6134

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

recommended.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ pyyaml
1111
# modern version. We tested 2.6.1 to work.
1212
# IMPORTANT: there's a known security issue (CVE-2023-29483) in dnspython<2.6.1
1313
# as explained on https://www.dnspython.org/news/2.6.1/
14-
dnspython>=2.6.1;python_version >= "3"
14+
dnspython>=2.6.1;python_version >= "3.7"
15+
# NOTE: one should use a patched 2.x version e.g. from RHEL/Rocky 8 if on python3.6
16+
dnspython<2.4;python_version > "3" and python_version < "3.7"
1517
# NOTE: one should use a patched 1.x version e.g. from RHEL/Rocky 8 if on python2
1618
dnspython<2;python_version < "3"
1719
# NOTE: python-3.6 and earlier versions require older email-validator, whereas

requirements.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ pyyaml
1111
# modern version. We tested 2.6.1 to work.
1212
# IMPORTANT: there's a known security issue (CVE-2023-29483) in dnspython<2.6.1
1313
# as explained on https://www.dnspython.org/news/2.6.1/
14-
dnspython>=2.6.1;python_version >= "3"
14+
dnspython>=2.6.1;python_version >= "3.7"
15+
# NOTE: one should use a patched 2.x version e.g. from RHEL/Rocky 8 if on python3.6
16+
dnspython<2.4;python_version > "3" and python_version < "3.7"
1517
# NOTE: one should use a patched 1.x version e.g. from RHEL/Rocky 8 if on python2
1618
dnspython<2;python_version < "3"
1719
# NOTE: python-3.6 and earlier versions require older email-validator, whereas

0 commit comments

Comments
 (0)