kivy · opacam · Feb 23, 2020 · Feb 24, 2020 · Feb 24, 2020 · Dec 11, 2019
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: Unit tests & Build Testapp
+name: Unit tests & build apps
 
 on: ['push', 'pull_request']
 
@@ -42,25 +42,26 @@ jobs:
         make test
 
   build:
-    name: Build testapp
+    name: Unit test apk
     needs: [flake8]
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        build-arch: ['arm64-v8a', 'armeabi-v7a']
+        build-arch: ['arm64-v8a', 'armeabi-v7a', 'x86_64', 'x86']
     steps:
     - name: Checkout python-for-android
       uses: actions/checkout@v2
     - name: Pull docker image
       run: |
         make docker/pull
-    - name: Build apk for Python 3 ${{ matrix.build-arch }}
+    - name: Build apk python3 ${{ matrix.build-arch }}
       run: |
         mkdir -p apks
         make docker/run/make/with-artifact/testapps/python3/${{ matrix.build-arch }}
     - uses: actions/upload-artifact@v1
       with:
-        name: bdisttest_python3_sqlite_openssl_googlendk__${{ matrix.build-arch }}-debug-1.1.apk
+        name: unit_tests_app__python3-${{ matrix.build-arch }}-debug-1.1.apk
         path: apks
 
   rebuild_updated_recipes:

diff --git a/.travis.yml b/.travis.yml
@@ -47,7 +47,7 @@ jobs:
       after_success:
         - coveralls
     - &testapps
-      name: Python 3 arm64-v8a
+      name: Python 3 arm64-v8a (with numpy)
       stage: build testapps
       before_script: make docker/pull
       script: make docker/run/make/testapps/python3/arm64-v8a
@@ -61,7 +61,7 @@ jobs:
         - export JAVA_HOME=/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
       script: make testapps/python3/armeabi-v7a PYTHON_WITH_VERSION=python3
     - <<: *testapps
-      name: Python 2 armeabi-v7a (with numpy)
+      name: Python 2 armeabi-v7a
       script: make docker/run/make/testapps/python2/armeabi-v7a
     - <<: *testapps
       name: Rebuild updated recipes

diff --git a/Makefile b/Makefile
@@ -35,21 +35,18 @@ rebuild_updated_recipes: virtualenv
 	ANDROID_SDK_HOME=$(ANDROID_SDK_HOME) ANDROID_NDK_HOME=$(ANDROID_NDK_HOME) \
 	$(PYTHON) ci/rebuild_updated_recipes.py
 
-testapps/python2/armeabi-v7a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools,numpy
-
-testapps/python3/arm64-v8a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --arch=arm64-v8a
-
-testapps/python3/armeabi-v7a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools \
-    --arch=armeabi-v7a
+testapps/python2/%: virtualenv
+	$(eval $@_APP_ARCH := $(shell basename $*))
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+    --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools,numpy \
+    --arch=$($@_APP_ARCH)
+
+testapps/python3/%: virtualenv
+	$(eval $@_APP_ARCH := $(shell basename $*))
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+    --arch=$($@_APP_ARCH)
 
 clean:
 	find . -type d -name "__pycache__" -exec rm -r {} +
@@ -77,14 +74,9 @@ docker/run/make/%: docker/build
 	docker run --rm --env-file=.env $(DOCKER_IMAGE) make $*
 
 docker/run/make/with-artifact/%: docker/build
-ifeq (,$(findstring python3,$($*)))
-	$(eval $@_APP_NAME := bdisttest_python3_sqlite_openssl_googlendk)
-else
-	$(eval $@_APP_NAME := bdisttest_python2_sqlite_openssl)
-endif
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
-	docker cp p4a-latest:/home/user/app/testapps/$($@_APP_NAME)__$($@_APP_ARCH)-debug-1.1-.apk ./apks
+	docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app__$($@_APP_ARCH)-debug-1.1-.apk ./apks
 	docker rm -fv p4a-latest
 
 docker/run/shell: docker/build

diff --git a/ci/constants.py b/ci/constants.py
@@ -54,7 +54,6 @@ class TargetPython(Enum):
     'websocket-client',
     'zeroconf',
     'zope',
