Merge pull request #400 from meejah/twisted-24.7

Twisted 24.7.0 fixes

.github/workflows/python3.yaml

@@ -12,10 +12,12 @@ 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"
 
     steps:
     - uses: actions/checkout@v2

docs/releases.rst

@@ -17,6 +17,7 @@ See also :ref:`api_stability`.
 
 `git main <https://github.com/meejah/txtorcon>`_ *will likely become v24.1.0*
 
+ * Fix (test) issues with Twisted 24.7.0 (`#400 <https://github.com/meejah/txtorcon/pull/400>`_)
  * Remove usage of "six" (`#395 <https://github.com/meejah/txtorcon/issues/395>`_,
    from `a-dieste <https://github.com/a-detiste>`_
 

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):

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 =