diff --git a/ci/constants.py b/ci/constants.py index b3dd463d3e..df8f302d2a 100644 --- a/ci/constants.py +++ b/ci/constants.py @@ -42,7 +42,6 @@ class TargetPython(Enum): 'pynacl', 'doubleratchet', 'omemo', - 'cryptography', # requires `libpq-dev` system dependency e.g. for `pg_config` binary 'psycopg2', 'pygame', @@ -68,15 +67,10 @@ class TargetPython(Enum): 'enum34', # https://github.com/kivy/python-for-android/issues/1399 'libglob', - # Could not fetch URL https://pypi.org/simple/pymuk/: 404 Client Error - 'pymuk', # build_dir = glob.glob('build/lib.*')[0] # IndexError: list index out of range 'secp256k1', - # https://github.com/kivy/python-for-android/issues/1404 - 'cryptography', - # https://github.com/kivy/python-for-android/issues/1294 - 'ffmpeg', 'ffpyplayer', + 'ffpyplayer', 'icu', # https://github.com/kivy/python-for-android/issues/1354 'kivent_core', 'kivent_cymunk', 'kivent_particles', 'kivent_polygen', diff --git a/pythonforandroid/recipes/cryptography/__init__.py b/pythonforandroid/recipes/cryptography/__init__.py index 868ca74d14..c5b3e9eb49 100644 --- a/pythonforandroid/recipes/cryptography/__init__.py +++ b/pythonforandroid/recipes/cryptography/__init__.py @@ -3,7 +3,7 @@ class CryptographyRecipe(CompiledComponentsPythonRecipe): name = 'cryptography' - version = '2.4.2' + version = '2.5' url = 'https://github.com/pyca/cryptography/archive/{version}.tar.gz' depends = ['openssl', 'idna', 'asn1crypto', 'six', 'setuptools', 'enum34', 'ipaddress', 'cffi'] diff --git a/pythonforandroid/recipes/ffmpeg/__init__.py b/pythonforandroid/recipes/ffmpeg/__init__.py index 818722c3f7..f8e3ec141f 100644 --- a/pythonforandroid/recipes/ffmpeg/__init__.py +++ b/pythonforandroid/recipes/ffmpeg/__init__.py @@ -4,7 +4,7 @@ class FFMpegRecipe(Recipe): - version = '3.4.1' + version = '3.4.5' url = 'http://ffmpeg.org/releases/ffmpeg-{version}.tar.bz2' depends = ['sdl2'] # Need this to build correct recipe order opts_depends = ['openssl', 'ffpyplayer_codecs'] diff --git a/pythonforandroid/recipes/pymunk/__init__.py b/pythonforandroid/recipes/pymunk/__init__.py index 7aeb366c05..b72b85b09b 100644 --- a/pythonforandroid/recipes/pymunk/__init__.py +++ b/pythonforandroid/recipes/pymunk/__init__.py @@ -4,8 +4,8 @@ class PymunkRecipe(CompiledComponentsPythonRecipe): name = "pymunk" - version = '5.2.0' - url = 'https://pypi.python.org/packages/5e/bd/e67edcffdee3d0a1e3ebf0050bb9746a61d616f5502ceedddf0f7fd0a896/pymunk-5.2.0.zip' + version = '5.3.2' + url = 'https://pypi.python.org/packages/source/p/pymunk/pymunk-{version}.zip' depends = ['cffi', 'setuptools'] call_hostpython_via_targetpython = False