-    'matplotlib',  # https://github.com/kivy/python-for-android/issues/1900
 ])
 BROKEN_RECIPES_PYTHON3 = set([
     'brokenrecipe',
@@ -74,7 +73,6 @@ class TargetPython(Enum):
     # mpmath package with a version >= 0.19 required
     'sympy',
     'vlc',
-    'matplotlib',  # https://github.com/kivy/python-for-android/issues/1900
 ])
 
 BROKEN_RECIPES = {

diff --git a/ci/rebuild_updated_recipes.py b/ci/rebuild_updated_recipes.py
@@ -55,18 +55,15 @@ def build(target_python, requirements):
     """
     if not requirements:
         return
-    testapp = 'setup_testapp_python2.py'
     android_sdk_home = os.environ['ANDROID_SDK_HOME']
     android_ndk_home = os.environ['ANDROID_NDK_HOME']
-    if target_python == TargetPython.python3:
-        testapp = 'setup_testapp_python3_sqlite_openssl.py'
     requirements.add(target_python.name)
     requirements = ','.join(requirements)
     logger.info('requirements: {}'.format(requirements))
-    with current_directory('testapps/'):
+    with current_directory('testapps/on_device_unit_tests/'):
         # iterates to stream the output
         for line in sh.python(
-                testapp, 'apk', '--sdk-dir', android_sdk_home,
+                'setup.py', 'apk', '--sdk-dir', android_sdk_home,
                 '--ndk-dir', android_ndk_home, '--requirements',
                 requirements, _err_to_out=True, _iter=True):
             print(line)

diff --git a/doc/source/testing_pull_requests.rst b/doc/source/testing_pull_requests.rst
@@ -103,30 +103,31 @@ Using python-for-android commands directly from the pull request files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Enter inside the directory of the cloned repository in the above
-  step and run p4a command with proper args, eg::
+  step and run p4a command with proper args, eg (to test an modified
+  `pycryptodome` recipe)::
 
     .. codeblock:: bash
 
         cd p4a-feature-fix-numpy
         PYTHONPATH=. python3 -m pythonforandroid.toolchain apk \
-            --private=testapps/testapp_sqlite_openssl \
-            --dist-name=dist_test_app_python3_libs \
+            --private=testapps/on_device_unit_tests/test_app \
+            --dist-name=dist_unit_tests_app_pycryptodome \
             --package=org.kivy \
-            --name=test_app_python3_sqlite_openssl \
+            --name=unit_tests_app_pycryptodome \
             --version=0.1 \
-            --requirements=requests,peewee,sdl2,pyjnius,kivy,python3 \
+            --requirements=sdl2,pyjnius,kivy,python3,pycryptodome \
             --ndk-dir=/media/DEVEL/Android/android-ndk-r20 \
             --sdk-dir=/media/DEVEL/Android/android-sdk-linux \
             --android-api=27 \
             --arch=arm64-v8a \
-            --permission=INTERNET \
+            --permission=VIBRATE \
             --debug
 
 Things that you should know:
 
 
-    - The example above will build an testapp we will make use of the files of
-      the testapp named `testapp_sqlite_openssl.py` but we don't use the setup
+    - The example above will build an test app we will make use of the files of
+      the `on device unit tests` test app but we don't use the setup
       file to build it so we must tell python-for-android what we want via
       arguments
     - be sure to at least edit the following arguments when running the above
@@ -159,19 +160,19 @@ Installing python-for-android using the github's branch of the pull request
         cd p4a-feature-fix-numpy
         pip3 install . --upgrade --user
 
-- Now, go inside the `testapps` directory (we assume that you still are inside
-  the cloned repository)::
+- Now, go inside the `testapps/on_device_unit_tests` directory (we assume that
+  you still are inside the cloned repository)::
 
     .. codeblock:: bash
 
-        cd testapps
+        cd testapps/on_device_unit_tests
 
 - Run the build of the apk via the freshly installed copy of python-for-android
   by running a similar command than below::
 
     .. code-block:: bash
 
-        python3 setup_testapp_python3_sqlite_openssl.py apk \
+        python3 setup.py apk \
             --ndk-dir=/media/DEVEL/Android/android-ndk-r20 \
             --sdk-dir=/media/DEVEL/Android/android-sdk-linux \
             --android-api=27 \
@@ -182,8 +183,7 @@ Installing python-for-android using the github's branch of the pull request
 Things that you should know:
 
     - In the example above, we override some variables that are set in
-      `setup_testapp_python3_sqlite_openssl.py`, you could also override them
-      by editing this file
+      `setup.py`, you could also override them by editing this file
     - be sure to at least edit the following arguments when running the above
       command, since the default set in there it's unlikely that match your
       installation:

diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -289,6 +289,7 @@ class Archx86_64(Arch):
         '-mpopcnt',
         '-m64',
         '-mtune=intel',
+        '-fPIC',
     ]
 
 

diff --git a/pythonforandroid/recipes/cppy/__init__.py b/pythonforandroid/recipes/cppy/__init__.py
@@ -0,0 +1,17 @@
+from pythonforandroid.recipe import PythonRecipe
+
+
+class CppyRecipe(PythonRecipe):
+    site_packages_name = 'cppy'
+
+    # Pin to commit: `Nucleic migration and project documentation`,
+    # because the official releases are too old, at time of writing
+    version = '4e0b956'
+    url = 'https://github.com/nucleic/cppy/archive/{version}.zip'
+    call_hostpython_via_targetpython = False
+    # to be detected by the matplotlib install script
+    install_in_hostpython = True
+    depends = ['setuptools']
+
+
+recipe = CppyRecipe()
diff --git a/pythonforandroid/recipes/cython/__init__.py b/pythonforandroid/recipes/cython/__init__.py
@@ -0,0 +1,14 @@
+from pythonforandroid.recipe import CompiledComponentsPythonRecipe
+
+
+class CythonRecipe(CompiledComponentsPythonRecipe):
+
+    version = '0.29.15'
+    url = 'https://github.com/cython/cython/archive/{version}.tar.gz'
+    site_packages_name = 'cython'
+    depends = ['setuptools']
+    call_hostpython_via_targetpython = False
+    install_in_hostpython = True
+
+
+recipe = CythonRecipe()
diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py
@@ -24,7 +24,7 @@ class FreetypeRecipe(Recipe):
         https://sourceforge.net/projects/freetype/files/freetype2/2.5.3/
     """
 
-    version = '2.5.5'
+    version = '2.10.1'
     url = 'http://download.savannah.gnu.org/releases/freetype/freetype-{version}.tar.gz'  # noqa
     built_libraries = {'libfreetype.so': 'objs/.libs'}
 
@@ -35,9 +35,6 @@ def get_recipe_env(self, arch=None, with_harfbuzz=False):
                 'harfbuzz', self.ctx
             ).get_build_dir(arch.arch)
             freetype_install = join(self.get_build_dir(arch.arch), 'install')
