Update of Recipes for python3 test (#1622)

Update of Recipes for test of broken recipes because of invalid dependency graphs, refs #1514
kivy · Jan 29, 2019 · 3cc0657 · 3cc0657
1 parent 230fb66
commit 3cc0657
Show file tree

Hide file tree

Showing 59 changed files with 55 additions and 62 deletions.
diff --git a/pythonforandroid/recipes/atom/__init__.py b/pythonforandroid/recipes/atom/__init__.py
@@ -5,7 +5,7 @@ class AtomRecipe(CppCompiledComponentsPythonRecipe):
     site_packages_name = 'atom'
     version = '0.3.10'
     url = 'https://github.com/nucleic/atom/archive/master.zip'
-    depends = ['python2', 'setuptools']
+    depends = ['setuptools']
 
 
 recipe = AtomRecipe()
diff --git a/pythonforandroid/recipes/babel/__init__.py b/pythonforandroid/recipes/babel/__init__.py
@@ -6,7 +6,7 @@ class BabelRecipe(PythonRecipe):
     version = '2.2.0'
     url = 'https://pypi.python.org/packages/source/B/Babel/Babel-{version}.tar.gz'
 
-    depends = [('python2', 'python3crystax'), 'setuptools', 'pytz']
+    depends = ['setuptools', 'pytz']
 
     call_hostpython_via_targetpython = False
     install_in_hostpython = True

diff --git a/pythonforandroid/recipes/cdecimal/__init__.py b/pythonforandroid/recipes/cdecimal/__init__.py
@@ -7,7 +7,7 @@ class CdecimalRecipe(CompiledComponentsPythonRecipe):
     version = '2.3'
     url = 'http://www.bytereef.org/software/mpdecimal/releases/cdecimal-{version}.tar.gz'
 
-    depends = ['python2']
+    depends = []
 
     patches = ['locale.patch',
                'cross-compile.patch']

diff --git a/pythonforandroid/recipes/coverage/__init__.py b/pythonforandroid/recipes/coverage/__init__.py
@@ -7,7 +7,7 @@ class CoverageRecipe(PythonRecipe):
 
     url = 'https://pypi.python.org/packages/2d/10/6136c8e10644c16906edf4d9f7c782c0f2e7ed47ff2f41f067384e432088/coverage-{version}.tar.gz'
 
-    depends = ['hostpython2', 'setuptools']
+    depends = [('hostpython2', 'hostpython3'), 'setuptools']
 
     patches = ['fallback-utf8.patch']
 

diff --git a/pythonforandroid/recipes/dateutil/__init__.py b/pythonforandroid/recipes/dateutil/__init__.py
@@ -6,7 +6,7 @@ class DateutilRecipe(PythonRecipe):
     version = '2.6.0'
     url = 'https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6/python-dateutil-2.6.0.tar.gz'
 
-    depends = ['python2', "setuptools"]
+    depends = ["setuptools"]
     call_hostpython_via_targetpython = False
     install_in_hostpython = True
 

diff --git a/pythonforandroid/recipes/decorator/__init__.py b/pythonforandroid/recipes/decorator/__init__.py
@@ -5,7 +5,7 @@ class DecoratorPyRecipe(PythonRecipe):
     version = '4.2.1'
     url = 'https://pypi.python.org/packages/source/d/decorator/decorator-{version}.tar.gz'
     url = 'https://github.com/micheles/decorator/archive/{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'setuptools']
+    depends = ['setuptools']
     site_packages_name = 'decorator'
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/doubleratchet/__init__.py b/pythonforandroid/recipes/doubleratchet/__init__.py
@@ -6,7 +6,6 @@ class DoubleRatchetRecipe(PythonRecipe):
     version = '0.4.0'
     url = 'https://pypi.python.org/packages/source/D/DoubleRatchet/DoubleRatchet-{version}.tar.gz'
     depends = [
-        ('python2', 'python3crystax'),
         'setuptools',
         'cryptography',
     ]

diff --git a/pythonforandroid/recipes/enaml/__init__.py b/pythonforandroid/recipes/enaml/__init__.py
@@ -6,7 +6,7 @@ class EnamlRecipe(CppCompiledComponentsPythonRecipe):
     version = '0.9.8'
     url = 'https://github.com/nucleic/enaml/archive/master.zip'
     patches = ['0001-Update-setup.py.patch']  # Remove PyQt dependency
-    depends = ['python2', 'setuptools', 'atom', 'kiwisolver']
+    depends = ['setuptools', 'atom', 'kiwisolver']
 
 
 recipe = EnamlRecipe()
diff --git a/pythonforandroid/recipes/ethash/__init__.py b/pythonforandroid/recipes/ethash/__init__.py
@@ -5,7 +5,7 @@ class EthashRecipe(PythonRecipe):
 
     url = 'https://github.com/ethereum/ethash/archive/master.zip'
 
-    depends = ['python2', 'setuptools']
+    depends = ['setuptools']
 
 
 recipe = EthashRecipe()
diff --git a/pythonforandroid/recipes/evdev/__init__.py b/pythonforandroid/recipes/evdev/__init__.py
@@ -6,7 +6,7 @@ class EvdevRecipe(CompiledComponentsPythonRecipe):
     version = 'v0.4.7'
     url = 'https://github.com/gvalkov/python-evdev/archive/{version}.zip'
 
-    depends = [('python2', 'python3crystax')]
+    depends = []
 
     build_cmd = 'build'
 

diff --git a/pythonforandroid/recipes/gevent-websocket/__init__.py b/pythonforandroid/recipes/gevent-websocket/__init__.py
@@ -4,7 +4,7 @@
 class GeventWebsocketRecipe(PythonRecipe):
     version = '0.9.5'
     url = 'https://pypi.python.org/packages/source/g/gevent-websocket/gevent-websocket-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'setuptools']
+    depends = ['setuptools']
     site_packages_name = 'geventwebsocket'
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/groestlcoin_hash/__init__.py b/pythonforandroid/recipes/groestlcoin_hash/__init__.py
@@ -4,7 +4,7 @@
 class GroestlcoinHashRecipe(CythonRecipe):
     version = '1.0.1'
     url = 'https://github.com/Groestlcoin/groestlcoin-hash-python/archive/{version}.tar.gz'
-    depends = ['python3crystax']
+    depends = []
     call_hostpython_via_targetpython = True
     cythonize = False
 

diff --git a/pythonforandroid/recipes/icu/__init__.py b/pythonforandroid/recipes/icu/__init__.py
@@ -11,7 +11,7 @@ class ICURecipe(NDKRecipe):
     version = '57.1'
     url = 'http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz'
 
-    depends = [('python2', 'python3crystax'), 'hostpython2']  # installs in python
+    depends = [('hostpython2', 'hostpython3')]  # installs in python
     generated_libraries = [
         'libicui18n.so', 'libicuuc.so', 'libicudata.so', 'libicule.so']
 

diff --git a/pythonforandroid/recipes/ifaddrs/__init__.py b/pythonforandroid/recipes/ifaddrs/__init__.py
@@ -10,7 +10,7 @@
 class IFAddrRecipe(CompiledComponentsPythonRecipe):
     version = 'master'
     url = 'git+https://github.com/morristech/android-ifaddrs.git'
-    depends = [('hostpython2', 'hostpython3'), ('python2', 'python3crystax')]
+    depends = [('hostpython2', 'hostpython3')]
 
     call_hostpython_via_targetpython = False
     site_packages_name = 'ifaddrs'

diff --git a/pythonforandroid/recipes/libgeos/__init__.py b/pythonforandroid/recipes/libgeos/__init__.py
@@ -8,7 +8,7 @@ class LibgeosRecipe(Recipe):
     version = '3.5'
     # url = 'http://download.osgeo.org/geos/geos-{version}.tar.bz2'
     url = 'https://github.com/libgeos/libgeos/archive/svn-{version}.zip'
-    depends = ['python2']
+    depends = []
 
     def should_build(self, arch):
         super(LibgeosRecipe, self).should_build(arch)

diff --git a/pythonforandroid/recipes/libglob/__init__.py b/pythonforandroid/recipes/libglob/__init__.py
@@ -21,7 +21,7 @@ class LibGlobRecipe(CompiledComponentsPythonRecipe):
     # and pushed in via patch
     name = 'libglob'
 
-    depends = [('hostpython2', 'hostpython3'), ('python2', 'python3crystax')]
+    depends = [('hostpython2', 'hostpython3')]
     patches = ['glob.patch']
 
     def should_build(self, arch):

diff --git a/pythonforandroid/recipes/libnacl/__init__.py b/pythonforandroid/recipes/libnacl/__init__.py
@@ -4,7 +4,7 @@
 class LibNaClRecipe(PythonRecipe):
     version = '1.4.4'
     url = 'https://github.com/saltstack/libnacl/archive/v{version}.tar.gz'
-    depends = ['hostpython2', 'setuptools', 'libsodium']
+    depends = [('hostpython2', 'hostpython3'), 'setuptools', 'libsodium']
     site_packages_name = 'libnacl'
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/libpq/__init__.py b/pythonforandroid/recipes/libpq/__init__.py
@@ -6,7 +6,7 @@
 class LibpqRecipe(Recipe):
     version = '9.5.3'
     url = 'http://ftp.postgresql.org/pub/source/v{version}/postgresql-{version}.tar.bz2'
-    depends = [('python2', 'python3crystax')]
+    depends = []
 
     def should_build(self, arch):
         return not os.path.isfile('{}/libpq.a'.format(self.ctx.get_libs_dir(arch.arch)))

diff --git a/pythonforandroid/recipes/libsodium/__init__.py b/pythonforandroid/recipes/libsodium/__init__.py
@@ -6,7 +6,7 @@
 class LibsodiumRecipe(Recipe):
     version = '1.0.16'
     url = 'https://github.com/jedisct1/libsodium/releases/download/{version}/libsodium-{version}.tar.gz'
-    depends = ['python2']
+    depends = []
     patches = ['size_max_fix.patch']
 
     def should_build(self, arch):

diff --git a/pythonforandroid/recipes/libtorrent/__init__.py b/pythonforandroid/recipes/libtorrent/__init__.py
@@ -11,7 +11,7 @@ class LibtorrentRecipe(Recipe):
     version = '1.0.9'
     # Don't forget to change the URL when changing the version
     url = 'https://github.com/arvidn/libtorrent/archive/libtorrent-1_0_9.tar.gz'
-    depends = ['boost', 'python2']
+    depends = ['boost']
     opt_depends = ['openssl']
     patches = ['disable-so-version.patch', 'use-soname-python.patch', 'setup-lib-name.patch']
 

diff --git a/pythonforandroid/recipes/libtribler/__init__.py b/pythonforandroid/recipes/libtribler/__init__.py
@@ -14,7 +14,7 @@ class LibTriblerRecipe(PythonRecipe):
     url = 'git+https://github.com/Tribler/tribler.git'
 
     depends = ['apsw', 'cryptography', 'ffmpeg', 'libsodium', 'libtorrent', 'm2crypto',
-               'netifaces', 'openssl', 'pil', 'pycrypto', 'pyleveldb', 'python2', 'twisted',
+               'netifaces', 'openssl', 'pil', 'pycrypto', 'pyleveldb', 'twisted',
               ]
 
     python_depends = ['chardet', 'cherrypy', 'configobj', 'decorator', 'feedparser',

diff --git a/pythonforandroid/recipes/libzmq/__init__.py b/pythonforandroid/recipes/libzmq/__init__.py
@@ -7,7 +7,7 @@
 class LibZMQRecipe(Recipe):
     version = '4.1.4'
     url = 'http://download.zeromq.org/zeromq-{version}.tar.gz'
-    depends = ['python2']
+    depends = []
 
     def should_build(self, arch):
         super(LibZMQRecipe, self).should_build(arch)

diff --git a/pythonforandroid/recipes/m2crypto/__init__.py b/pythonforandroid/recipes/m2crypto/__init__.py
@@ -8,7 +8,7 @@
 class M2CryptoRecipe(CompiledComponentsPythonRecipe):
     version = '0.30.1'
     url = 'https://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-{version}.tar.gz'
-    depends = [('python2', 'python3'), 'openssl', 'setuptools']
+    depends = ['openssl', 'setuptools']
     site_packages_name = 'M2Crypto'
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/msgpack-python/__init__.py b/pythonforandroid/recipes/msgpack-python/__init__.py
@@ -4,7 +4,7 @@
 class MsgPackRecipe(CythonRecipe):
     version = '0.4.7'
     url = 'https://pypi.python.org/packages/source/m/msgpack-python/msgpack-python-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), "setuptools"]
+    depends = ["setuptools"]
     call_hostpython_via_targetpython = False
 
 

diff --git a/pythonforandroid/recipes/mysqldb/__init__.py b/pythonforandroid/recipes/mysqldb/__init__.py
@@ -8,7 +8,7 @@ class MysqldbRecipe(CompiledComponentsPythonRecipe):
     url = 'https://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-{version}.zip'
     site_packages_name = 'MySQLdb'
 
-    depends = ['python2', 'setuptools', 'libmysqlclient']
+    depends = ['setuptools', 'libmysqlclient']
 
     patches = ['override-mysql-config.patch',
                'disable-zip.patch']

diff --git a/pythonforandroid/recipes/omemo-backend-signal/__init__.py b/pythonforandroid/recipes/omemo-backend-signal/__init__.py
@@ -7,7 +7,6 @@ class OmemoBackendSignalRecipe(PythonRecipe):
     url = 'https://pypi.python.org/packages/source/o/omemo-backend-signal/omemo-backend-signal-{version}.tar.gz'
     site_packages_name = 'omemo-backend-signal'
     depends = [
-        ('python2', 'python3crystax'),
         'setuptools',
         'protobuf_cpp',
         'x3dh',

diff --git a/pythonforandroid/recipes/omemo/__init__.py b/pythonforandroid/recipes/omemo/__init__.py
@@ -7,7 +7,6 @@ class OmemoRecipe(PythonRecipe):
     url = 'https://pypi.python.org/packages/source/O/OMEMO/OMEMO-{version}.tar.gz'
     site_packages_name = 'omemo'
     depends = [
-        ('python2', 'python3crystax'),
         'setuptools',
         'x3dh',
         'cryptography',

diff --git a/pythonforandroid/recipes/pil/__init__.py b/pythonforandroid/recipes/pil/__init__.py
@@ -8,7 +8,7 @@ class PILRecipe(CompiledComponentsPythonRecipe):
     name = 'pil'
     version = '1.1.7'
     url = 'http://effbot.org/downloads/Imaging-{version}.tar.gz'
-    depends = [('python2', 'python2legacy'), 'png', 'jpeg', 'setuptools']
+    depends = ['png', 'jpeg', 'setuptools']
     opt_depends = ['freetype']
     site_packages_name = 'PIL'
 

diff --git a/pythonforandroid/recipes/preppy/__init__.py b/pythonforandroid/recipes/preppy/__init__.py
@@ -4,7 +4,7 @@
 class PreppyRecipe(PythonRecipe):
     version = '27b7085'
     url = 'https://bitbucket.org/rptlab/preppy/get/{version}.tar.gz'
-    depends = [('python2', 'python3crystax')]
+    depends = []
     patches = ['fix-setup.patch']
     call_hostpython_via_targetpython = False
 

diff --git a/pythonforandroid/recipes/psycopg2/__init__.py b/pythonforandroid/recipes/psycopg2/__init__.py
@@ -6,7 +6,7 @@
 class Psycopg2Recipe(PythonRecipe):
     version = 'latest'
     url = 'http://initd.org/psycopg/tarballs/psycopg2-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'libpq']
+    depends = ['libpq']
     site_packages_name = 'psycopg2'
 
     def prebuild_arch(self, arch):

diff --git a/pythonforandroid/recipes/pyaml/__init__.py b/pythonforandroid/recipes/pyaml/__init__.py
@@ -4,7 +4,7 @@
 class PyamlRecipe(PythonRecipe):
     version = "15.8.2"
     url = 'https://pypi.python.org/packages/source/p/pyaml/pyaml-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), "setuptools"]
+    depends = ["setuptools"]
     site_packages_name = 'yaml'
     call_hostpython_via_targetpython = False
 

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', 'python3crystax')]
+    depends = []
 
 
 recipe = PyASN1Recipe()
diff --git a/pythonforandroid/recipes/pyethereum/__init__.py b/pythonforandroid/recipes/pyethereum/__init__.py
@@ -6,7 +6,7 @@ class PyethereumRecipe(PythonRecipe):
     url = 'https://github.com/ethereum/pyethereum/archive/{version}.tar.gz'
 
     depends = [
-        'python2', 'setuptools', 'pycryptodome', 'pysha3', 'ethash', 'scrypt'
+        'setuptools', 'pycryptodome', 'pysha3', 'ethash', 'scrypt'
     ]
 
     call_hostpython_via_targetpython = False

diff --git a/pythonforandroid/recipes/pyicu/__init__.py b/pythonforandroid/recipes/pyicu/__init__.py
@@ -8,7 +8,7 @@
 class PyICURecipe(CompiledComponentsPythonRecipe):
     version = '1.9.2'
     url = 'https://pypi.python.org/packages/source/P/PyICU/PyICU-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), "icu"]
+    depends = ["icu"]
     patches = ['locale.patch', 'icu.patch']
 
     def get_recipe_env(self, arch):

diff --git a/pythonforandroid/recipes/pyleveldb/__init__.py b/pythonforandroid/recipes/pyleveldb/__init__.py
@@ -6,7 +6,7 @@
 class PyLevelDBRecipe(CompiledComponentsPythonRecipe):
     version = '0.193'
     url = 'https://pypi.python.org/packages/source/l/leveldb/leveldb-{version}.tar.gz'
-    depends = ['snappy', 'leveldb', 'hostpython2', 'python2', 'setuptools']
+    depends = ['snappy', 'leveldb', ('hostpython2', 'hostpython3'), 'setuptools']
     patches = ['bindings-only.patch']
     call_hostpython_via_targetpython = False  # Due to setuptools
     site_packages_name = 'leveldb'

diff --git a/pythonforandroid/recipes/pynacl/__init__.py b/pythonforandroid/recipes/pynacl/__init__.py
@@ -7,7 +7,7 @@ class PyNaCLRecipe(CompiledComponentsPythonRecipe):
     version = '1.3.0'
     url = 'https://pypi.python.org/packages/source/P/PyNaCl/PyNaCl-{version}.tar.gz'
 
-    depends = ['hostpython2', 'python2', 'six', 'setuptools', 'cffi', 'libsodium']
+    depends = [('hostpython2', 'hostpython3'), 'six', 'setuptools', 'cffi', 'libsodium']
     call_hostpython_via_targetpython = False
 
     def get_recipe_env(self, arch):

diff --git a/pythonforandroid/recipes/pyogg/__init__.py b/pythonforandroid/recipes/pyogg/__init__.py
@@ -5,7 +5,7 @@
 class PyOggRecipe(PythonRecipe):
     version = '0.6.4a1'
     url = 'https://files.pythonhosted.org/packages/source/p/pyogg/PyOgg-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'libogg', 'libvorbis', 'setuptools']
+    depends = ['libogg', 'libvorbis', 'setuptools']
     patches = [join('patches', 'fix-find-lib.patch')]
 
     call_hostpython_via_targetpython = False

diff --git a/pythonforandroid/recipes/pyopenal/__init__.py b/pythonforandroid/recipes/pyopenal/__init__.py
@@ -5,7 +5,7 @@
 class PyOpenALRecipe(PythonRecipe):
     version = '0.7.3a1'
     url = 'https://files.pythonhosted.org/packages/source/p/pyopenal/PyOpenAL-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'openal', 'numpy', 'setuptools']
+    depends = ['openal', 'numpy', 'setuptools']
     patches = [join('patches', 'fix-find-lib.patch')]
 
     call_hostpython_via_targetpython = False

diff --git a/pythonforandroid/recipes/pyopenssl/__init__.py b/pythonforandroid/recipes/pyopenssl/__init__.py
@@ -5,7 +5,7 @@
 class PyOpenSSLRecipe(PythonRecipe):
     version = '16.0.0'
     url = 'https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'openssl', 'setuptools']
+    depends = ['openssl', 'setuptools']
     site_packages_name = 'OpenSSL'
 
     call_hostpython_via_targetpython = False

diff --git a/pythonforandroid/recipes/pyproj/__init__.py b/pythonforandroid/recipes/pyproj/__init__.py
@@ -4,7 +4,7 @@
 class PyProjRecipe(CythonRecipe):
     version = '1.9.5.1'
     url = 'https://github.com/jswhit/pyproj/archive/master.zip'
-    depends = ['python2', 'setuptools']
+    depends = ['setuptools']
     call_hostpython_via_targetpython = False
 
 

diff --git a/pythonforandroid/recipes/pyrxp/__init__.py b/pythonforandroid/recipes/pyrxp/__init__.py
@@ -4,7 +4,7 @@
 class PyRXPURecipe(CompiledComponentsPythonRecipe):
     version = '2a02cecc87b9'
     url = 'https://bitbucket.org/rptlab/pyrxp/get/{version}.tar.gz'
-    depends = [('python2', 'python3crystax')]
+    depends = []
     patches = []
 
 

diff --git a/pythonforandroid/recipes/pytz/__init__.py b/pythonforandroid/recipes/pytz/__init__.py
@@ -6,7 +6,7 @@ class PytzRecipe(PythonRecipe):
     version = '2015.7'
     url = 'https://pypi.python.org/packages/source/p/pytz/pytz-{version}.tar.bz2'
 
-    depends = [('python2', 'python3crystax')]
+    depends = []
 
     call_hostpython_via_targetpython = False
     install_in_hostpython = True

diff --git a/pythonforandroid/recipes/pyusb/__init__.py b/pythonforandroid/recipes/pyusb/__init__.py
@@ -5,7 +5,7 @@ class PyusbRecipe(PythonRecipe):
     name = 'pyusb'
     version = '1.0.0b1'
     url = 'https://pypi.python.org/packages/source/p/pyusb/pyusb-{version}.tar.gz'
-    depends = [('python2', 'python3crystax')]
+    depends = []
     site_packages_name = 'usb'
 
     patches = ['fix-android.patch']

diff --git a/pythonforandroid/recipes/pyyaml/__init__.py b/pythonforandroid/recipes/pyyaml/__init__.py
@@ -4,7 +4,7 @@
 class PyYamlRecipe(PythonRecipe):
     version = "3.12"
     url = 'http://pyyaml.org/download/pyyaml/PyYAML-{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), "setuptools"]
+    depends = ["setuptools"]
     site_packages_name = 'pyyaml'