From e48634cd9eb2cf69e2a52866d5b672fdd5b137fb Mon Sep 17 00:00:00 2001 From: opacam Date: Sat, 9 Feb 2019 10:35:48 +0100 Subject: [PATCH 1/2] Adapt python3's testapps to blacklist-requirements We remove 'libffi,openssl,sqlite3' of requirements because now will be built automatically without requesting it References: 3b40ba0, 50b7dc0 --- testapps/setup_testapp_python3.py | 3 ++- testapps/setup_testapp_python3_sqlite_openssl.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testapps/setup_testapp_python3.py b/testapps/setup_testapp_python3.py index 40ed20d231..bf83b06c33 100644 --- a/testapps/setup_testapp_python3.py +++ b/testapps/setup_testapp_python3.py @@ -2,7 +2,8 @@ from distutils.core import setup from setuptools import find_packages -options = {'apk': {'requirements': 'libffi,sdl2,numpy,pyjnius,kivy,python3', +options = {'apk': {'requirements': 'sdl2,numpy,pyjnius,kivy,python3', + 'blacklist-requirements': 'openssl,sqlite3', 'android-api': 27, 'ndk-api': 21, 'dist-name': 'bdisttest_python3_googlendk', diff --git a/testapps/setup_testapp_python3_sqlite_openssl.py b/testapps/setup_testapp_python3_sqlite_openssl.py index 19e6b91fef..0f7485d132 100644 --- a/testapps/setup_testapp_python3_sqlite_openssl.py +++ b/testapps/setup_testapp_python3_sqlite_openssl.py @@ -2,8 +2,7 @@ from distutils.core import setup from setuptools import find_packages -options = {'apk': {'requirements': 'libffi,openssl,sqlite3,requests,peewee,' - 'sdl2,pyjnius,kivy,python3', +options = {'apk': {'requirements': 'requests,peewee,sdl2,pyjnius,kivy,python3', 'android-api': 27, 'ndk-api': 21, 'dist-name': 'bdisttest_python3_sqlite_openssl_googlendk', From 3c51607e9dbf15012004e4dd1ec33107cfbd431a Mon Sep 17 00:00:00 2001 From: opacam Date: Sat, 9 Feb 2019 11:21:12 +0100 Subject: [PATCH 2/2] Make testapps use python3 per default (the ones that are not python2 specific) Note: the `keyboard` and `vispy` testapps were a little outdated with his options, so also modified to match the current circumstances --- testapps/setup_keyboard.py | 6 ++++-- testapps/setup_testapp_flask.py | 3 ++- testapps/setup_testapp_python_encryption.py | 7 ++++--- testapps/setup_testapp_service.py | 3 ++- testapps/setup_vispy.py | 6 ++++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/testapps/setup_keyboard.py b/testapps/setup_keyboard.py index 38fa78726f..026847764d 100644 --- a/testapps/setup_keyboard.py +++ b/testapps/setup_keyboard.py @@ -3,8 +3,10 @@ from setuptools import find_packages options = {'apk': {'debug': None, - 'requirements': 'sdl2,pyjnius,kivy,python2', - 'android-api': 19, + 'requirements': 'sdl2,pyjnius,kivy,python3', + 'blacklist-requirements': 'openssl,sqlite3', + 'android-api': 27, + 'ndk-api': 21, 'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2', 'dist-name': 'bdisttest', 'ndk-version': '10.3.2', diff --git a/testapps/setup_testapp_flask.py b/testapps/setup_testapp_flask.py index 1722b6d6c4..3302e8595c 100644 --- a/testapps/setup_testapp_flask.py +++ b/testapps/setup_testapp_flask.py @@ -3,7 +3,8 @@ from setuptools import find_packages options = {'apk': {'debug': None, - 'requirements': 'python2,flask,pyjnius', + 'requirements': 'python3,flask,pyjnius', + 'blacklist-requirements': 'openssl,sqlite3', 'android-api': 27, 'ndk-api': 21, 'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2', diff --git a/testapps/setup_testapp_python_encryption.py b/testapps/setup_testapp_python_encryption.py index 6ac5309679..2a468ade86 100644 --- a/testapps/setup_testapp_python_encryption.py +++ b/testapps/setup_testapp_python_encryption.py @@ -2,9 +2,10 @@ from distutils.core import setup from setuptools import find_packages -options = {'apk': {'requirements': 'libffi,openssl,sdl2,pyjnius,kivy,python2,' - 'cryptography,pycrypto,scrypt,m2crypto,' - 'pysha3,pycryptodome,libtorrent', +options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python3,cryptography,' + 'pycrypto,scrypt,m2crypto,pysha3,' + 'pycryptodome,libtorrent', + 'blacklist-requirements': 'sqlite3', 'android-api': 27, 'ndk-api': 21, 'dist-name': 'bdisttest_encryption', diff --git a/testapps/setup_testapp_service.py b/testapps/setup_testapp_service.py index 9dd5bb65ed..b246f108d9 100644 --- a/testapps/setup_testapp_service.py +++ b/testapps/setup_testapp_service.py @@ -3,7 +3,8 @@ from setuptools import find_packages options = {'apk': {'debug': None, - 'requirements': 'python2,genericndkbuild,pyjnius', + 'requirements': 'python3,genericndkbuild,pyjnius', + 'blacklist-requirements': 'openssl,sqlite3', 'android-api': 27, 'ndk-api': 21, 'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2', diff --git a/testapps/setup_vispy.py b/testapps/setup_vispy.py index 99e2a5563b..a0863d0a1c 100644 --- a/testapps/setup_vispy.py +++ b/testapps/setup_vispy.py @@ -3,8 +3,10 @@ from setuptools import find_packages options = {'apk': {'debug': None, - 'requirements': 'vispy', - 'android-api': 19, + 'requirements': 'python3,vispy', + 'blacklist-requirements': 'openssl,sqlite3', + 'android-api': 27, + 'ndk-api': 21, 'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2', 'dist-name': 'bdisttest', 'ndk-version': '10.3.2',