-            env['CFLAGS'] = ' '.join(
-                [env['CFLAGS'], '-DFT_CONFIG_OPTION_USE_HARFBUZZ']
-            )
 
             env['HARFBUZZ_CFLAGS'] = '-I{harfbuzz} -I{harfbuzz}/src'.format(
                 harfbuzz=harfbuzz_build
@@ -48,6 +45,19 @@ def get_recipe_env(self, arch=None, with_harfbuzz=False):
                     freetype=freetype_install, harfbuzz=harfbuzz_build
                 )
             )
+
+        # android's zlib support
+        zlib_lib_path = join(self.ctx.ndk_platform, 'usr', 'lib')
+        zlib_includes = join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include')
+
+        def add_flag_if_not_added(flag, env_key):
+            if flag not in env[env_key]:
+                env[env_key] += flag
+
+        add_flag_if_not_added(' -I' + zlib_includes, 'CFLAGS')
+        add_flag_if_not_added(' -L' + zlib_lib_path, 'LDFLAGS')
+        add_flag_if_not_added(' -lz', 'LDLIBS')
+
         return env
 
     def build_arch(self, arch, with_harfbuzz=False):
@@ -66,14 +76,17 @@ def build_arch(self, arch, with_harfbuzz=False):
         config_args = {
             '--host={}'.format(arch.command_prefix),
             '--prefix={}'.format(prefix_path),
-            '--without-zlib',
             '--without-bzip2',
             '--with-png=no',
         }
         if not harfbuzz_in_recipes:
             info('Build freetype (without harfbuzz)')
             config_args = config_args.union(
-                {'--disable-static', '--enable-shared', '--with-harfbuzz=no'}
+                {'--disable-static',
+                 '--enable-shared',
+                 '--with-harfbuzz=no',
+                 '--with-zlib=yes',
+                 }
             )
         elif not with_harfbuzz:
             info('Build freetype for First time (without harfbuzz)')
