Fix numpy's recipe and adds python3's compatibility.

Also:
  - add numpy to CI tests for python3: this module is some kind of special and probably a dependency for a lot of python packages so better make sure that we not break anything...as we already do with python2
  - Add numpy to python2 and python3 test apps, cause already have some buttons that allows to test it from the running app.

Author: opacam

.travis.yml

@@ -18,7 +18,7 @@ env:
     - ANDROID_SDK_HOME=/opt/android/android-sdk
     - ANDROID_NDK_HOME=/opt/android/android-ndk
   matrix:
-    - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python3'
+    - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python3,numpy'
     # overrides requirements to skip `peewee` pure python module, see:
     # https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
     - COMMAND='. venv/bin/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'

pythonforandroid/recipes/numpy/__init__.py

@@ -9,14 +9,14 @@ class NumpyRecipe(CompiledComponentsPythonRecipe):
     url = 'https://pypi.python.org/packages/source/n/numpy/numpy-{version}.zip'
     site_packages_name = 'numpy'
 
-    depends = [('python2', 'python3crystax')]
+    depends = [('python2', 'python3', 'python3crystax')]
 
     patches = [
         join('patches', 'fix-numpy.patch'),
         join('patches', 'prevent_libs_check.patch'),
         join('patches', 'ar.patch'),
         join('patches', 'lib.patch'),
-        join('patches', 'python2-fixes.patch')
+        join('patches', 'python-fixes.patch')
     ]
 
     def get_recipe_env(self, arch):
@@ -27,17 +27,17 @@ def get_recipe_env(self, arch):
             self.ctx.ndk_platform
         )
 
+        py_ver = self.ctx.python_recipe.major_minor_version_string
+        py_inc_dir = self.ctx.python_recipe.include_root(arch.arch)
+        py_lib_dir = self.ctx.python_recipe.link_root(arch.arch)
         if self.ctx.ndk == 'crystax':
-            py_ver = self.ctx.python_recipe.version[0:3]
             src_dir = join(self.ctx.ndk_dir, 'sources')
-            py_inc_dir = join(src_dir, 'python', py_ver, 'include', 'python')
-            py_lib_dir = join(src_dir, 'python', py_ver, 'libs', arch.arch)
-            cry_inc_dir = join(src_dir, 'crystax', 'include')
-            cry_lib_dir = join(src_dir, 'crystax', 'libs', arch.arch)
-            flags += ' -I{}'.format(py_inc_dir)
-            flags += ' -L{} -lpython{}m'.format(py_lib_dir, py_ver)
-            flags += " -I{}".format(cry_inc_dir)
-            flags += " -L{}".format(cry_lib_dir)
+            flags += " -I{}".format(join(src_dir, 'crystax', 'include'))
+            flags += " -L{}".format(join(src_dir, 'crystax', 'libs', arch.arch))
+        flags += ' -I{}'.format(py_inc_dir)
+        flags += ' -L{} -lpython{}'.format(py_lib_dir, py_ver)
+        if 'python3' in self.ctx.python_recipe.name:
+            flags += 'm'
 
         if flags not in env['CC']:
             env['CC'] += flags

pythonforandroid/recipes/numpy/patches/python2-fixes.patch renamed to pythonforandroid/recipes/numpy/patches/python-fixes.patch

@@ -2,7 +2,7 @@
 from distutils.core import setup
 from setuptools import find_packages
 
-options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python2',
+options = {'apk': {'requirements': 'numpy,sdl2,pyjnius,kivy,python2',
                    'android-api': 27,
                    'ndk-api': 21,
                    'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',

testapps/setup_testapp_python2.py

@@ -2,7 +2,7 @@
 from distutils.core import setup
 from setuptools import find_packages
 
-options = {'apk': {'requirements': 'sdl2,pyjnius,kivy,python3',
+options = {'apk': {'requirements': 'numpy,sdl2,pyjnius,kivy,python3',
                    'android-api': 27,
                    'ndk-api': 21,
                    'dist-name': 'bdisttest_python3_googlendk',