From 2edcceead78817ebc423cf8f8f6a1d2410cccca6 Mon Sep 17 00:00:00 2001 From: Omer Akram Date: Sun, 10 Jun 2018 23:50:59 +0500 Subject: [PATCH] Fix twisted and cryptography build for python 3 --- pythonforandroid/recipes/enum34/__init__.py | 2 +- pythonforandroid/recipes/ipaddress/__init__.py | 2 +- pythonforandroid/recipes/pyasn1/__init__.py | 2 +- pythonforandroid/recipes/pyopenssl/__init__.py | 2 +- pythonforandroid/recipes/zope_interface/__init__.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pythonforandroid/recipes/enum34/__init__.py b/pythonforandroid/recipes/enum34/__init__.py index 3e10070174..0e5930a798 100644 --- a/pythonforandroid/recipes/enum34/__init__.py +++ b/pythonforandroid/recipes/enum34/__init__.py @@ -4,7 +4,7 @@ class Enum34Recipe(PythonRecipe): version = '1.1.3' url = 'https://pypi.python.org/packages/source/e/enum34/enum34-{version}.tar.gz' - depends = ['python2', 'setuptools'] + depends = [('python2', 'python3crystax'), 'setuptools'] site_packages_name = 'enum' call_hostpython_via_targetpython = False diff --git a/pythonforandroid/recipes/ipaddress/__init__.py b/pythonforandroid/recipes/ipaddress/__init__.py index 40211a40a0..9e98f2a9bf 100644 --- a/pythonforandroid/recipes/ipaddress/__init__.py +++ b/pythonforandroid/recipes/ipaddress/__init__.py @@ -6,7 +6,7 @@ class IpaddressRecipe(PythonRecipe): version = '1.0.16' url = 'https://pypi.python.org/packages/source/i/ipaddress/ipaddress-{version}.tar.gz' - depends = ['python2'] + depends = [('python2', 'python3crystax')] recipe = IpaddressRecipe() diff --git a/pythonforandroid/recipes/pyasn1/__init__.py b/pythonforandroid/recipes/pyasn1/__init__.py index 08c821edee..64b007d8ce 100644 --- a/pythonforandroid/recipes/pyasn1/__init__.py +++ b/pythonforandroid/recipes/pyasn1/__init__.py @@ -5,7 +5,7 @@ class PyASN1Recipe(PythonRecipe): version = '0.1.8' url = 'https://pypi.python.org/packages/source/p/pyasn1/pyasn1-{version}.tar.gz' - depends = ['python2'] + depends = [('python2', 'python3crystax')] recipe = PyASN1Recipe() diff --git a/pythonforandroid/recipes/pyopenssl/__init__.py b/pythonforandroid/recipes/pyopenssl/__init__.py index 9a11e7fd9e..e090e99932 100644 --- a/pythonforandroid/recipes/pyopenssl/__init__.py +++ b/pythonforandroid/recipes/pyopenssl/__init__.py @@ -5,7 +5,7 @@ class PyOpenSSLRecipe(PythonRecipe): version = '0.14' url = 'https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-{version}.tar.gz' - depends = ['openssl', 'python2', 'setuptools'] + depends = [('python2', 'python3crystax'), 'openssl', 'setuptools'] site_packages_name = 'OpenSSL' call_hostpython_via_targetpython = False diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py index d4fa0ccb06..e1e43ed261 100644 --- a/pythonforandroid/recipes/zope_interface/__init__.py +++ b/pythonforandroid/recipes/zope_interface/__init__.py @@ -10,7 +10,7 @@ class ZopeInterfaceRecipe(PythonRecipe): url = 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-{version}.tar.gz' site_packages_name = 'zope.interface' - depends = ['python2'] + depends = [('python2', 'python3crystax')] patches = ['no_tests.patch'] def prebuild_arch(self, arch):