Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Origin #1681

Merged
merged 8 commits into from
Feb 10, 2019
Merged

Origin #1681

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/cherrypy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/feedparser/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/kiwisolver/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 2 additions & 0 deletions pythonforandroid/recipes/libtribler/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down
2 changes: 2 additions & 0 deletions pythonforandroid/recipes/openssl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/ruamel.yaml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/zope/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down