Skip to content

Commit 0959544

Browse files
AndreMirasAndreMiras
authored
Merge pull request kivy#1696 from opacam/update-testapps-requirements
Make testapps use python3 per default and adapt to `blacklist-requirements`
2 parents d23f05d + 3c51607 commit 0959544

7 files changed

+19
-12
lines changed

‎testapps/setup_keyboard.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'debug': None,
6-
'requirements': 'sdl2,pyjnius,kivy,python2',
7-
'android-api': 19,
6+
'requirements': 'sdl2,pyjnius,kivy,python3',
7+
'blacklist-requirements': 'openssl,sqlite3',
8+
'android-api': 27,
9+
'ndk-api': 21,
810
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
911
'dist-name': 'bdisttest',
1012
'ndk-version': '10.3.2',

‎testapps/setup_testapp_flask.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'debug': None,
6-
'requirements': 'python2,flask,pyjnius',
6+
'requirements': 'python3,flask,pyjnius',
7+
'blacklist-requirements': 'openssl,sqlite3',
78
'android-api': 27,
89
'ndk-api': 21,
910
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',

‎testapps/setup_testapp_python3.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
from distutils.core import setup
33
from setuptools import find_packages
44

5-
options = {'apk': {'requirements': 'libffi,sdl2,numpy,pyjnius,kivy,python3',
5+
options = {'apk': {'requirements': 'sdl2,numpy,pyjnius,kivy,python3',
6+
'blacklist-requirements': 'openssl,sqlite3',
67
'android-api': 27,
78
'ndk-api': 21,
89
'dist-name': 'bdisttest_python3_googlendk',

‎testapps/setup_testapp_python3_sqlite_openssl.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from distutils.core import setup
33
from setuptools import find_packages
44

5-
options = {'apk': {'requirements': 'libffi,openssl,sqlite3,requests,peewee,'
6-
'sdl2,pyjnius,kivy,python3',
5+
options = {'apk': {'requirements': 'requests,peewee,sdl2,pyjnius,kivy,python3',
76
'android-api': 27,
87
'ndk-api': 21,
98
'dist-name': 'bdisttest_python3_sqlite_openssl_googlendk',

‎testapps/setup_testapp_python_encryption.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
from distutils.core import setup
33
from setuptools import find_packages
44

5-
options = {'apk': {'requirements': 'libffi,openssl,sdl2,pyjnius,kivy,python2,'
6-
'cryptography,pycrypto,scrypt,m2crypto,'
7-
'pysha3,pycryptodome,libtorrent',
5+
options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python3,cryptography,'
6+
'pycrypto,scrypt,m2crypto,pysha3,'
7+
'pycryptodome,libtorrent',
8+
'blacklist-requirements': 'sqlite3',
89
'android-api': 27,
910
'ndk-api': 21,
1011
'dist-name': 'bdisttest_encryption',

‎testapps/setup_testapp_service.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'debug': None,
6-
'requirements': 'python2,genericndkbuild,pyjnius',
6+
'requirements': 'python3,genericndkbuild,pyjnius',
7+
'blacklist-requirements': 'openssl,sqlite3',
78
'android-api': 27,
89
'ndk-api': 21,
910
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',

‎testapps/setup_vispy.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
from setuptools import find_packages
44

55
options = {'apk': {'debug': None,
6-
'requirements': 'vispy',
7-
'android-api': 19,
6+
'requirements': 'python3,vispy',
7+
'blacklist-requirements': 'openssl,sqlite3',
8+
'android-api': 27,
9+
'ndk-api': 21,
810
'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
911
'dist-name': 'bdisttest',
1012
'ndk-version': '10.3.2',

0 commit comments

Comments
 (0)