fix numpy and matplotlib build

Author: T-Dynamos

pythonforandroid/logger.py

@@ -135,6 +135,14 @@ def shprint(command, *args, **kwargs):
     kwargs["_out_bufsize"] = 1
     kwargs["_err_to_out"] = True
     kwargs["_bg"] = True
+
+    # silent mode
+    silent = kwargs.get("silent", False)
+    kwargs.pop("silent", False)
+    if silent:
+        kwargs["_out"] = None
+        kwargs["_err"] = None
+
     is_critical = kwargs.pop('_critical', False)
     tail_n = kwargs.pop('_tail', None)
     full_debug = False
@@ -190,6 +198,11 @@ def shprint(command, *args, **kwargs):
                 Err_Style.RESET_ALL, ' ', width=(columns - 1)))
             stdout.flush()
     except sh.ErrorReturnCode as err:
+        if silent:
+            if is_critical:
+                exit(1)
+            else:
+                raise
         if need_closing_newline:
             stdout.write('{}\r{:>{width}}\r'.format(
                 Err_Style.RESET_ALL, ' ', width=(columns - 1)))

pythonforandroid/recipe.py

@@ -1278,7 +1278,7 @@ def lookup_prebuilt(self, arch):
         pip_options.extend(["--dry-run", "-q"])
         pip_env = self.get_hostrecipe_env()
         try:
-            shprint(self._host_recipe.pip, *pip_options, _env=pip_env)
+            shprint(self._host_recipe.pip, *pip_options, _env=pip_env, silent=True)
         except Exception:
             return False
         return True
@@ -1295,9 +1295,6 @@ def check_prebuilt(self, arch, msg=""):
         return False
 
     def get_recipe_env(self, arch, **kwargs):
-        # Custom hostpython
-        self.ctx.python_recipe.python_exe = join(
-            self.ctx.python_recipe.get_build_dir(arch), "android-build", "python3")
         env = super().get_recipe_env(arch, **kwargs)
         build_dir = self.get_build_dir(arch)
         ensure_dir(build_dir)

pythonforandroid/recipes/matplotlib/__init__.py

@@ -1,29 +1,23 @@
 from pythonforandroid.recipe import MesonRecipe
-from pythonforandroid.logger import shprint
-
-from os.path import join
-import sh
 
 
 class MatplotlibRecipe(MesonRecipe):
-    version = '3.10.7'
-    url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'
-    depends = ['kiwisolver', 'numpy', 'pillow']
-    python_depends = ['cycler', 'fonttools', 'packaging', 'pyparsing', 'python-dateutil']
-    hostpython_prerequisites = ["setuptools_scm>=7"]
-    patches = ["meson.patch"]
+    version = "3.10.7"
+    url = "https://github.com/matplotlib/matplotlib/archive/v{version}.zip"
+    depends = ["kiwisolver", "numpy", "pillow"]
+    python_depends = [
+        "cycler",
+        "fonttools",
+        "packaging",
+        "pyparsing",
+        "python-dateutil",
+    ]
     need_stl_shared = True
 
     def get_recipe_env(self, arch, **kwargs):
         env = super().get_recipe_env(arch, **kwargs)
-        env['CXXFLAGS'] += ' -Wno-c++11-narrowing'
+        env["CXXFLAGS"] += " -Wno-c++11-narrowing"
         return env
 
-    def build_arch(self, arch):
-        python_path = join(self.ctx.python_recipe.get_build_dir(arch), "android-build", "python3")
-        self.extra_build_args += [f'-Csetup-args=-Dpython3_program={python_path}']
-        shprint(sh.cp, self.real_hostpython_location, python_path)
-        super().build_arch(arch)
-
 
 recipe = MatplotlibRecipe()

pythonforandroid/recipes/matplotlib/meson.patch

@@ -2,24 +2,23 @@
 from os.path import join
 import shutil
 
-NUMPY_NDK_MESSAGE = "In order to build numpy, you must set minimum ndk api (minapi) to `24`.\n"
+NUMPY_NDK_MESSAGE = (
+    "In order to build numpy, you must set minimum ndk api (minapi) to `24`.\n"
+)
 
 
 class NumpyRecipe(MesonRecipe):
-    version = 'v2.3.0'
-    url = 'git+https://github.com/numpy/numpy'
-    hostpython_prerequisites = ["Cython>=3.0.6", "numpy"]  # meson does not detects venv's cython
-    extra_build_args = ['-Csetup-args=-Dblas=none', '-Csetup-args=-Dlapack=none']
+    version = "v2.3.0"
+    url = "git+https://github.com/numpy/numpy"
+    extra_build_args = ["-Csetup-args=-Dblas=none", "-Csetup-args=-Dlapack=none"]
     need_stl_shared = True
     min_ndk_api_support = 24
 
     def get_recipe_meson_options(self, arch):
         options = super().get_recipe_meson_options(arch)
-        # Custom python is required, so that meson
-        # gets libs and config files properly
-        options["binaries"]["python"] = self.ctx.python_recipe.python_exe
-        options["binaries"]["python3"] = self.ctx.python_recipe.python_exe
-        options["properties"]["longdouble_format"] = "IEEE_DOUBLE_LE" if arch.arch in ["armeabi-v7a", "x86"] else "IEEE_QUAD_LE"
+        options["properties"]["longdouble_format"] = (
+            "IEEE_DOUBLE_LE" if arch.arch in ["armeabi-v7a", "x86"] else "IEEE_QUAD_LE"
+        )
         return options
 
     def get_recipe_env(self, arch, **kwargs):
@@ -32,17 +31,16 @@ def get_recipe_env(self, arch, **kwargs):
         # NPY_DISABLE_SVML=1 allows numpy to build for non-AVX512 CPUs
         # See: https://github.com/numpy/numpy/issues/21196
         env["NPY_DISABLE_SVML"] = "1"
-        env["TARGET_PYTHON_EXE"] = join(Recipe.get_recipe(
-                "python3", self.ctx).get_build_dir(arch.arch), "android-build", "python")
+        env["TARGET_PYTHON_EXE"] = join(
+            Recipe.get_recipe("python3", self.ctx).get_build_dir(arch.arch),
+            "android-build",
+            "python",
+        )
         return env
 
-    def build_arch(self, arch):
-        super().build_arch(arch)
-        self.restore_hostpython_prerequisites(["cython"])
-
     def get_hostrecipe_env(self, arch=None):
         env = super().get_hostrecipe_env(arch=arch)
-        env['RANLIB'] = shutil.which('ranlib')
+        env["RANLIB"] = shutil.which("ranlib")
         return env