Merge pull request kivy#789 from brussee/zope_interface

inclement · web-flow · commit 4fc9be959070 · 2016-06-18T17:06:12.000+01:00
update recipe zope_interface to 4.1.3 and remove tests
diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py
@@ -1,19 +1,21 @@
-
 from pythonforandroid.toolchain import PythonRecipe, shprint, current_directory
 from os.path import join
 import sh
 
 
 class ZopeInterfaceRecipe(PythonRecipe):
     name = 'zope_interface'
-    version = '4.1.2'
+    version = '4.1.3'
     url = 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-{version}.tar.gz'
     site_packages_name = 'zope.interface'
 
     depends = ['python2']
+    patches = ['no_tests.patch']
+
+    def prebuild_arch(self, arch):
+        super(ZopeInterfaceRecipe, self).prebuild_arch(arch)
+        with current_directory(self.get_build_dir(arch.arch)):
+            sh.rm('-rf', 'src/zope/interface/tests', 'src/zope/interface/common/tests')
 
-    def build_arch(self, arch):
-        super(ZopeInterfaceRecipe, self).build_arch(arch)
-        print('Should remove zope tests etc. here, but skipping for now')
 
 recipe = ZopeInterfaceRecipe()
diff --git a/pythonforandroid/recipes/zope_interface/no_tests.patch b/pythonforandroid/recipes/zope_interface/no_tests.patch
@@ -0,0 +1,13 @@
+--- zope_interface/setup.py	2015-10-05 09:35:14.000000000 +0200
++++ b/setup.py	2016-06-15 17:44:35.108263993 +0200
+@@ -139,9 +139,8 @@
+         "Topic :: Software Development :: Libraries :: Python Modules",
+       ],
+ 
+-      packages = ['zope', 'zope.interface', 'zope.interface.tests'],
++      packages = ['zope', 'zope.interface'],
+       package_dir = {'': 'src'},
+       cmdclass = {'build_ext': optional_build_ext,
+                   },
+-      test_suite = 'zope.interface.tests',
+       **extra)
