Indigo changes

Author: pax0r

pythonforandroid/bootstraps/common/build/build.py

@@ -75,7 +75,7 @@ def get_bootstrap_name():
 ]
 # pyc/py
 if PYTHON is not None:
-    BLACKLIST_PATTERNS.append('*.py')
+    #BLACKLIST_PATTERNS.append('*.py')
     if PYTHON_VERSION and int(PYTHON_VERSION[0]) == 2:
         # we only blacklist `.pyc` for python2 because in python3 the compiled
         # extension is `.pyc` (.pyo files not exists for python >= 3.6)

pythonforandroid/python.py

@@ -310,6 +310,7 @@ def create_python_bundle(self, dirn, arch):
         c_ext = self.compiled_extension
         ensure_dir(modules_dir)
         module_filens = (glob.glob(join(modules_build_dir, '*.so')) +
+                         glob.glob(join(modules_build_dir, '*.py')) +
                          glob.glob(join(modules_build_dir, '*' + c_ext)))
         info("Copy {} files into the bundle".format(len(module_filens)))
         for filen in module_filens:

pythonforandroid/recipe.py

@@ -102,6 +102,8 @@ class Recipe(with_metaclass(RecipeMeta)):
 
     archs = ['armeabi']  # Not currently implemented properly
 
+    download_filename = None
+
     @property
     def version(self):
         key = 'VERSION_' + self.name
@@ -311,7 +313,10 @@ def download(self):
         shprint(sh.mkdir, '-p', join(self.ctx.packages_path, self.name))
 
         with current_directory(join(self.ctx.packages_path, self.name)):
-            filename = shprint(sh.basename, url).stdout[:-1].decode('utf-8')
+            if self.download_filename:
+                filename = self.download_filename
+            else:
+                filename = shprint(sh.basename, url).stdout[:-1].decode('utf-8')
 
             do_download = True
             marker_filename = '.mark-{}'.format(filename)
@@ -371,12 +376,14 @@ def unpack(self, arch):
         if self.url is None:
             info('Skipping {} unpack as no URL is set'.format(self.name))
             return
-
-        filename = shprint(
-            sh.basename, self.versioned_url).stdout[:-1].decode('utf-8')
-        ma = match(u'^(.+)#md5=([0-9a-f]{32})$', filename)
-        if ma:                  # fragmented URL?
-            filename = ma.group(1)
+        if self.download_filename:
+            filename = self.download_filename
+        else:
+            filename = shprint(
+                sh.basename, self.versioned_url).stdout[:-1].decode('utf-8')
+            ma = match(u'^(.+)#md5=([0-9a-f]{32})$', filename)
+            if ma:                  # fragmented URL?
+                filename = ma.group(1)
 
         with current_directory(build_dir):
             directory_name = self.get_build_dir(arch)
@@ -889,6 +896,9 @@ def build_arch(self, arch):
         self.build_compiled_components(arch)
         self.install_python_package(arch)
 
+    def _get_build_dir(self):
+        return glob.glob('build/lib.*')[0]
+
     def build_compiled_components(self, arch):
         info('Building compiled components in {}'.format(self.name))
 
@@ -899,7 +909,7 @@ def build_compiled_components(self, arch):
                 shprint(hostpython, 'setup.py', 'clean', '--all', _env=env)
             shprint(hostpython, 'setup.py', self.build_cmd, '-v',
                     _env=env, *self.setup_extra_args)
-            build_dir = glob.glob('build/lib.*')[0]
+            build_dir = self._get_build_dir()
             shprint(sh.find, build_dir, '-name', '"*.o"', '-exec',
                     env['STRIP'], '{}', ';', _env=env)
 

pythonforandroid/recipes/android/src/setup.py

@@ -4,7 +4,8 @@
 library_dirs = ['libs/' + os.environ['ARCH']]
 lib_dict = {
     'pygame': ['sdl'],
-    'sdl2': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf']
+    'sdl2': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf'],
+    'webview': ['SDL2', 'SDL2_image', 'SDL2_mixer', 'SDL2_ttf'],
 }
 sdl_libs = lib_dict[os.environ['BOOTSTRAP']]
 

pythonforandroid/recipes/decorator/__init__.py

@@ -3,7 +3,7 @@
 
 
 class SixRecipe(PythonRecipe):
-    version = '1.9.0'
+    version = '1.12.0'
     url = 'https://pypi.python.org/packages/source/s/six/six-{version}.tar.gz'
     depends = [('python2', 'python2legacy', 'python3', 'python3crystax')]
     # this recipe seems to control the dependency graph in some way, because

pythonforandroid/recipes/pytz/__init__.py

@@ -5,9 +5,9 @@
 
 
 class Sqlite3Recipe(NDKRecipe):
-    version = '3.15.1'
+    version = '3.26.0'
     # Don't forget to change the URL when changing the version
-    url = 'https://www.sqlite.org/2016/sqlite-amalgamation-3150100.zip'
+    url = "https://sqlite.org/2018/sqlite-autoconf-3260000.tar.gz"
     generated_libraries = ['sqlite3']
 
     def should_build(self, arch):