update: numpy, pandas, sdl2

Author: T-Dynamos

ci/makefiles/android.mk

@@ -1,7 +1,7 @@
 # Downloads and installs the Android SDK depending on supplied platform: darwin or linux
 
 # Those android NDK/SDK variables can be override when running the file
-ANDROID_NDK_VERSION ?= 25b
+ANDROID_NDK_VERSION ?= 27c
 ANDROID_NDK_VERSION_LEGACY ?= 21e
 ANDROID_SDK_TOOLS_VERSION ?= 6514223
 ANDROID_SDK_BUILD_TOOLS_VERSION ?= 29.0.3

doc/source/quickstart.rst

@@ -119,7 +119,7 @@ named ``tools``, and you will need to run extra commands to install
 the SDK packages needed. 
 
 For Android NDK, note that modern releases will only work on a 64-bit
-operating system. **The minimal, and recommended, NDK version to use is r25b:**
+operating system. **The minimal, and recommended, NDK version to use is r27c:**
 
  - `Go to ndk downloads page <https://developer.android.com/ndk/downloads/>`_
  - Windows users should create a virtual machine with an GNU Linux os

pythonforandroid/recipe.py

@@ -155,6 +155,11 @@ class Recipe(metaclass=RecipeMeta):
         starting from NDK r18 the `gnustl_shared` lib has been deprecated.
     '''
 
+    min_ndk_api_support = 20
+    '''
+    Minimum ndk api recipe will support.
+    '''
+
     def get_stl_library(self, arch):
         return join(
             arch.ndk_lib_dir,
@@ -375,6 +380,9 @@ def get_recipe_dir(self):
     # Public Recipe API to be subclassed if needed
 
     def download_if_necessary(self):
+        if self.ctx.ndk_api < self.min_ndk_api_support:
+            error(f"In order to build '{self.name}', you must set minimum ndk api (minapi) to `{self.min_ndk_api_support}`.\n")
+            exit(1)
         info_main('Downloading {}'.format(self.name))
         user_dir = environ.get('P4A_{}_DIR'.format(self.name.lower()))
         if user_dir is not None:

pythonforandroid/recipes/numpy/__init__.py

@@ -1,17 +1,17 @@
 from pythonforandroid.recipe import Recipe, MesonRecipe
-from pythonforandroid.logger import error
 from os.path import join
 import shutil
 
 NUMPY_NDK_MESSAGE = "In order to build numpy, you must set minimum ndk api (minapi) to `24`.\n"
 
 
 class NumpyRecipe(MesonRecipe):
-    version = 'v1.26.5'
+    version = 'v2.3.0'
     url = 'git+https://github.com/numpy/numpy'
-    hostpython_prerequisites = ["Cython>=3.0.6"]  # meson does not detects venv's cython
+    hostpython_prerequisites = ["Cython==3.0.6"]  # meson does not detects venv's cython
     extra_build_args = ['-Csetup-args=-Dblas=none', '-Csetup-args=-Dlapack=none']
     need_stl_shared = True
+    min_ndk_api_support = 24
 
     def get_recipe_meson_options(self, arch):
         options = super().get_recipe_meson_options(arch)
@@ -36,13 +36,6 @@ def get_recipe_env(self, arch, **kwargs):
                 "python3", self.ctx).get_build_dir(arch.arch), "android-build", "python")
         return env
 
-    def download_if_necessary(self):
-        # NumPy requires complex math functions which were added in api 24
-        if self.ctx.ndk_api < 24:
-            error(NUMPY_NDK_MESSAGE)
-            exit(1)
-        super().download_if_necessary()
-
     def build_arch(self, arch):
         super().build_arch(arch)
         self.restore_hostpython_prerequisites(["cython"])

pythonforandroid/recipes/pandas/__init__.py

@@ -3,10 +3,10 @@
 
 
 class PandasRecipe(MesonRecipe):
-    version = 'v2.2.1'
-    url = 'git+https://github.com/pandas-dev/pandas'  # noqa
+    version = 'v2.3.0'
+    url = 'git+https://github.com/pandas-dev/pandas'
     depends = ['numpy', 'libbz2', 'liblzma']
-    hostpython_prerequisites = ["Cython~=3.0.5"]  # meson does not detects venv's cython
+    hostpython_prerequisites = ["Cython==3.0.5"]  # meson does not detects venv's cython
     patches = ['fix_numpy_includes.patch']
     python_depends = ['python-dateutil', 'pytz']
     need_stl_shared = True
@@ -17,7 +17,7 @@ def get_recipe_env(self, arch, **kwargs):
         # because we need some includes generated at numpy's compile time
 
         env['NUMPY_INCLUDES'] = join(
-            self.ctx.get_python_install_dir(arch.arch), "numpy/core/include",
+            self.ctx.get_python_install_dir(arch.arch), "numpy/_core/include",
         )
         env["PYTHON_INCLUDE_DIR"] = self.ctx.python_recipe.include_root(arch)
 

pythonforandroid/recipes/python3/__init__.py

@@ -141,7 +141,6 @@ class Python3Recipe(TargetPythonRecipe):
 
     site_packages_dir_blacklist = {
         '__pycache__',
-        'tests'
     }
     '''The directories from site packages dir that we don't want to be included
     in our python bundle.'''

pythonforandroid/recipes/sdl2/__init__.py

@@ -6,9 +6,9 @@
 
 
 class LibSDL2Recipe(BootstrapNDKRecipe):
-    version = "2.28.5"
+    version = "2.30.11"
     url = "https://github.com/libsdl-org/SDL/releases/download/release-{version}/SDL2-{version}.tar.gz"
-    md5sum = 'a344eb827a03045c9b399e99af4af13d'
+    md5sum = 'bea190b480f6df249db29eb3bacfe41e'
 
     conflicts = ['sdl3']
 

pythonforandroid/recommendations.py

@@ -13,7 +13,7 @@
 MAX_NDK_VERSION = 25
 
 # DO NOT CHANGE LINE FORMAT: buildozer parses the existence of a RECOMMENDED_NDK_VERSION
-RECOMMENDED_NDK_VERSION = "25b"
+RECOMMENDED_NDK_VERSION = "27c"
 
 NDK_DOWNLOAD_URL = "https://developer.android.com/ndk/downloads/"
 

tests/recipes/test_pandas.py

@@ -35,7 +35,7 @@ def test_get_recipe_env(
             self.ctx.recipe_build_order
         )
         numpy_includes = join(
-            self.ctx.get_python_install_dir(self.arch.arch), "numpy/core/include",
+            self.ctx.get_python_install_dir(self.arch.arch), "numpy/_core/include",
         )
         env = self.recipe.get_recipe_env(self.arch)
         self.assertIn(numpy_includes, env["NUMPY_INCLUDES"])

tests/test_recipe.py

@@ -93,6 +93,8 @@ def test_download_if_necessary(self):
         """
         # download should happen as the environment variable is not set
         recipe = DummyRecipe()
+        recipe.ctx = Context()
+        recipe.ctx._ndk_api = 36
         with mock.patch.object(Recipe, 'download') as m_download:
             recipe.download_if_necessary()
         assert m_download.call_args_list == [mock.call()]