fix PYTHONPATH hacks

Author: T-Dynamos

pythonforandroid/build.py

@@ -728,10 +728,6 @@ def process_python_modules(ctx, modules, arch):
     host_recipe = None
     try:
         host_recipe = Recipe.get_recipe("hostpython3", ctx)
-        _python_path = host_recipe.get_path_to_python()
-        libdir = glob.glob(join(_python_path, "build", "lib*"))
-        env['PYTHONPATH'] = host_recipe.site_dir + ":" + join(
-            _python_path, "Modules") + ":" + (libdir[0] if libdir else "")
         pip = host_recipe.pip
     except Exception:
         # hostpython3 is unavailable, so fall back to system pip

pythonforandroid/recipe.py

@@ -1031,10 +1031,8 @@ def install_python_package(self, arch, name=None, env=None, is_dir=True):
 
     def get_hostrecipe_env(self, arch=None):
         env = environ.copy()
-        _python_path = self._host_recipe.get_path_to_python()
-        libdir = glob.glob(join(_python_path, "build", "lib*"))
-        env['PYTHONPATH'] = self._host_recipe.site_dir + ":" + join(
-            _python_path, "Modules") + ":" + (libdir[0] if libdir else "")
+        env['PYTHONPATH'] = ''
+        env['HOME'] = '/tmp'
         return env
 
     @property
@@ -1063,14 +1061,9 @@ def install_hostpython_prerequisites(self, packages=None, force_upgrade=True):
         pip_options = [
             "install",
             *packages,
-            "--target", self._host_recipe.site_dir, "--python-version",
-            self.ctx.python_recipe.version,
-            # Don't use sources, instead wheels
-            "--only-binary=:all:",
         ]
         if force_upgrade:
             pip_options.append("--upgrade")
-        # Use system's pip
         pip_env = self.get_hostrecipe_env()
         shprint(self._host_recipe.pip, *pip_options, _env=pip_env)
 
@@ -1397,8 +1390,6 @@ def build_arch(self, arch):
         # make build dir separately
         sub_build_dir = join(build_dir, "p4a_android_build")
         ensure_dir(sub_build_dir)
-        # copy hostpython to built python to ensure correct selection of libs and includes
-        shprint(sh.cp, self.real_hostpython_location, self.ctx.python_recipe.python_exe)
 
         build_args = [
             "-m",
@@ -1411,7 +1402,7 @@ def build_arch(self, arch):
         built_wheels = []
         with current_directory(build_dir):
             shprint(
-                sh.Command(self.ctx.python_recipe.python_exe), *build_args, _env=env
+                sh.Command(self.real_hostpython_location), *build_args, _env=env
             )
             built_wheels = [realpath(whl) for whl in glob.glob("dist/*.whl")]
         self.install_wheel(arch, built_wheels)
@@ -1523,8 +1514,6 @@ class RustCompiledComponentsRecipe(PyProjectRecipe):
         "x86": "i686-linux-android",
     }
 
-    call_hostpython_via_targetpython = False
-
     def get_recipe_env(self, arch, **kwargs):
         env = super().get_recipe_env(arch, **kwargs)
 
@@ -1563,7 +1552,7 @@ def get_recipe_env(self, arch, **kwargs):
         env["PATH"] = ("{hostpython_dir}:{old_path}").format(
             hostpython_dir=Recipe.get_recipe(
                 "hostpython3", self.ctx
-            ).get_path_to_python(),
+            ).local_bin,
             old_path=env["PATH"],
         )
         return env

pythonforandroid/recipes/hostpython3/__init__.py

@@ -15,17 +15,13 @@
 )
 from pythonforandroid.prerequisites import OpenSSLPrerequisite
 
-HOSTPYTHON_VERSION_UNSET_MESSAGE = (
-    'The hostpython recipe must have set version'
-)
+HOSTPYTHON_VERSION_UNSET_MESSAGE = "The hostpython recipe must have set version"
 
-SETUP_DIST_NOT_FIND_MESSAGE = (
-    'Could not find Setup.dist or Setup in Python build'
-)
+SETUP_DIST_NOT_FIND_MESSAGE = "Could not find Setup.dist or Setup in Python build"
 
 
 class HostPython3Recipe(Recipe):
-    '''
+    """
     The hostpython3's recipe.
 
     .. versionchanged:: 2019.10.06.post0
@@ -34,17 +30,17 @@ class HostPython3Recipe(Recipe):
     .. versionchanged:: 0.6.0
         Refactored into  the new class
         :class:`~pythonforandroid.python.HostPythonRecipe`
-    '''
+    """
 
-    version = '3.14.2'
+    version = "3.14.2"
 
-    url = 'https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz'
-    '''The default url to download our host python recipe. This url will
-    change depending on the python version set in attribute :attr:`version`.'''
+    url = "https://github.com/python/cpython/archive/refs/tags/v{version}.tar.gz"
+    """The default url to download our host python recipe. This url will
+    change depending on the python version set in attribute :attr:`version`."""
 
-    build_subdir = 'native-build'
-    '''Specify the sub build directory for the hostpython3 recipe. Defaults
-    to ``native-build``.'''
+    build_subdir = "native-build"
+    """Specify the sub build directory for the hostpython3 recipe. Defaults
+    to ``native-build``."""
 
     patches = ["fix_ensurepip.patch"]
 
@@ -59,17 +55,17 @@ def download(self):
 
     @property
     def _exe_name(self):
-        '''
+        """
         Returns the name of the python executable depending on the version.
