From 980871a7f3bcf1a633d097e644f73e9c926e5797 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Wed, 15 Jun 2016 17:26:22 +0200 Subject: [PATCH 1/2] update recipezope_interface to 4.1.3 and remove tests --- pythonforandroid/recipes/zope_interface/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py index c6174cd3b3..646d72b081 100644 --- a/pythonforandroid/recipes/zope_interface/__init__.py +++ b/pythonforandroid/recipes/zope_interface/__init__.py @@ -1,4 +1,3 @@ - from pythonforandroid.toolchain import PythonRecipe, shprint, current_directory from os.path import join import sh @@ -6,14 +5,16 @@ 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'] - def build_arch(self, arch): - super(ZopeInterfaceRecipe, self).build_arch(arch) - print('Should remove zope tests etc. here, but skipping for now') + 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') + recipe = ZopeInterfaceRecipe() From f20c7a3e874b2c971d06b26353b8a656f34e3f35 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Wed, 15 Jun 2016 17:48:22 +0200 Subject: [PATCH 2/2] patch setup.py to remove test package --- pythonforandroid/recipes/zope_interface/__init__.py | 1 + .../recipes/zope_interface/no_tests.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pythonforandroid/recipes/zope_interface/no_tests.patch diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py index 646d72b081..3a54b9cc11 100644 --- a/pythonforandroid/recipes/zope_interface/__init__.py +++ b/pythonforandroid/recipes/zope_interface/__init__.py @@ -10,6 +10,7 @@ class ZopeInterfaceRecipe(PythonRecipe): site_packages_name = 'zope.interface' depends = ['python2'] + patches = ['no_tests.patch'] def prebuild_arch(self, arch): super(ZopeInterfaceRecipe, self).prebuild_arch(arch) diff --git a/pythonforandroid/recipes/zope_interface/no_tests.patch b/pythonforandroid/recipes/zope_interface/no_tests.patch new file mode 100644 index 0000000000..09a3872b3e --- /dev/null +++ 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)