Merge pull request kivy#1296 from om26er/more-python3-support

inclement · web-flow · commit 15c032ac9721 · 2018-06-11T21:19:29.000+01:00
Fix twisted and cryptography build for python 3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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):
