Skip to content

Commit 8a55efd

Browse files
authored
Merge pull request #1658 from AndreMiras/feature/feature/ticket1514_update_broken_recipes_list_bis
Updates broken recipes list, refs #1514
2 parents 798e9af + 0e27c59 commit 8a55efd

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

ci/constants.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class TargetPython(Enum):
4242
'pynacl',
4343
'doubleratchet',
4444
'omemo',
45-
'cryptography',
4645
# requires `libpq-dev` system dependency e.g. for `pg_config` binary
4746
'psycopg2',
4847
'pygame',
@@ -68,15 +67,10 @@ class TargetPython(Enum):
6867
'enum34',
6968
# https://github.com/kivy/python-for-android/issues/1399
7069
'libglob',
71-
# Could not fetch URL https://pypi.org/simple/pymuk/: 404 Client Error
72-
'pymuk',
7370
# build_dir = glob.glob('build/lib.*')[0]
7471
# IndexError: list index out of range
7572
'secp256k1',
76-
# https://github.com/kivy/python-for-android/issues/1404
77-
'cryptography',
78-
# https://github.com/kivy/python-for-android/issues/1294
79-
'ffmpeg', 'ffpyplayer',
73+
'ffpyplayer',
8074
'icu',
8175
# https://github.com/kivy/python-for-android/issues/1354
8276
'kivent_core', 'kivent_cymunk', 'kivent_particles', 'kivent_polygen',

pythonforandroid/recipes/cryptography/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
class CryptographyRecipe(CompiledComponentsPythonRecipe):
55
name = 'cryptography'
6-
version = '2.4.2'
6+
version = '2.5'
77
url = 'https://github.com/pyca/cryptography/archive/{version}.tar.gz'
88
depends = ['openssl', 'idna', 'asn1crypto', 'six', 'setuptools',
99
'enum34', 'ipaddress', 'cffi']

pythonforandroid/recipes/ffmpeg/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
class FFMpegRecipe(Recipe):
7-
version = '3.4.1'
7+
version = '3.4.5'
88
url = 'http://ffmpeg.org/releases/ffmpeg-{version}.tar.bz2'
99
depends = ['sdl2'] # Need this to build correct recipe order
1010
opts_depends = ['openssl', 'ffpyplayer_codecs']

pythonforandroid/recipes/pymunk/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
class PymunkRecipe(CompiledComponentsPythonRecipe):
66
name = "pymunk"
7-
version = '5.2.0'
8-
url = 'https://pypi.python.org/packages/5e/bd/e67edcffdee3d0a1e3ebf0050bb9746a61d616f5502ceedddf0f7fd0a896/pymunk-5.2.0.zip'
7+
version = '5.3.2'
8+
url = 'https://pypi.python.org/packages/source/p/pymunk/pymunk-{version}.zip'
99
depends = ['cffi', 'setuptools']
1010
call_hostpython_via_targetpython = False
1111

0 commit comments

Comments
 (0)