diff --git a/pythonforandroid/recipes/cherrypy/__init__.py b/pythonforandroid/recipes/cherrypy/__init__.py index f4567b2e1c..6d3844b19c 100644 --- 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 = ['setuptools'] site_packages_name = 'cherrypy' call_hostpython_via_targetpython = False diff --git a/pythonforandroid/recipes/feedparser/__init__.py b/pythonforandroid/recipes/feedparser/__init__.py index 8842ca6a89..cce88b9eeb 100644 --- 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 = ['setuptools'] site_packages_name = 'feedparser' call_hostpython_via_targetpython = False diff --git a/pythonforandroid/recipes/kiwisolver/__init__.py b/pythonforandroid/recipes/kiwisolver/__init__.py index 052f88e1bb..ae6fa175d7 100644 --- 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 index 1abb696892..134ed9e33f 100644 --- 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 index f0da1feb1e..3a9505f425 100644 --- a/pythonforandroid/recipes/openssl/__init__.py +++ b/pythonforandroid/recipes/openssl/__init__.py @@ -59,6 +59,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 index 049a5f707f..5965afa354 100644 --- 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 = ['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 index 45180a16f1..579a7600c5 100644 --- 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 = [] def get_recipe_env(self, arch): env = super(ZopeRecipe, self).get_recipe_env(arch)