Further recipe changes for python3 kivy#1514

strubbi77 · Feb 5, 2019 · b8c55dc · b8c55dc · RobertFlatt · Feb 6, 2019
1 parent 2fb8281
commit b8c55dc
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/pythonforandroid/recipes/cherrypy/__init__.py b/pythonforandroid/recipes/cherrypy/__init__.py
@@ -4,7 +4,7 @@
 class CherryPyRecipe(PythonRecipe):
     version = '5.1.0'
     url = 'https://bitbucket.org/cherrypy/cherrypy/get/{version}.tar.gz'
-    depends = ['hostpython2', 'setuptools']
+    depends = [('hostpython2', 'hostpython3'), 'setuptools']
     site_packages_name = 'cherrypy'
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/feedparser/__init__.py b/pythonforandroid/recipes/feedparser/__init__.py
@@ -4,7 +4,7 @@
 class FeedparserPyRecipe(PythonRecipe):
     version = '5.2.1'
     url = 'https://github.com/kurtmckee/feedparser/archive/{version}.tar.gz'
-    depends = [('hostpython2', 'python3crystax'), 'setuptools']
+    depends = [('hostpython2', 'hostpython3crystax', 'hostpython3'), 'setuptools']
     site_packages_name = 'feedparser'
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/kiwisolver/__init__.py b/pythonforandroid/recipes/kiwisolver/__init__.py
@@ -5,7 +5,7 @@ class KiwiSolverRecipe(CppCompiledComponentsPythonRecipe):
     site_packages_name = 'kiwisolver'
     version = '0.1.3'
     url = 'https://github.com/nucleic/kiwi/archive/master.zip'
-    depends = ['python2', 'setuptools']
+    depends = ['setuptools']
 
 
 recipe = KiwiSolverRecipe()
diff --git a/pythonforandroid/recipes/libtribler/__init__.py b/pythonforandroid/recipes/libtribler/__init__.py
@@ -17,6 +17,8 @@ class LibTriblerRecipe(PythonRecipe):
                'netifaces', 'openssl', 'pil', 'pycrypto', 'pyleveldb', 'twisted',
               ]
 
+    conflicts = ['python3']
+
     python_depends = ['chardet', 'cherrypy', 'configobj', 'decorator', 'feedparser',
                       'libnacl', 'pyasn1', 'requests', 'six',
                      ]

diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -43,6 +43,9 @@ class OpenSSLRecipe(Recipe):
 
     '''
 
+
+    conflicts = ['python3']
+
     standard_version = '1.1'
     '''the major minor version used to link our recipes'''
     legacy_version = '1.0'
@@ -59,6 +62,8 @@ class OpenSSLRecipe(Recipe):
 
     @property
     def use_legacy(self):
+        if not self.ctx.recipe_build_order:
+            return False
         return any([i for i in ('python2legacy', 'python3crystax') if
                     i in self.ctx.recipe_build_order])
 

diff --git a/pythonforandroid/recipes/ruamel.yaml/__init__.py b/pythonforandroid/recipes/ruamel.yaml/__init__.py
@@ -4,7 +4,7 @@
 class RuamelYamlRecipe(PythonRecipe):
     version = '0.15.77'
     url = 'https://pypi.python.org/packages/source/r/ruamel.yaml/ruamel.yaml-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'setuptools']
+    depends = [('python2', 'python3crystax', 'python3'), 'setuptools']
     site_packages_name = 'ruamel'
     call_hostpython_via_targetpython = False
     patches = ['disable-pip-req.patch']

diff --git a/pythonforandroid/recipes/zope/__init__.py b/pythonforandroid/recipes/zope/__init__.py
@@ -8,7 +8,7 @@ class ZopeRecipe(PythonRecipe):
     version = '4.1.3'
     url = 'http://pypi.python.org/packages/source/z/zope.interface/zope.interface-{version}.tar.gz'
 
-    depends = ['python2']
+    depends = [('python2', 'python3')]
 
     def get_recipe_env(self, arch):
         env = super(ZopeRecipe, self).get_recipe_env(arch)