Merge pull request kivy#1515 from AndreMiras/feature/ticket1485_conditional_build_via_python3

inclement · web-flow · commit 8bf965136923 · 2018-12-12T21:04:07.000Z
Uses target python3 on conditional buids, fixes kivy#1485
diff --git a/ci/constants.py b/ci/constants.py
@@ -4,6 +4,7 @@
 class TargetPython(Enum):
     python2 = 0
     python3crystax = 1
+    python3 = 2
 
 
 # recipes that currently break the build
@@ -94,9 +95,14 @@ class TargetPython(Enum):
     'storm',
     'vlc',
 ])
+# to be created via https://github.com/kivy/python-for-android/issues/1514
+BROKEN_RECIPES_PYTHON3 = set([
+])
+
 BROKEN_RECIPES = {
     TargetPython.python2: BROKEN_RECIPES_PYTHON2,
     TargetPython.python3crystax: BROKEN_RECIPES_PYTHON3_CRYSTAX,
+    TargetPython.python3: BROKEN_RECIPES_PYTHON3,
 }
 # recipes that were already built will be skipped
 CORE_RECIPES = set([
diff --git a/ci/rebuild_updated_recipes.py b/ci/rebuild_updated_recipes.py
@@ -9,7 +9,6 @@
 ```
 ANDROID_SDK_HOME=~/.buildozer/android/platform/android-sdk-20
 ANDROID_NDK_HOME=~/.buildozer/android/platform/android-ndk-r9c
-CRYSTAX_NDK_HOME=~/.buildozer/crystax-ndk
 ./ci/rebuild_update_recipes.py
 ```
 
@@ -20,7 +19,7 @@
   [ERROR]:   Didn't find any valid dependency graphs.
   [ERROR]:   This means that some of your requirements pull in conflicting dependencies.
 - only rebuilds on sdl2 bootstrap
-- supports mainly python3crystax with fallback to python2, but no python3 support
+- supports mainly python3 with fallback to python2
 """
 import sh
 import os
@@ -56,9 +55,7 @@ def build(target_python, requirements):
     testapp = 'setup_testapp_python2.py'
     android_sdk_home = os.environ['ANDROID_SDK_HOME']
     android_ndk_home = os.environ['ANDROID_NDK_HOME']
-    crystax_ndk_home = os.environ['CRYSTAX_NDK_HOME']
-    if target_python == TargetPython.python3crystax:
-        android_ndk_home = crystax_ndk_home
+    if target_python == TargetPython.python3:
         testapp = 'setup_testapp_python3.py'
     requirements.add(target_python.name)
     requirements = ','.join(requirements)
@@ -75,7 +72,7 @@ def build(target_python, requirements):
 
 
 def main():
-    target_python = TargetPython.python3crystax
+    target_python = TargetPython.python3
     recipes = modified_recipes()
     print('recipes modified:', recipes)
     recipes -= CORE_RECIPES
diff --git a/pythonforandroid/recipes/jedi/__init__.py b/pythonforandroid/recipes/jedi/__init__.py
@@ -1,13 +1,11 @@
-
 from pythonforandroid.recipe import PythonRecipe
 
 
 class JediRecipe(PythonRecipe):
-    # version = 'master'
     version = 'v0.9.0'
     url = 'https://github.com/davidhalter/jedi/archive/{version}.tar.gz'
 
-    depends = [('python2', 'python3crystax')]
+    depends = [('python2', 'python3crystax', 'python3')]
 
     patches = ['fix_MergedNamesDict_get.patch']
     # This apparently should be fixed in jedi 0.10 (not released to
