From 06f98fdaccff65cfd8d8431510d2978742ed7c2b Mon Sep 17 00:00:00 2001 From: Spitap Date: Sun, 3 Nov 2024 15:53:55 +0100 Subject: [PATCH 1/4] Fixed tests --- modoboa/lib/tests/test_email_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modoboa/lib/tests/test_email_utils.py b/modoboa/lib/tests/test_email_utils.py index 1bb1572ea..963ed319a 100644 --- a/modoboa/lib/tests/test_email_utils.py +++ b/modoboa/lib/tests/test_email_utils.py @@ -153,7 +153,7 @@ class EmailAddressParserTests(SimpleTestCase): """Check a list of e-mail addresses is sepearted correctly.""" # value is an array with one long string not 3 sepearte values. value = [ - '"Doe, John" ;' + '"Doe, John" ,' '"John Smith" ,' "admin@sub.example.com" ] @@ -169,7 +169,7 @@ class EmailAddressParserTests(SimpleTestCase): """Check a list of e-mail addresses is sepearted correctly.""" # value is an array with one long string not 3 sepearte values. value = [ - '"Doe, John" ;' + '"Doe, John" ,' '"John Smith" ,' "admin@sub.example.com" ] @@ -186,7 +186,7 @@ class EmailAddressParserTests(SimpleTestCase): # value is one long string not 3 sepearte values, prepare_addresses # should convert it to a list. value = ( - '"Doe, John" ;' + '"Doe, John" ,' '"John Smith" ,' "admin@sub.example.com" ) From f4bd74517937120ed4968a02b828462dd7915103 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 3 Nov 2024 16:50:50 +0100 Subject: [PATCH 2/4] Try with older ldap library --- ldap-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap-requirements.txt b/ldap-requirements.txt index 40145847b..2c2770479 100644 --- a/ldap-requirements.txt +++ b/ldap-requirements.txt @@ -1 +1 @@ -django-auth-ldap>=1.3.0 +django-auth-ldap<5.0.0 From c640877e1139f0d5bdc79c7dff75b14735f852e1 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 3 Nov 2024 16:58:26 +0100 Subject: [PATCH 3/4] Try with django auth ldap 5.O --- ldap-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap-requirements.txt b/ldap-requirements.txt index 2c2770479..9305cea6c 100644 --- a/ldap-requirements.txt +++ b/ldap-requirements.txt @@ -1 +1 @@ -django-auth-ldap<5.0.0 +django-auth-ldap<5.1.0 From 6a0a1c40f25acdae688c8a58c13b4c9d55b6a3ee Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 3 Nov 2024 17:06:42 +0100 Subject: [PATCH 4/4] Force django-auth-ldap < 5 --- ldap-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldap-requirements.txt b/ldap-requirements.txt index 9305cea6c..2c2770479 100644 --- a/ldap-requirements.txt +++ b/ldap-requirements.txt @@ -1 +1 @@ -django-auth-ldap<5.1.0 +django-auth-ldap<5.0.0