Barry Warsaw pushed to branch master at mailman / Mailman
Commits:
773e6e3c by Barry Warsaw at 2017-05-23T23:54:57+00:00
3.1rc1
- - - - -
6894855b by Barry Warsaw at 2017-05-23T23:54:59+00:00
Merge branch 'rc1' into 'master'
3.1rc1
See merge request !273
- - - - -
3 changed files:
- src/mailman/handlers/tests/data/msg_rfc822_out.eml
- src/mailman/handlers/tests/test_mimedel.py
- src/mailman/version.py
Changes:
=====================================
src/mailman/handlers/tests/data/msg_rfc822_out.eml
=====================================
--- a/src/mailman/handlers/tests/data/msg_rfc822_out.eml
+++ b/src/mailman/handlers/tests/data/msg_rfc822_out.eml
@@ -6,7 +6,7 @@ To: Someone <some...@example.net>
Subject: Message Subject
Content-Type: multipart/mixed;
boundary="------------050603050603060608020908"
-X-Content-Filtered-By: Mailman/MimeDel 3.1.0b5
+X-Content-Filtered-By: Mailman/MimeDel 123
This is a multi-part message in MIME format.
--------------050603050603060608020908
=====================================
src/mailman/handlers/tests/test_mimedel.py
=====================================
--- a/src/mailman/handlers/tests/test_mimedel.py
+++ b/src/mailman/handlers/tests/test_mimedel.py
@@ -38,6 +38,7 @@ from mailman.testing.helpers import (
specialized_message_from_string as mfs)
from mailman.testing.layers import ConfigLayer
from pkg_resources import resource_filename
+from unittest.mock import patch
from zope.component import getUtility
@@ -224,6 +225,7 @@ class TestMiscellaneous(unittest.TestCase):
"""Test various miscellaneous filtering actions."""
layer = ConfigLayer
+ maxDiff = None
def setUp(self):
self._mlist = create_list('t...@example.com')
@@ -256,8 +258,13 @@ multipart/signed
with open(email_file) as fp:
msg = email.message_from_file(fp)
process = config.handlers['mime-delete'].process
- process(self._mlist, msg, {})
- with open(email_file2) as fp:
+ with ExitStack() as resources:
+ fp = resources.enter_context(open(email_file2))
+ # Mock this so that the X-Content-Filtered-By header isn't
+ # sensitive to Mailman version bumps.
+ resources.enter_context(
+ patch('mailman.handlers.mime_delete.VERSION', '123'))
+ process(self._mlist, msg, {})
self.assertEqual(msg.as_string(), fp.read())
def test_mixed_case_ext_and_recast(self):
=====================================
src/mailman/version.py
=====================================
--- a/src/mailman/version.py
+++ b/src/mailman/version.py
@@ -18,7 +18,7 @@
"""Mailman version strings."""
# Mailman version.
-VERSION = '3.1.0b5'
+VERSION = '3.1.0rc1'
CODENAME = 'Between The Wheels'
# And as a hex number in the manner of PY_VERSION_HEX.
@@ -32,9 +32,9 @@ FINAL = 0xf
MAJOR_REV = 3
MINOR_REV = 1
MICRO_REV = 0
-REL_LEVEL = BETA
+REL_LEVEL = GAMMA
# At most 15 beta releases!
-REL_SERIAL = 5
+REL_SERIAL = 1
HEX_VERSION = ((MAJOR_REV << 24) | (MINOR_REV << 16) | (MICRO_REV << 8) |
(REL_LEVEL << 4) | (REL_SERIAL << 0)) # noqa: E221
View it on GitLab:
https://gitlab.com/mailman/mailman/compare/0eb24746c61a5fd944adb2b82681e4df6a039de1...6894855b2b6c6fb7ada2dca3708f67a16cf2e2da
---
View it on GitLab:
https://gitlab.com/mailman/mailman/compare/0eb24746c61a5fd944adb2b82681e4df6a039de1...6894855b2b6c6fb7ada2dca3708f67a16cf2e2da
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
