fix tests

Author: T-Dynamos

pythonforandroid/build.py

@@ -694,32 +694,48 @@ def process_python_modules(ctx, modules):
     processed_modules.extend(modules)
 
     if len(modules) == 0:
-        return modules
+        return processed_modules
 
     # temp file for pip report
     fd, path = tempfile.mkstemp()
     os.close(fd)
 
     # setup hostpython recipe
-    host_recipe = Recipe.get_recipe("hostpython3", ctx)
-
     env = environ.copy()
-    _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 "")
-
-    shprint(
-        host_recipe.pip, 'install', *modules,
-        '--dry-run', '--break-system-packages', '--ignore-installed',
-        '--report', path, '-q', _env=env
-    )
+    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 non available so we use system pip (like in tests)
+        pip = sh.Command("pip")
+
+    try:
+        shprint(
+            pip, 'install', *modules,
+            '--dry-run', '--break-system-packages', '--ignore-installed',
+            '--report', path, '-q', _env=env
+        )
+    except Exception as e:
+        warning(f"Auto module resolution failed: {e}")
+        return processed_modules
 
     with open(path, "r") as f:
-        report = json.load(f)
+        try:
+            report = json.load(f)
+        except Exception:
+            report = {}
 
     os.remove(path)
 
+    if "install" not in report.keys():
+        # pip changed json reporting format?
+        warning("Auto module resolution failed: invalid json!")
+        return processed_modules
+
     info('Extra resolved pure python dependencies :')
 
     ignored_str = " (ignored)"
@@ -740,7 +756,7 @@ def process_python_modules(ctx, modules):
             pure_python = False
 
         # does this module matches any recipe name?
-        if mname.lower() in _requirement_names:
+        if mname.lower().replace("-", "_") in _requirement_names:
             continue
 
         color = Out_Fore.GREEN if pure_python else Out_Fore.RED
@@ -777,9 +793,7 @@ def run_pymodules_install(ctx, arch, modules, project_dir=None,
 
     info('*** PYTHON PACKAGE / PROJECT INSTALL STAGE FOR ARCH: {} ***'.format(arch))
 
-    # don't run process_python_modules in tests
-    if ctx.recipe_build_order.__class__.__name__ != "Mock":
-        modules = process_python_modules(ctx, modules)
+    modules = process_python_modules(ctx, modules)
 
     modules = [m for m in modules if ctx.not_has_package(m, arch)]
 

tests/test_build.py

@@ -5,7 +5,7 @@
 import jinja2
 
 from pythonforandroid.build import (
-    Context, RECOMMENDED_TARGET_API, run_pymodules_install,
+    Context, RECOMMENDED_TARGET_API, run_pymodules_install, process_python_modules
 )
 from pythonforandroid.archs import ArchARMv7_a, ArchAarch_64
 
@@ -17,7 +17,7 @@ def test_run_pymodules_install_optional_project_dir(self):
         Makes sure the `run_pymodules_install()` doesn't crash when the
         `project_dir` optional parameter is None, refs #1898
         """
-        ctx = mock.Mock()
+        ctx = mock.Mock(recipe_build_order=[])
         ctx.archs = [ArchARMv7_a(ctx), ArchAarch_64(ctx)]
         modules = []
         project_dir = None
@@ -26,8 +26,19 @@ def test_run_pymodules_install_optional_project_dir(self):
         assert m_info.call_args_list[-1] == mock.call(
             'No Python modules and no setup.py to process, skipping')
 
+    def test_python_module_parser(self):
+        ctx = mock.Mock(recipe_build_order=[])
+        ctx.archs = [ArchARMv7_a(ctx), ArchAarch_64(ctx)]
+        # should not alter original module name (like with adding version number)
+        assert "kivy_garden.frostedglass" in process_python_modules(ctx, ["kivy_garden.frostedglass"])
+
+        # should skip urls and other unsupported format
+        modules = ["https://example.com/some.zip", "git+https://github.com/kivy/python-for-android@develop"]
+        result = process_python_modules(ctx, modules)
+        assert modules == result
+
     def test_strip_if_with_debug_symbols(self):
-        ctx = mock.Mock()
+        ctx = mock.Mock(recipe_build_order=[])
         ctx.python_recipe.major_minor_version_string = "3.6"
         ctx.get_site_packages_dir.return_value = "test-doesntexist"
         ctx.build_dir = "nonexistant_directory"