From 88b5dc2971514babd36d837c93550715dea44b09 Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 16 Aug 2024 22:50:00 -0400 Subject: [PATCH 1/5] extra deprecation on twisted 24.7.0 --- test/test_torconfig.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test_torconfig.py b/test/test_torconfig.py index 6f8a4aa6..f30568d2 100644 --- a/test/test_torconfig.py +++ b/test/test_torconfig.py @@ -1457,8 +1457,11 @@ def __call__(self, proto, trans): ) self.assertIs(tpp, fake_tor.process) calls = warn.mock_calls - self.assertEqual(1, len(calls)) - self.assertEqual(calls[0][1][1], DeprecationWarning) + # on Twisted 24.7.0 and higher, there's an extra deprecation + # warning due to returnValue being deprecated + self.assertTrue(len(calls) >= 1) + for call in calls: + self.assertEqual(call[1][1], DeprecationWarning) class ErrorTests(unittest.TestCase): From 5514a83511bc979a5694a6b7ea58fc1554bc185c Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 16 Aug 2024 22:51:16 -0400 Subject: [PATCH 2/5] add more twisteds --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a3ceb9a2..e5b0c78d 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ # stretch: 16.3.0-1 [tox] -envlist = clean,flake8,stats,readme_render,{py36,py37,py38,py39,pypy}-{tx18,tx19,tx20},{py36,py37,py38,py39}-tx21,{py310,py311}-tx22 +envlist = clean,flake8,stats,readme_render,{py36,py37,py38,py39,pypy}-{tx18,tx19,tx20,tx21,tx22,tx23,tx24},{py36,py37,py38,py39}-tx21,{py310,py311}-tx22 # if you're not using detox, you can use this list to get # "all environments" coverage stats: # tox -e 'clean,flake8,py39-tx20,pypy-tx20,py35-tx20,stats' @@ -44,6 +44,8 @@ deps= tx20: twisted>=20.0.0,<21.0.0 tx21: twisted>=21.0.0,<22.0.0 tx22: twisted>=22.0.0,<23.0.0 + tx23: twisted>=23.0.0,<24.0.0 + tx24: twisted>=24.0.0,<25.0.0 # [gh-actions] # python = From ff470aad5b577e81518a71af08066ee865c31fce Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 16 Aug 2024 22:52:30 -0400 Subject: [PATCH 3/5] CI more things --- .github/workflows/python3.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python3.yaml b/.github/workflows/python3.yaml index 501b0898..1af3bd81 100644 --- a/.github/workflows/python3.yaml +++ b/.github/workflows/python3.yaml @@ -12,10 +12,14 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10"] - twisted-version: [tx18, tx19, tx20, tx21] + twisted-version: [tx18, tx19, tx20, tx21, tx22, tx23, tx24] include: - python-version: "3.11" - twisted-version: "tx22" + twisted-version: "tx24" + - python-version: "3.12" + twisted-version: "tx24" + - python-version: "3.13" + twisted-version: "tx24" steps: - uses: actions/checkout@v2 From 02ecc5adbef2d607fdf8d328bd7d03f92d6abb14 Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 16 Aug 2024 22:54:40 -0400 Subject: [PATCH 4/5] too new --- .github/workflows/python3.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/python3.yaml b/.github/workflows/python3.yaml index 1af3bd81..5d66df56 100644 --- a/.github/workflows/python3.yaml +++ b/.github/workflows/python3.yaml @@ -18,8 +18,6 @@ jobs: twisted-version: "tx24" - python-version: "3.12" twisted-version: "tx24" - - python-version: "3.13" - twisted-version: "tx24" steps: - uses: actions/checkout@v2 From 29cf3bd7d0d77f69b6e5a314a13ab20b216250d6 Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 16 Aug 2024 22:58:12 -0400 Subject: [PATCH 5/5] news --- docs/releases.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/releases.rst b/docs/releases.rst index 1ed5f2ba..48eb2c33 100644 --- a/docs/releases.rst +++ b/docs/releases.rst @@ -17,6 +17,7 @@ See also :ref:`api_stability`. `git main `_ *will likely become v24.1.0* + * Fix (test) issues with Twisted 24.7.0 (`#400 `_) * Remove usage of "six" (`#395 `_, from `a-dieste `_