From dd460af11549b8b5c406426ebc9a8137748e040b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 1 Jan 2024 15:57:24 +0100 Subject: [PATCH 1/2] add Python 3.12 to CI --- .github/workflows/main.yml | 1 + tox.ini | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87a41ac..a2df41c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" twisted: - "22.4.0" - "22.10.0" diff --git a/tox.ini b/tox.ini index aaaf978..c9ff1f0 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py36, py37, py38, py39, py310, py311 +envlist = py36, py37, py38, py39, py310, py311, py312 [testenv] commands = make test @@ -29,3 +29,4 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 From f956ea689ca585935bde8f8345fc6914c8b861b7 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 1 Jan 2024 16:05:09 +0100 Subject: [PATCH 2/2] =?UTF-8?q?assertRegexpMatches=20=E2=86=92=20assertReg?= =?UTF-8?q?ex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/test_bley.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_bley.py b/test/test_bley.py index 8005a75..d85c1d9 100644 --- a/test/test_bley.py +++ b/test/test_bley.py @@ -74,7 +74,7 @@ def _assert_defer_action(self, data): def _assert_prepend_action(self, data): self.assertEquals(data['action'], b"action=PREPEND") - self.assertRegexpMatches(data['text'].decode('ascii'), r"X-Greylist: delayed .* seconds by bley-.* at .*; .*") + self.assertRegex(data['text'].decode('ascii'), r"X-Greylist: delayed .* seconds by bley-.* at .*; .*") def test_incomplete_request(self): data = {