🔥 Drop EOL Python 3.7/3.8/3.9 support

Bump python_requires to >=3.10.0, drop the matching classifiers and
CI matrix entries.

Align MIN_PYTHON_MINOR_VERSION to 10 and drop the now-unreachable
Python 2 branch in check_python_version().

Remove the Python 2 compatibility shims anchored to the pre-3.10
floor (urlparse import, load_source Py3.3/3.4 fallback,
FileNotFoundError shims, virtualenv branch, to_unicode wrapper,
time.monotonic wrapper, path_type TypeError fallback, add_parser
argparse aliases wrapper) and the permanently-inert Python 2
test markers.

Drop the `from __future__ import annotations` workaround in the
msgspec recipe (PEP 585 generics are native since 3.9) and the
PEP 508 `python_version<"3.3"` / `<"3.5"` markers in the ifaddr
and zeroconf recipes (never satisfied under the new floor).

Modernize the remaining `typing.List` annotation to PEP 585
builtin generics in scipy/wrapper.py. The aiohttp recipe is left
untouched on purpose: editing it would trigger the
rebuild_updated_recipes CI, which fails because aiohttp 3.8.3's
pregenerated Cython C is incompatible with Python 3.14
hostpython -- fixing that needs a recipe bump and is out of
scope here.

Author: AndreMiras

.github/workflows/push.yml

@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
         os: [ubuntu-latest, macos-latest]
     steps:
     - name: Checkout python-for-android

pythonforandroid/pythonpackage.py

@@ -34,7 +34,6 @@
 
 
 import functools
-from io import open  # needed for python 2
 import os
 import shutil
 import subprocess
@@ -153,17 +152,13 @@ def binary_is_usable(python_bin):
                 return
             # We should check file not found anyway trying to run it,
             # since it might be a dead symlink:
-            try:
-                filenotfounderror = FileNotFoundError
-            except NameError:  # Python 2
-                filenotfounderror = OSError
             try:
                 # Run it and see if version output works with no error:
                 subprocess.check_output([
                     os.path.join(path, python_bin), "--version"
                 ], stderr=subprocess.STDOUT)
                 return True
-            except (subprocess.CalledProcessError, filenotfounderror):
+            except (subprocess.CalledProcessError, FileNotFoundError):
                 return False
 
         python_name = "python" + sys.version
@@ -271,21 +266,10 @@ def get_package_as_folder(dependency):
     try:
         # Create a venv to install into:
         try:
