Cleanup

Author: misl6

pythonforandroid/recipe.py

@@ -123,8 +123,8 @@ class Recipe(with_metaclass(RecipeMeta)):
     """
 
     need_stl_shared = False
-    '''Some libraries or python packages may need to be linked with android's
-    stl. We can automatically do this for any recipe if we set this property to
+    '''Some libraries or python packages may need the c++_shared in APK.
+    We can automatically do this for any recipe if we set this property to
     `True`'''
 
     stl_lib_name = 'c++_shared'

pythonforandroid/recipes/cppy/__init__.py

@@ -3,9 +3,6 @@
 
 class CppyRecipe(PythonRecipe):
     site_packages_name = 'cppy'
-
-    # Pin to commit: `Nucleic migration and project documentation`,
-    # because the official releases are too old, at time of writing
     version = '1.1.0'
     url = 'https://github.com/nucleic/cppy/archive/{version}.zip'
     call_hostpython_via_targetpython = False

pythonforandroid/recipes/kiwisolver/__init__.py

@@ -3,12 +3,6 @@
 
 class KiwiSolverRecipe(CppCompiledComponentsPythonRecipe):
     site_packages_name = 'kiwisolver'
-    # Pin to commit `docs: attempt to fix doc building`, the latest one
-    # at the time of writing, just to be sure that we have te most up to date
-    # version, but it should be pinned to an official release once the c++
-    # changes that we want to include are merged to master branch
-    #   Note: the commit we want to include is
-    #         `Cppy use update and c++11 compatibility` (4858730)
     version = '1.3.2'
     url = 'https://github.com/nucleic/kiwi/archive/{version}.zip'
     depends = ['cppy']

pythonforandroid/recipes/matplotlib/__init__.py

@@ -2,6 +2,7 @@
 from pythonforandroid.util import ensure_dir
 
 from os.path import join
+import shutil
 
 
 class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
@@ -13,14 +14,6 @@ class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
 
     python_depends = ['cycler', 'fonttools', 'packaging', 'pyparsing', 'python-dateutil']
 
-    # We need to patch to:
-    # - make mpl install work without importing numpy
-    # - make mpl use shared libraries for freetype and png
-    # - make mpl link to png16, to match p4a library name for png
-    # - prevent mpl trying to build TkAgg, which wouldn't work
-    #   on Android anyway but has build issues
-    # patches = ['mpl_android_fixes.patch']
-
     def generate_libraries_pc_files(self, arch):
         """
         Create *.pc files for libraries that `matplotib` depends on.
@@ -63,39 +56,21 @@ def generate_libraries_pc_files(self, arch):
                 pc_file.write(text_buffer)
 
     def prebuild_arch(self, arch):
-        with open(join(self.get_recipe_dir(), 'setup.cfg.template')) as fileh:
-            setup_cfg = fileh.read()
-
-        with open(join(self.get_build_dir(arch), 'mplsetup.cfg'), 'w') as fileh:
-            fileh.write(setup_cfg.format(
-                ndk_sysroot_usr=join(self.ctx.ndk.sysroot, 'usr')))
-
+        shutil.copyfile(
+            join(self.get_recipe_dir(), "setup.cfg.template"),
+            join(self.get_build_dir(arch), "mplsetup.cfg"),
+        )
         self.generate_libraries_pc_files(arch)
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         env = super().get_recipe_env(arch, with_flags_in_cc)
 
-        # we modify `XDG_CACHE_HOME` to download `jquery-ui` into that folder,
-        # or mpl install will fail when trying to download/install it, but if
-        # we have the proper package already downloaded, it will use the cached
-        # package to successfully finish the installation.
-        # Note: this may not be necessary for some local systems, but it is
-        #       for our CI provider: `gh-actions`, which will
-        #       fail trying to download the `jquery-ui` package
-        env['XDG_CACHE_HOME'] = join(self.get_build_dir(arch), 'p4a_files')
         # we make use of the same directory than `XDG_CACHE_HOME`, for our
         # custom library pc files, so we have all the install files that we
         # generate at the same place
+        env['XDG_CACHE_HOME'] = join(self.get_build_dir(arch), 'p4a_files')
         env['PKG_CONFIG_PATH'] = env['XDG_CACHE_HOME']
 
-        # We set a new environ variable `NUMPY_INCLUDES` to be able to tell
-        # the matplotlib script where to find our numpy without importing it
-        # (which will fail, because numpy isn't installed in our hostpython)
-        env['NUMPY_INCLUDES'] = join(
-            self.ctx.get_site_packages_dir(arch),
-            'numpy', 'core', 'include',
-        )
-
         # creating proper *.pc files for our libraries does not seem enough to
         # success with our build (without depending on system development
         # libraries), but if we tell the compiler where to find our libraries