@@ -82,12 +95,16 @@ def build_arch(self, arch, with_harfbuzz=False):
             # symbols/functions, so we avoid to have two freetype shared
             # libraries which will be confusing and harder to link with them
             config_args = config_args.union(
-                {'--disable-shared', '--with-harfbuzz=no'}
+                {'--disable-shared', '--with-harfbuzz=no', '--with-zlib=no'}
             )
         else:
             info('Build freetype for Second time (with harfbuzz)')
             config_args = config_args.union(
-                {'--disable-static', '--enable-shared', '--with-harfbuzz=yes'}
+                {'--disable-static',
+                 '--enable-shared',
+                 '--with-harfbuzz=yes',
+                 '--with-zlib=yes',
+                 }
             )
         info('Configure args are:\n\t-{}'.format('\n\t-'.join(config_args)))
 

diff --git a/pythonforandroid/recipes/harfbuzz/__init__.py b/pythonforandroid/recipes/harfbuzz/__init__.py
@@ -20,8 +20,8 @@ class HarfbuzzRecipe(Recipe):
         https://sourceforge.net/projects/freetype/files/freetype2/2.5.3/
     """
 
-    version = '0.9.40'
-    url = 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{version}.tar.bz2'  # noqa
+    version = '2.6.4'
+    url = 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{version}.tar.xz'  # noqa
     opt_depends = ['freetype']
     built_libraries = {'libharfbuzz.so': 'src/.libs'}
 
@@ -50,15 +50,17 @@ def build_arch(self, arch):
             configure = sh.Command('./configure')
             shprint(
                 configure,
-                '--without-icu',
                 '--host={}'.format(arch.command_prefix),
                 '--prefix={}'.format(self.get_build_dir(arch.arch)),
                 '--with-freetype={}'.format(
                     'yes'
                     if 'freetype' in self.ctx.recipe_build_order
                     else 'no'
                 ),
-                '--without-glib',
+                '--with-icu=no',
+                '--with-cairo=no',
+                '--with-fontconfig=no',
+                '--with-glib=no',
                 _env=env,
             )
             shprint(sh.make, '-j', str(cpu_count()), _env=env)

diff --git a/pythonforandroid/recipes/kiwisolver/__init__.py b/pythonforandroid/recipes/kiwisolver/__init__.py
@@ -3,9 +3,28 @@
 
 class KiwiSolverRecipe(CppCompiledComponentsPythonRecipe):
     site_packages_name = 'kiwisolver'
-    version = '0.1.3'
-    url = 'https://github.com/nucleic/kiwi/archive/master.zip'
-    depends = ['setuptools']
+    # Pin to commit `docs: attempt to fix doc building`, the latest one
+    # at the time of writing, just to be sure that we have te most up to date
+    # version, but it should be pinned to an official release once the c++
+    # changes that we want to include are merged to master branch
+    #   Note: the commit we want to include is
+    #         `Cppy use update and c++11 compatibility` (4858730)
+    version = '0846189'
+    url = 'https://github.com/nucleic/kiwi/archive/{version}.zip'
+    depends = ['cppy']
+
+    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
+        env = super().get_recipe_env(arch, with_flags_in_cc)
+        if self.need_stl_shared:
+            # kiwisolver compile flags does not honor the standard flags:
+            # `CPPFLAGS` and `LDLIBS`, so we put in `CFLAGS` and `LDFLAGS` to
+            # correctly link with the `c++_shared` library
+            env['CFLAGS'] += f' -I{self.stl_include_dir}'
+            env['CFLAGS'] += ' -frtti -fexceptions'
+
+            env['LDFLAGS'] += f' -L{self.get_stl_lib_dir(arch)}'
+            env['LDFLAGS'] += f' -l{self.stl_lib_name}'
+        return env
 
 
 recipe = KiwiSolverRecipe()
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,6 +289,7 @@ class Archx86_64(Arch): @@
             '-mpopcnt',
             '-m64',
             '-mtune=intel',
+            '-fPIC',
         ]
@@ Expand Down @@