Better recipe for Twisted: removed the unit tests.

pavelsof · pavelsof · commit af8e1b740aa4 · 2020-04-20T23:08:00.000+02:00
diff --git a/pythonforandroid/recipes/twisted/__init__.py b/pythonforandroid/recipes/twisted/__init__.py
@@ -1,3 +1,6 @@
+import os
+import shutil
+
 from pythonforandroid.recipe import CythonRecipe
 
 
@@ -6,15 +9,21 @@ class TwistedRecipe(CythonRecipe):
     url = 'https://github.com/twisted/twisted/archive/twisted-{version}.tar.gz'
 
     depends = ['setuptools', 'zope_interface', 'incremental', 'constantly']
-    patches = ['incremental.patch']
+    patches = ['incremental.patch', 'remove_tests.patch']
 
     call_hostpython_via_targetpython = False
     install_in_hostpython = False
 
     def prebuild_arch(self, arch):
         super().prebuild_arch(arch)
         # TODO Need to whitelist tty.pyo and termios.so here
-        print('Should remove twisted tests etc. here, but skipping for now')
+
+        # remove the unit test dirs
+        source_dir = os.path.join(self.get_build_dir(arch.arch), 'src/twisted')
+        for item in os.walk(source_dir):
+            if os.path.basename(item[0]) == 'test':
+                full_path = os.path.join(source_dir, item[0])
+                shutil.rmtree(full_path, ignore_errors=True)
 
     def get_recipe_env(self, arch):
         env = super().get_recipe_env(arch)
diff --git a/pythonforandroid/recipes/twisted/remove_tests.patch b/pythonforandroid/recipes/twisted/remove_tests.patch
@@ -0,0 +1,16 @@
+diff --git a/src/twisted/python/_setup.py b/src/twisted/python/_setup.py
+index 32cb096c7..a607fef07 100644
+--- a/src/twisted/python/_setup.py
++++ b/src/twisted/python/_setup.py
+@@ -160,11 +160,6 @@ class ConditionalExtension(Extension, object):
+ 
+ # The C extensions used for Twisted.
+ _EXTENSIONS = [
+-    ConditionalExtension(
+-        "twisted.test.raiser",
+-        sources=["src/twisted/test/raiser.c"],
+-        condition=lambda _: _isCPython),
+-
+     ConditionalExtension(
+         "twisted.internet.iocpreactor.iocpsupport",
+         sources=[