-            if int(sys.version.partition(".")[0]) < 3:
-                # Python 2.x has no venv.
-                subprocess.check_output([
-                    sys.executable,  # no venv conflict possible,
-                                     # -> no need to use system python
-                    "-m", "virtualenv",
-                    "--python=" + _get_system_python_executable(),
-                    os.path.join(venv_parent, 'venv')
-                ], cwd=venv_parent)
-            else:
-                # On modern Python 3, use venv.
-                subprocess.check_output([
-                    _get_system_python_executable(), "-m", "venv",
-                    os.path.join(venv_parent, 'venv')
-                ], cwd=venv_parent)
+            subprocess.check_output([
+                _get_system_python_executable(), "-m", "venv",
+                os.path.join(venv_parent, 'venv')
+            ], cwd=venv_parent)
         except subprocess.CalledProcessError as e:
             output = e.output.decode('utf-8', 'replace')
             raise ValueError(
@@ -295,16 +279,12 @@ def get_package_as_folder(dependency):
         venv_path = os.path.join(venv_parent, "venv")
 
         # Update pip and wheel in venv for latest feature support:
-        try:
-            filenotfounderror = FileNotFoundError
-        except NameError:  # Python 2.
-            filenotfounderror = OSError
         try:
             subprocess.check_output([
                 os.path.join(venv_path, "bin", "pip"),
                 "install", "-U", "pip", "wheel",
             ])
-        except filenotfounderror:
+        except FileNotFoundError:
             raise RuntimeError(
                 "venv appears to be missing pip. "
                 "did we fail to use a proper system python??\n"
@@ -322,12 +302,7 @@ def get_package_as_folder(dependency):
         with open(os.path.join(venv_path, "requirements.txt"),
                   "w", encoding="utf-8"
                  ) as f:
-            def to_unicode(s):  # Needed for Python 2.
-                try:
-                    return s.decode("utf-8")
-                except AttributeError:
-                    return s
-            f.write(to_unicode(transform_dep_for_pip(dependency)))
+            f.write(transform_dep_for_pip(dependency))
         try:
             subprocess.check_output(
                 [
@@ -451,10 +426,7 @@ def _extract_metainfo_files_from_package_unsafe(
         # distribution, and others get_package_as_folder() may support
         # in the future.
         with open(os.path.join(output_path, "metadata_source"), "w") as f:
-            try:
-                f.write(path_type)
-            except TypeError:  # in python 2 path_type may be str/bytes:
-                f.write(path_type.decode("utf-8", "replace"))
+            f.write(path_type)
 
         # Copy the metadata file:
         shutil.copyfile(metadata_path, os.path.join(output_path, "METADATA"))
@@ -585,19 +557,14 @@ def _extract_info_from_package(dependency,
 
 def get_package_name(dependency,
                      use_cache=True):
-    def timestamp():
-        try:
-            return time.monotonic()
-        except AttributeError:
-            return time.time()  # Python 2.
     try:
         value = package_name_cache[dependency]
-        if value[0] + 600.0 > timestamp() and use_cache:
+        if value[0] + 600.0 > time.monotonic() and use_cache:
             return value[1]
     except KeyError:
         pass
     result = _extract_info_from_package(dependency, extract_type="name")
-    package_name_cache[dependency] = (timestamp(), result)
+    package_name_cache[dependency] = (time.monotonic(), result)
     return result
 
 

pythonforandroid/recipe.py

@@ -16,10 +16,7 @@
 from packaging.version import Version
 from multiprocessing import cpu_count
 import time
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from urllib.parse import urlparse
 
 import packaging.version
 

pythonforandroid/recipes/ifaddr/__init__.py

@@ -5,7 +5,7 @@ class IfaddrRecipe(PythonRecipe):
     name = 'ifaddr'
     version = '0.1.7'
     url = 'https://pypi.python.org/packages/source/i/ifaddr/ifaddr-{version}.tar.gz'
-    depends = ['setuptools', 'ifaddrs', 'ipaddress;python_version<"3.3"']
+    depends = ['setuptools', 'ifaddrs']
     call_hostpython_via_targetpython = False
     patches = ["getifaddrs.patch"]
 

pythonforandroid/recipes/msgspec/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from pythonforandroid.archs import Arch

pythonforandroid/recipes/scipy/wrapper.py

@@ -5,7 +5,6 @@
 import os
 import subprocess
 import sys
-import typing
 
 """
 This wrapper is used to ignore or replace some unsupported flags for flang-new.
@@ -30,7 +29,7 @@
 COMPLIER_PATH = "@COMPILER@"
 
 
-def main(argv: typing.List[str]):
+def main(argv: list[str]):
     cwd = os.getcwd()
     argv_new = []
     i = 0

pythonforandroid/recipes/zeroconf/__init__.py

@@ -5,7 +5,7 @@ class ZeroconfRecipe(PythonRecipe):
     name = 'zeroconf'
     version = '0.24.5'
     url = 'https://pypi.python.org/packages/source/z/zeroconf/zeroconf-{version}.tar.gz'
-    depends = ['setuptools', 'ifaddr', 'typing;python_version<"3.5"']
+    depends = ['setuptools', 'ifaddr']
     call_hostpython_via_targetpython = False
 
 

pythonforandroid/recommendations.py

@@ -186,14 +186,10 @@ def check_ndk_api(ndk_api, android_api):
 
 
 MIN_PYTHON_MAJOR_VERSION = 3
-MIN_PYTHON_MINOR_VERSION = 6
+MIN_PYTHON_MINOR_VERSION = 10
 MIN_PYTHON_VERSION = packaging.version.Version(
     f"{MIN_PYTHON_MAJOR_VERSION}.{MIN_PYTHON_MINOR_VERSION}"
 )
-PY2_ERROR_TEXT = (
-    'python-for-android no longer supports running under Python 2. Either upgrade to '
-    'Python {min_version} or higher (recommended), or revert to python-for-android 2019.07.08.'
-).format(min_version=MIN_PYTHON_VERSION)
 
 PY_VERSION_ERROR_TEXT = (
     'Your Python version {user_major}.{user_minor} is not supported by python-for-android, '
@@ -205,11 +201,6 @@ def check_ndk_api(ndk_api, android_api):
 
 
 def check_python_version():
-    # Python 2 special cased because it's a major transition. In the
-    # future the major or minor versions can increment more quietly.
-    if sys.version_info.major == 2:
-        raise BuildInterruptingException(PY2_ERROR_TEXT)
-
     if (
         sys.version_info.major < MIN_PYTHON_MAJOR_VERSION or
         sys.version_info.minor < MIN_PYTHON_MINOR_VERSION

pythonforandroid/toolchain.py

@@ -393,56 +393,45 @@ def __init__(self):
         subparsers = parser.add_subparsers(dest='subparser_name',
                                            help='The command to run')
 
-        def add_parser(subparsers, *args, **kwargs):
-            """
-            argparse in python2 doesn't support the aliases option,
-            so we just don't provide the aliases there.
-            """
-            if 'aliases' in kwargs and sys.version_info.major < 3:
-                kwargs.pop('aliases')
-            return subparsers.add_parser(*args, **kwargs)
-
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'recommendations',
             parents=[generic_parser],
             help='List recommended p4a dependencies')
-        parser_recipes = add_parser(
-            subparsers,
+        parser_recipes = subparsers.add_parser(
             'recipes',
             parents=[generic_parser],
             help='List the available recipes')
         parser_recipes.add_argument(
             "--compact",
             action="store_true", default=False,
             help="Produce a compact list suitable for scripting")
-        add_parser(
-            subparsers, 'bootstraps',
+        subparsers.add_parser(
+            'bootstraps',
             help='List the available bootstraps',
             parents=[generic_parser])
-        add_parser(
-            subparsers, 'clean_all',
+        subparsers.add_parser(
+            'clean_all',
             aliases=['clean-all'],
             help='Delete all builds, dists and caches',
             parents=[generic_parser])
-        add_parser(
-            subparsers, 'clean_dists',
+        subparsers.add_parser(
+            'clean_dists',
             aliases=['clean-dists'],
             help='Delete all dists',
             parents=[generic_parser])
-        add_parser(
-            subparsers, 'clean_bootstrap_builds',
+        subparsers.add_parser(
+            'clean_bootstrap_builds',
             aliases=['clean-bootstrap-builds'],
             help='Delete all bootstrap builds',
             parents=[generic_parser])
-        add_parser(
-            subparsers, 'clean_builds',
+        subparsers.add_parser(
+            'clean_builds',
             aliases=['clean-builds'],
             help='Delete all builds',
             parents=[generic_parser])
 
-        parser_clean = add_parser(
-            subparsers, 'clean',
+        parser_clean = subparsers.add_parser(
+            'clean',
             help='Delete build components.',
             parents=[generic_parser])
         parser_clean.add_argument(
@@ -451,8 +440,7 @@ def add_parser(subparsers, *args, **kwargs):
                   'number of arguments from "all", "builds", "dists", '
                   '"distributions", "bootstrap_builds", "downloads".'))
 
-        parser_clean_recipe_build = add_parser(
-            subparsers,
+        parser_clean_recipe_build = subparsers.add_parser(
             'clean_recipe_build', aliases=['clean-recipe-build'],
             help=('Delete the build components of the given recipe. '
                   'By default this will also delete built dists'),
@@ -465,8 +453,7 @@ def add_parser(subparsers, *args, **kwargs):
             action='store_true',
             help='If passed, do not delete existing dists')
 
-        parser_clean_download_cache = add_parser(
-            subparsers,
+        parser_clean_download_cache = subparsers.add_parser(
             'clean_download_cache', aliases=['clean-download-cache'],
             help='Delete cached downloads for requirement builds',
             parents=[generic_parser])
@@ -476,8 +463,7 @@ def add_parser(subparsers, *args, **kwargs):
             help='The recipes to clean (space-separated). If no recipe name is'
                   ' provided, the entire cache is cleared.')
 
-        parser_export_dist = add_parser(
-            subparsers,
+        parser_export_dist = subparsers.add_parser(
             'export_dist', aliases=['export-dist'],
             help='Copy the named dist to the given path',
             parents=[generic_parser])
@@ -547,57 +533,46 @@ def add_parser(subparsers, *args, **kwargs):
             '--signkeypw', dest='signkeypw', action='store', default=None,
             help='Password for key alias')
 
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'aar', help='Build an AAR',
             parents=[parser_packaging])
 
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'apk', help='Build an APK',
             parents=[parser_packaging])
 
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'aab', help='Build an AAB',
             parents=[parser_packaging])
 
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'create', help='Compile a set of requirements into a dist',
             parents=[generic_parser])
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'archs', help='List the available target architectures',
             parents=[generic_parser])
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'distributions', aliases=['dists'],
             help='List the currently available (compiled) dists',
             parents=[generic_parser])
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'delete_dist', aliases=['delete-dist'], help='Delete a compiled dist',
             parents=[generic_parser])
 
-        parser_sdk_tools = add_parser(
-            subparsers,
+        parser_sdk_tools = subparsers.add_parser(
             'sdk_tools', aliases=['sdk-tools'],
             help='Run the given binary from the SDK tools dis',
             parents=[generic_parser])
         parser_sdk_tools.add_argument(
             'tool', help='The binary tool name to run')
 
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'adb', help='Run adb from the given SDK',
             parents=[generic_parser])
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'logcat', help='Run logcat from the given SDK',
             parents=[generic_parser])
-        add_parser(
-            subparsers,
+        subparsers.add_parser(
             'build_status', aliases=['build-status'],
             help='Print some debug information about current built components',
             parents=[generic_parser])