Made site-packages copying exclude some files/folders

inclement · inclement · commit 4964ec22ff6f · 2018-11-06T21:25:43.000Z
(in a temporary hacky way)
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -36,7 +36,6 @@ def run_distribute(self):
             with open('local.properties', 'w') as fileh:
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
-        # TODO: Move the packaged python building to the python recipes
         with current_directory(self.dist_dir):
             info("Copying Python distribution")
 
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -789,14 +789,10 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
                     join(ndk_dir_python, 'libs', arch.arch))
                 env['LDFLAGS'] += ' -lpython{}m'.format(python_short_version)
             elif 'python3' in self.ctx.recipe_build_order:
-                # TODO: Make the recipe env get these details from the
-                # python recipe instead of hardcoding
-                env['PYTHON_ROOT'] = Recipe.get_recipe('python3', self.ctx).get_build_dir(arch.arch)
-                env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/Include'
-                env['LDFLAGS'] += (
-                    ' -L' +
-                    join(env['PYTHON_ROOT'], 'android-build') +
-                    ' -lpython3.7m')
+                env['CFLAGS'] += ' -I{}'.format(self.ctx.python_recipe.include_root(arch.arch))
+                env['LDFLAGS'] += ' -L{} -lpython{}m'.format(
+                    self.ctx.python_recipe.link_root(arch.arch),
+                    self.ctx.python_recipe.major_minor_version_string)
 
             hppath = []
             hppath.append(join(dirname(self.hostpython_location), 'Lib'))
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -4,7 +4,7 @@
                                        check_all, is_api_lt, is_ndk)
 from pythonforandroid.logger import logger, info
 from pythonforandroid.util import ensure_dir, walk_valid_filens
-from os.path import exists, join, realpath, basename
+from os.path import exists, join, realpath, dirname
 from os import environ, listdir, walk
 import glob
 import sh
@@ -18,14 +18,21 @@
     'ensurepip',
     'idlelib',
     'tkinter',
-    }
+}
 
 STDLIB_FILEN_BLACKLIST = [
     '*.pyc',
     '*.exe',
     '*.whl',
-    ]
+]
 
+# TODO: Move to a generic location so all recipes use the same blacklist
+SITE_PACKAGES_DIR_BLACKLIST = {
+    '__pycache__',
+    'tests'
+}
+
+SITE_PACKAGES_FILEN_BLACKLIST = []
 
 
 class Python3Recipe(TargetPythonRecipe):
@@ -151,12 +158,19 @@ def create_python_bundle(self, dirn, arch):
         # zip up the standard library
         stdlib_zip = join(dirn, 'stdlib.zip')
         with current_directory(join(self.get_build_dir(arch.arch), 'Lib')):
-            stdlib_filens = walk_valid_filens('.', STDLIB_DIR_BLACKLIST, STDLIB_FILEN_BLACKLIST)
+            stdlib_filens = walk_valid_filens(
+                '.', STDLIB_DIR_BLACKLIST, STDLIB_FILEN_BLACKLIST)
             shprint(sh.zip, stdlib_zip, *stdlib_filens)
 
         # copy the site-packages into place
-        shprint(sh.cp, '-r', self.ctx.get_python_install_dir(),
-                join(dirn, 'site-packages'))
+        ensure_dir(join(dirn, 'site-packages'))
+        # TODO: Improve the API around walking and copying the files
+        with current_directory(self.ctx.get_python_install_dir()):
+            filens = list(walk_valid_filens(
+                '.', SITE_PACKAGES_DIR_BLACKLIST, SITE_PACKAGES_FILEN_BLACKLIST))
+            for filen in filens:
+                ensure_dir(join(dirn, 'site-packages', dirname(filen)))
+                sh.cp(filen, join(dirn, 'site-packages', filen))
 
         # copy the python .so files into place
         python_build_dir = join(self.get_build_dir(arch.arch),
diff --git a/pythonforandroid/util.py b/pythonforandroid/util.py
@@ -140,7 +140,6 @@ def walk_valid_filens(base_dir, invalid_dir_names, invalid_file_patterns):
 
     """ 
 
-    return_filens = []
     for dirn, subdirs, filens in walk(base_dir):
 
         # Remove invalid subdirs so that they will not be walked
