Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
5d274924 by Mark Sapiro at 2021-05-11T18:14:59-07:00
Require click >=8.0.0 and fix the tests it breaks.
- - - - -
5c9c23e8 by Mark Sapiro at 2021-05-12T01:39:54+00:00
Merge branch 'click' into 'master'
Require click >=8.0.0 and fix the tests it breaks.
See merge request mailman/mailman!860
- - - - -
5 changed files:
- setup.py
- src/mailman/commands/docs/import.rst
- src/mailman/commands/tests/test_cli_addmembers.py
- src/mailman/commands/tests/test_cli_delmembers.py
- src/mailman/commands/tests/test_cli_syncmembers.py
Changes:
=====================================
setup.py
=====================================
@@ -115,7 +115,7 @@ case second 'm'. Any other spelling is incorrect.""",
'atpublic',
'authheaders>=0.9.2',
'authres>=1.0.1',
- 'click>=7.0.0,<8.0',
+ 'click>=8.0.0',
'dnspython>=1.14.0',
'falcon>=3.0.0',
'flufl.bounce',
=====================================
src/mailman/commands/docs/import.rst
=====================================
@@ -58,5 +58,6 @@ import, the mailing list's "real name" will change.
Import
>>> command('mailman import21 imp...@example.com ' + pickle_file)
+ Importing ...
>>> print(mlist.display_name)
Test
=====================================
src/mailman/commands/tests/test_cli_addmembers.py
=====================================
@@ -57,8 +57,8 @@ class TestCLIAddMembers(unittest.TestCase):
result.output,
'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
'Try \'addmembers --help\' for help.\n\n'
- 'Error: Invalid value for \'FILENAME\': Could not open '
- 'file: bad: No such file or directory\n')
+ 'Error: Invalid value for \'FILENAME\': '
+ '\'bad\': No such file or directory\n')
def test_already_subscribed_with_display_name(self):
subscribe(self._mlist, 'Anne')
@@ -265,8 +265,8 @@ class TestCLIAddMembers(unittest.TestCase):
'Usage: addmembers [OPTIONS] FILENAME LISTSPEC\n'
'Try \'addmembers --help\' for help.\n\n'
'Error: Invalid value for \'--delivery\' / \'-d\': '
- 'invalid choice: bogus. (choose from regular, mime, '
- 'plain, summary, disabled)\n')
+ '\'bogus\' is not one of \'regular\', \'mime\', '
+ '\'plain\', \'summary\', \'disabled\'.\n')
def test_invite_member(self):
with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
=====================================
src/mailman/commands/tests/test_cli_delmembers.py
=====================================
@@ -56,8 +56,8 @@ class TestCLIDelMembers(unittest.TestCase):
result.output,
'Usage: delmembers [OPTIONS]\n'
'Try \'delmembers --help\' for help.\n\n'
- 'Error: Invalid value for \'--file\' / \'-f\': Could not open '
- 'file: bad: No such file or directory\n')
+ 'Error: Invalid value for \'--file\' / \'-f\': '
+ '\'bad\': No such file or directory\n')
def test_not_subscribed_without_display_name(self):
with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
=====================================
src/mailman/commands/tests/test_cli_syncmembers.py
=====================================
@@ -58,8 +58,8 @@ class TestCLISyncMembers(unittest.TestCase):
result.output,
'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
'Try \'syncmembers --help\' for help.\n\n'
- 'Error: Invalid value for \'FILENAME\': Could not open '
- 'file: bad: No such file or directory\n')
+ 'Error: Invalid value for \'FILENAME\': '
+ '\'bad\': No such file or directory\n')
def test_sync_invalid_email(self):
with NamedTemporaryFile('w', buffering=1, encoding='utf-8') as infp:
@@ -374,8 +374,8 @@ class TestCLISyncMembers(unittest.TestCase):
'Usage: syncmembers [OPTIONS] FILENAME LISTSPEC\n'
'Try \'syncmembers --help\' for help.\n\n'
'Error: Invalid value for \'--delivery\' / \'-d\': '
- 'invalid choice: bogus. (choose from regular, mime, '
- 'plain, summary, disabled)\n')
+ '\'bogus\' is not one of \'regular\', \'mime\', '
+ '\'plain\', \'summary\', \'disabled\'.\n')
def test_override_no_welcome(self):
self._mlist.send_welcome_message = False
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/a0159d938fbf5231e6f85d190cce15b55c3cd98f...5c9c23e858214fc2ac667ca92155421d56f94e51
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/a0159d938fbf5231e6f85d190cce15b55c3cd98f...5c9c23e858214fc2ac667ca92155421d56f94e51
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org
