Applied tito's fixes for python recipes installed via pip

inclement · inclement · commit a0838b671a40 · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -509,14 +509,13 @@ def get_site_packages_dir(self, arch=None):
         '''Returns the location of site-packages in the python-install build
         dir.
         '''
+        if self.python_recipe.name == 'python2':
+            return join(self.get_python_install_dir(),
+                        'lib', 'python2.7', 'site-packages')
 
-        # This needs to be replaced with something more general in
-        # order to support multiple python versions and/or multiple
-        # archs.
-        if self.python_recipe.from_crystax:
-            return self.get_python_install_dir()
-        return join(self.get_python_install_dir(),
-                    'lib', 'python2.7', 'site-packages')
+        # Only python2 is a special case, other python recipes use the
+        # python install dir
+        return self.get_python_install_dir()
 
     def get_libs_dir(self, arch):
         '''The libs dir for a given arch.'''
@@ -621,7 +620,9 @@ def run_pymodules_install(ctx, modules):
 
     venv = sh.Command(ctx.virtualenv)
     with current_directory(join(ctx.build_dir)):
-        shprint(venv, '--python=python2.7', 'venv')
+        shprint(venv,
+                '--python=python{}'.format(ctx.python_recipe.major_minor_version_string()),
+                'venv')
 
         info('Creating a requirements.txt file for the Python modules')
         with open('requirements.txt', 'w') as fileh:
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -13,7 +13,8 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
 
     src_filename = 'src'
 
-    depends = [('pygame', 'sdl2', 'genericndkbuild'), ('python2', 'python3crystax')]
+    depends = [('pygame', 'sdl2', 'genericndkbuild'),
+               ('python2', 'python3crystax', 'python3')]
 
     config_env = {}
 
diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py
@@ -10,7 +10,7 @@ class Hostpython3Recipe(Recipe):
     url = 'https://www.python.org/ftp/python/{version}/Python-{version}.tgz'
     name = 'hostpython3'
 
-    conflicts = ['hostpython2']
+    conflicts = ['hostpython2', 'hostpython3crystax']
 
     def get_build_container_dir(self, arch=None):
         choices = self.check_recipe_choices()