-        '''
+        """
         if not self.version:
             raise BuildInterruptingException(HOSTPYTHON_VERSION_UNSET_MESSAGE)
-        return f'python{self.version.split(".")[0]}'
+        return "python"
 
     @property
     def python_exe(self):
-        '''Returns the full path of the hostpython executable.'''
-        return join(self.get_path_to_python(), self._exe_name)
+        """Returns the full path of the hostpython executable."""
+        return join(self.local_bin, self._exe_name)
 
     def get_recipe_env(self, arch=None):
         env = os.environ.copy()
@@ -91,14 +87,14 @@ def should_build(self, arch):
 
     def get_build_container_dir(self, arch=None):
         choices = self.check_recipe_choices()
-        dir_name = '-'.join([self.name] + choices)
-        return join(self.ctx.build_dir, 'other_builds', dir_name, 'desktop')
+        dir_name = "-".join([self.name] + choices)
+        return join(self.ctx.build_dir, "other_builds", dir_name, "desktop")
 
     def get_build_dir(self, arch=None):
-        '''
+        """
         .. note:: Unlike other recipes, the hostpython build dir doesn't
             depend on the target arch
-        '''
+        """
         return join(self.get_build_container_dir(), self.name)
 
     def get_path_to_python(self):
@@ -112,16 +108,20 @@ def site_root(self):
     def site_bin(self):
         return join(self.site_root, self.site_dir, "bin")
 
+    @property
+    def local_dir(self):
+        return join(self.site_root, "usr/local/")
+
     @property
     def local_bin(self):
-        return join(self.site_root, "usr/local/bin/")
+        return join(self.local_dir, "bin")
 
     @property
     def site_dir(self):
         p_version = Version(self.version)
         return join(
             self.site_root,
-            f"usr/local/lib/python{p_version.major}.{p_version.minor}/site-packages/"
+            f"usr/local/lib/python{p_version.major}.{p_version.minor}/site-packages/",
         )
 
     @property
@@ -163,34 +163,40 @@ def build_arch(self, arch):
         # Configure the build
         build_configured = False
         with current_directory(build_dir):
-            if not Path('config.status').exists():
-                shprint(sh.Command(join(recipe_build_dir, 'configure')), _env=env)
+            if not Path("config.status").exists():
+                shprint(
+                    sh.Command(join(recipe_build_dir, "configure")),
+                    "--prefix",
+                    self.local_dir,
+                    _env=env,
+                )
                 build_configured = True
 
         with current_directory(recipe_build_dir):
             # Create the Setup file. This copying from Setup.dist is
             # the normal and expected procedure before Python 3.8, but
             # after this the file with default options is already named "Setup"
-            setup_dist_location = join('Modules', 'Setup.dist')
+            setup_dist_location = join("Modules", "Setup.dist")
             if Path(setup_dist_location).exists():
-                shprint(sh.cp, setup_dist_location,
-                        join(build_dir, 'Modules', 'Setup'))
+                shprint(sh.cp, setup_dist_location, join(build_dir, "Modules", "Setup"))
             else:
                 # Check the expected file does exist
-                setup_location = join('Modules', 'Setup')
+                setup_location = join("Modules", "Setup")
                 if not Path(setup_location).exists():
-                    raise BuildInterruptingException(
-                        SETUP_DIST_NOT_FIND_MESSAGE
-                    )
+                    raise BuildInterruptingException(SETUP_DIST_NOT_FIND_MESSAGE)
 
-            shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir, _env=env)
+            shprint(sh.make, "-j", str(cpu_count()), "-C", build_dir, _env=env)
 
+        with current_directory(build_dir):
+            shprint(sh.make, "install", _env=env)
+
+        with current_directory(recipe_build_dir):
             # make a copy of the python executable giving it the name we want,
             # because we got different python's executable names depending on
             # the fs being case-insensitive (Mac OS X, Cygwin...) or
             # case-sensitive (linux)...so this way we will have an unique name
             # for our hostpython, regarding the used fs
-            for exe_name in ['python.exe', 'python']:
+            for exe_name in ["python.exe", "python"]:
                 exe = join(self.get_path_to_python(), exe_name)
                 if Path(exe).is_file():
                     shprint(sh.cp, exe, self.python_exe)
@@ -200,10 +206,12 @@ def build_arch(self, arch):
         self.ctx.hostpython = self.python_exe
 
         if build_configured:
-
             shprint(
-                sh.Command(self.python_exe), "-m", "ensurepip", "--root", self.site_root, "-U",
-                _env={"HOME": "/tmp", "PATH": self.local_bin}
+                sh.Command(self.python_exe),
+                "-m",
+                "ensurepip",
+                "-U",
+                _env={"HOME": "/tmp", "PATH": self.local_bin},
             )
             self.fix_pip_shebangs()
 

pythonforandroid/recipes/python3/__init__.py

@@ -360,9 +360,9 @@ def build_arch(self, arch):
                     *(' '.join(self.configure_args).format(
                                     android_host=env['HOSTARCH'],
                                     android_build=android_build,
-                                    python_host_bin=join(self.get_recipe(
+                                    python_host_bin=self.get_recipe(
                                         'host' + self.name, self.ctx
-                                    ).get_path_to_python(), "python3"),
+                                    ).python_exe,
                                     prefix=sys_prefix,
                                     exec_prefix=sys_exec_prefix)).split(' '),
                     _env=env)

tests/recipes/test_hostpython3.py

@@ -29,12 +29,6 @@ def test_property__exe_name_no_version(self):
     def test_property__exe_name(self):
         self.assertEqual(self.recipe._exe_name, 'python3')
 
-    def test_property_python_exe(self):
-        self.assertEqual(
-            self.recipe.python_exe,
-            join(self.recipe.get_path_to_python(), 'python3')
-        )
-
     @mock.patch("pythonforandroid.recipes.hostpython3.Path.exists")
     def test_should_build(self, mock_exists):
         # test case for existing python exe which shouldn't trigger the build