Skip to content

Commit 8b760a8

Browse files
committed
[testapp] Let's test numpy, matplotlib and Pillow
via an apk generated with gh-actions Notes: - this way the reviewers can see how the `on device unit test app` behaves when some test generates an image (Pillow case) or give us an error (matplotlib) - we test numpy, because matplotlib depends on it, so we already must built it, so...why not test it? :) - we must add a patch to fix `cppy` install when building kiwisolver - and we make sure that some test app built with gh-actions will success (in case that python2 built fails...) - these changes will be reverted in the next commit
1 parent b4c4736 commit 8b760a8

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

.github/workflows/push.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
matrix:
5050
build-arch: ['arm64-v8a', 'armeabi-v7a', 'x86_64']
5151
python-version: ['python2', 'python3']
52+
fail-fast: false
5253
steps:
5354
- name: Checkout python-for-android
5455
uses: actions/checkout@v1

pythonforandroid/recipes/kiwisolver/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class KiwiSolverRecipe(CppCompiledComponentsPythonRecipe):
66
version = '0.1.3'
77
url = 'https://github.com/nucleic/kiwi/archive/master.zip'
88
depends = ['setuptools']
9+
patches = ['fix_cppy.patch']
910

1011

1112
recipe = KiwiSolverRecipe()
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- kiwi-15b7bf0de7e9d29b574d491b153c169155506394/setup.py.orig 2019-12-02 19:20:52.000000000 +0100
2+
+++ kiwi-15b7bf0de7e9d29b574d491b153c169155506394/setup.py 2019-12-30 00:50:57.849212755 +0100
3+
@@ -76,6 +76,7 @@ setup(
4+
],
5+
python_requires='>=3.5',
6+
setup_requires=['cppy'],
7+
+ dependency_links=['http://github.com/nucleic/cppy/tarball/4fd117f#egg=cppy'],
8+
ext_modules=ext_modules,
9+
cmdclass={'build_ext': BuildExt},
10+
)

testapps/on_device_unit_tests/setup_test_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
'apk':
4040
{
4141
'requirements':
42-
'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests',
42+
'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,numpy,Pillow,matplotlib',
4343
'android-api': 27,
4444
'ndk-api': 21,
4545
'dist-name': 'bdist_test_app_unittests',

0 commit comments

Comments
 (0)