more wrappers for meson recipe

Author: T-Dynamos

pythonforandroid/recipe.py

@@ -5,6 +5,7 @@
 from re import match
 
 import sh
+import subprocess
 import shutil
 import fnmatch
 import zipfile
@@ -1408,6 +1409,7 @@ class MesonRecipe(PyProjectRecipe):
     '''Recipe for projects which uses meson as build system'''
 
     meson_version = "1.4.0"
+    pybind_version = "3.3.0"
 
     skip_python = False
     '''If true, skips all Python build and installation steps.
@@ -1416,6 +1418,18 @@ class MesonRecipe(PyProjectRecipe):
     def sanitize_flags(self, *flag_strings):
         return " ".join(flag_strings).strip().split(" ")
 
+    def get_wrapper_dir(self, arch):
+        return join(self.get_build_dir(arch.arch), "p4a_wrappers")
+
+    def write_wrapper(self, arch, name, content):
+        wrapper_dir = self.get_wrapper_dir(arch)
+        ensure_dir(wrapper_dir)
+        wrapper_path = join(wrapper_dir, name)
+        with open(wrapper_path, "w") as f:
+            f.write(content)
+        chmod(wrapper_path, 0o755)
+        return wrapper_path
+
     def get_python_wrapper(self, arch):
         """
         Meson Python introspection runs on the host interpreter, but the
@@ -1451,19 +1465,50 @@ def get_python_wrapper(self, arch):
         with open(python_file, "r") as f:
             file_data += "\n" + f.read()
 
-        wrapper_dir = join(self.get_build_dir(arch.arch), "p4a_python_wrapper")
-        ensure_dir(wrapper_dir)
-        wrapper_path = join(wrapper_dir, "python")
-        with open(wrapper_path, "w") as f:
-            f.write(file_data)
-        chmod(wrapper_path, 0o755)
+        return self.write_wrapper(arch, "python", file_data)
 
-        return wrapper_path
+    def get_config_wrappers(self, arch, w_type: str):
+        wrapper_name = ""
+        version = ""
+        include_path = ""
+
+        if w_type == "pybind11":
+            wrapper_name = "pybind11-config"
+            include_path = join(self._host_recipe.site_dir, "pybind11/include")
+
+            version = None
+            try:
+                command = [self._host_recipe.real_hostpython_location, "-c", "import pybind11; print(pybind11.__version__)"]
+                version = subprocess.check_output(command).decode('utf-8').strip()
+            except Exception:
+                warning("Unable to get pybind11 version")
+            if version is None:
+                version = self.pybind_version
+
+        elif w_type == "numpy":
+            wrapper_name = "numpy-config"
+            recipe = Recipe.get_recipe("numpy", self.ctx)
+            include_path = recipe.get_include(arch)
+            version = recipe.version
+        else:
+            raise ValueError(f"Unknown wrapper type: {w_type}")
+
+        content = (
+            f"#!/bin/sh\n"
+            f"if [ \"$1\" = \"--version\" ]; then\n"
+            f"    echo '{version}'\n"
+            f"else\n"
+            f"    echo '-I{include_path}'\n"
+            f"fi\n"
+        )
+        return self.write_wrapper(arch, wrapper_name, content)
 
     def get_recipe_meson_options(self, arch):
         env = self.get_recipe_env(arch, with_flags_in_cc=True)
         return {
             "binaries": {
+                "pybind11-config": self.get_config_wrappers(arch, "pybind11"),
+                "numpy-config": self.get_config_wrappers(arch, "numpy"),
                 "python": self.get_python_wrapper(arch),
                 "c": arch.get_clang_exe(with_target=True),
                 "cpp": arch.get_clang_exe(with_target=True, plus_plus=True),

pythonforandroid/recipes/matplotlib/__init__.py

@@ -12,6 +12,7 @@ class MatplotlibRecipe(MesonRecipe):
         "pyparsing",
         "python-dateutil",
     ]
+    pybind_version = "2.13.4"
     hostpython_prerequisites = ["meson-python>=0.13.1,<0.17.0", "pybind11>=2.13.2,!=2.13.3", "setuptools_scm>=7"]
     need_stl_shared = True
 

pythonforandroid/recipes/numpy/__init__.py

@@ -14,6 +14,11 @@ class NumpyRecipe(MesonRecipe):
     need_stl_shared = True
     min_ndk_api_support = 24
 
+    def get_include(self, arch):
+        return join(
+            self.ctx.get_python_install_dir(arch.arch), "numpy/_core/include",
+        )
+
     def get_recipe_meson_options(self, arch):
         options = super().get_recipe_meson_options(arch)
         options["properties"]["longdouble_format"] = (

pythonforandroid/recipes/pandas/__init__.py

@@ -6,7 +6,6 @@ class PandasRecipe(MesonRecipe):
     version = 'v2.3.0'
     url = 'git+https://github.com/pandas-dev/pandas'
     depends = ['numpy', 'libbz2', 'liblzma']
-    hostpython_prerequisites = ["Cython<4.0.0a0", "versioneer", "numpy"]  # meson does not detects venv's cython
     patches = ['fix_numpy_includes.patch']
     python_depends = ['python-dateutil', 'pytz']
     need_stl_shared = True
@@ -29,9 +28,5 @@ def get_recipe_env(self, arch, **kwargs):
         env['LDFLAGS'] += f' -landroid  -l{self.stl_lib_name}'
         return env
 
-    def build_arch(self, arch):
-        super().build_arch(arch)
-        self.restore_hostpython_prerequisites(["cython"])
-
 
 recipe = PandasRecipe()

pythonforandroid/recipes/python3/__init__.py

@@ -210,7 +210,11 @@ def apply_patches(self, arch, build_dir=None):
         super().apply_patches(arch, build_dir)
 
     def include_root(self, arch_name):
-        return glob.glob(join(self.get_build_dir(arch_name), 'android-build', 'android-root', 'include/*/'))[0]
+        _p_version = Version(self.version)
+        return join(
+            self.get_build_dir(arch_name), 'android-build', 'android-root',
+            'include', f'python{_p_version.major}.{_p_version.minor}'
+        )
 
     def link_root(self, arch_name):
         return join(self.get_build_dir(arch_name), 'android-build')

tests/recipes/test_hostpython3.py

@@ -27,7 +27,7 @@ def test_property__exe_name_no_version(self):
         self.recipe._version = hostpython_version
 
     def test_property__exe_name(self):
-        self.assertEqual(self.recipe._exe_name, 'python3')
+        self.assertEqual(self.recipe._exe_name, 'python')
 
     @mock.patch("pythonforandroid.recipes.hostpython3.Path.exists")
     def test_should_build(self, mock_exists):

tests/recipes/test_python3.py

@@ -26,14 +26,6 @@ def test_property__libpython(self):
             f'libpython{self.recipe.link_version}.so'
         )
 
-    def test_include_root(self):
-        expected_include_dir = join(
-            self.recipe.get_build_dir(self.arch.arch), 'Include',
-        )
-        self.assertEqual(
-            expected_include_dir, self.recipe.include_root(self.arch.arch)
-        )
-
     def test_link_root(self):
         expected_link_root = join(
             self.recipe.get_build_dir(self.arch.arch), 'android-build',
@@ -116,11 +108,11 @@ def test_build_arch(
                 mock_sh_command.mock_calls,
             )
         mock_open_zlib.assert_called()
-        self.assertEqual(mock_make.call_count, 1)
-        for make_call, kw in mock_make.call_args_list:
-            self.assertIn(
-                f'INSTSONAME={self.recipe._libpython}', make_call
-            )
+        self.assertEqual(mock_make.call_count, 2)
+        make_call, kw  = mock_make.call_args_list[0]
+        self.assertIn(
+            f'INSTSONAME={self.recipe._libpython}', make_call
+        )
         mock_cp.assert_called_with(
             "pyconfig.h", join(recipe_build_dir, 'Include'),
         )