Merge pull request #233 from lbryio/python-requirements-tweak

Update Twisted version. Remove pycrypto recipe.

recipes/pycrypto/__init__.py

@@ -1,59 +0,0 @@
-
-from pythonforandroid.toolchain import (
-    CompiledComponentsPythonRecipe,
-    Recipe,
-    current_directory,
-    info,
-    shprint,
-)
-from os.path import join
-import sh
-
-
-class PyCryptoRecipe(CompiledComponentsPythonRecipe):
-    version = '2.6.1'
-    url = 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-{version}.tar.gz'
-    depends = ['libgmp', 'openssl', 'python2']
-    site_packages_name = 'Crypto'
-    call_hostpython_via_targetpython = False
-
-    patches = ['add_length.patch', 'fix-fastmath-include-dirs.patch']
-
-    def get_recipe_env(self, arch=None):
-        env = super(PyCryptoRecipe, self).get_recipe_env(arch)
-        openssl_build_dir = Recipe.get_recipe('openssl', self.ctx).get_build_dir(arch.arch)
-        target_python = Recipe.get_recipe('python2', self.ctx).get_build_dir(arch.arch)
-        # include libgmp build dir for gmp.h
-        libgmp_build_dir = Recipe.get_recipe('libgmp', self.ctx).get_build_dir(arch.arch)
-
-        # set to prevent including hostpython headers to avoid
-        # LONG_BIT definition appears wrong for platform error when compiling for Androidd
-        env['PYTHONXCPREFIX'] = target_python
-        env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
-        env['PYTHON_ROOT'] = join(target_python, 'python-install')
-        env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python2.7'
-        env['LDFLAGS'] += ' -L' + env['PYTHON_ROOT'] + '/lib' + ' -lpython2.7'
-
-        env['CFLAGS'] += ' -I%s' % (join(libgmp_build_dir, 'include'))
-        env['CC'] = '%s -I%s' % (env['CC'], join(openssl_build_dir, 'include'))
-        env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
-            self.ctx.get_libs_dir(arch.arch) +
-            '-L{}'.format(self.ctx.libs_dir)) + ' -L{}'.format(
-            openssl_build_dir)
-        env['EXTRA_CFLAGS'] = '--host linux-armv'
-        env['ac_cv_func_malloc_0_nonnull'] = 'yes'
-
-        return env
-
-    def build_compiled_components(self, arch):
-        info('Configuring compiled components in {}'.format(self.name))
-
-        env = self.get_recipe_env(arch)
-        with current_directory(self.get_build_dir(arch.arch)):
-            configure = sh.Command('./configure')
-            shprint(configure, '--host=arm-eabi',
-                    '--prefix={}'.format(self.ctx.get_python_install_dir()),
-                    '--enable-shared', _env=env)
-        super(PyCryptoRecipe, self).build_compiled_components(arch)
-
-recipe = PyCryptoRecipe()

recipes/pycrypto/add_length.patch

@@ -1,11 +0,0 @@
---- pycrypto-2.6.1/src/hash_SHA2_template.c.orig	2013-10-14 14:38:10.000000000 -0700
-+++ pycrypto-2.6.1/src/hash_SHA2_template.c	2014-05-19 10:15:51.000000000 -0700
-@@ -87,7 +87,7 @@
-  * return 1 on success
-  * return 0 if the length overflows
-  */
--int add_length(hash_state *hs, sha2_word_t inc) {
-+static int add_length(hash_state *hs, sha2_word_t inc) {
-     sha2_word_t overflow_detector;
-     overflow_detector = hs->length_lower;
-     hs->length_lower += inc;

recipes/pycrypto/fix-fastmath-include-dirs.patch

@@ -1,11 +0,0 @@
---- a/setup.py	2013-10-14 22:38:10.000000000 +0100
-+++ b/setup.py	2017-12-20 16:05:16.726389781 +0100
-@@ -370,7 +370,7 @@
-       'ext_modules': plat_ext + [
-             # _fastmath (uses GNU mp library)
-             Extension("Crypto.PublicKey._fastmath",
--                      include_dirs=['src/','/usr/include/'],
-+                      include_dirs=['src/'],
-                       libraries=['gmp'],
-                       sources=["src/_fastmath.c"]),
- 

recipes/twisted/__init__.py

@@ -12,7 +12,7 @@ import sh
 
 
 class TwistedRecipe(CythonRecipe):
-    version = '16.0.0'
+    version = '16.6.0'
     url = 'https://github.com/twisted/twisted/archive/twisted-{version}.tar.gz'
 
     depends = ['setuptools', 'zope_interface']