3 files changed, 13 insertions, 6 deletions

diff --git a/src/mailman/handlers/tests/data/msg_rfc822_out.eml b/src/mailman/handlers/tests/data/msg_rfc822_out.eml
index a0f7c632d..228982578 100644
--- 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 <someone@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
diff --git a/src/mailman/handlers/tests/test_mimedel.py b/src/mailman/handlers/tests/test_mimedel.py
index 01cac0f20..3a50852da 100644
--- 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('test@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):
diff --git a/src/mailman/version.py b/src/mailman/version.py
index b19a2d08d..5cda5cc1d 100644
--- 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