Remove Python 3.8 and 3.9 (#1039)

Author: mhsmith

.github/actions/setup-python/action.yml

@@ -1,6 +1,8 @@
 name: Setup Python
 description:
 
+# The available Python versions on each runner are listed at
+# https://github.com/actions/python-versions/blob/main/versions-manifest.json.
 runs:
   using: composite
   steps:
@@ -26,13 +28,9 @@ runs:
     - uses: actions/[email protected]
       with:
         # This should include all major.minor versions supported by the runtime, plus
-        # OLD_PYTHON_VERSION from test_gradle_plugin. The available versions on each
-        # runner are listed at
-        # https://github.com/actions/python-versions/blob/main/versions-manifest.json.
+        # OLD_PYTHON_VERSION from test_gradle_plugin.
         python-version: |
           3.7
-          3.8
-          3.9
           ${{ steps.python-default.outputs.full-version }}
           3.11
           3.12

product/buildSrc/src/main/java/com/chaquo/python/internal/Common.java

@@ -18,8 +18,6 @@ public class Common {
     public static final Map<String, String> PYTHON_VERSIONS = new LinkedHashMap<>();
     static {
         // Version, build number
-        PYTHON_VERSIONS.put("3.8.20", "1");
-        PYTHON_VERSIONS.put("3.9.20", "1");
         PYTHON_VERSIONS.put("3.10.15", "1");
         PYTHON_VERSIONS.put("3.11.10", "1");
         PYTHON_VERSIONS.put("3.12.7", "1");

product/gradle-plugin/README.md

@@ -113,8 +113,8 @@ Tests (this list is referenced from target/README.md):
 * Increment Chaquopy major version if not already done.
 * Update any references in the integration tests, including the names of the pythonX.Y
   scripts in data/BuildPython.
-* Search source code for `(python( version)?|version_info) *[<>=]* *[0-9]` to see if any
-  workarounds can now be removed.
+* Search repository to see if any code can now be simplified. Useful regex:
+  * `(python( version)?|version_info) *[<>=]* *\(?\d[,.] *\d`
 * Check if any modules can be removed from `BOOTSTRAP_NATIVE_STDLIB` in PythonTasks.kt.
 * Update and test all the things listed in the "Adding a Python version" section.
 

product/gradle-plugin/src/main/kotlin/PythonTasks.kt

@@ -397,8 +397,8 @@ internal class TaskBuilder(
                     "_ctypes.*",  // java.primitive and importer
                     "_datetime.*",  // calendar < importer (see test_datetime)
                     "_lzma.*",  // zipfile < importer
-                    "_random.*",  // random < tempfile < zipimport
-                    "_sha512.*",  // random < tempfile < zipimport
+                    "_random.*",  // random < tempfile < importer
+                    "_sha512.*",  // random < tempfile < importer
                     "_struct.*",  // zipfile < importer
                     "binascii.*",  // zipfile < importer
                     "math.*",  // datetime < calendar < importer

product/gradle-plugin/src/main/python/chaquopy/pyc.py

@@ -13,8 +13,6 @@
 # See the CPython source code in Include/internal/pycore_magic_number.h or
 # Lib/importlib/_bootstrap_external.py.
 MAGIC = {
-    "3.8": 3413,
-    "3.9": 3425,
     "3.10": 3439,
     "3.11": 3495,
     "3.12": 3531,

product/gradle-plugin/src/main/python/chaquopy/static_proxy.py

@@ -165,8 +165,7 @@ def process(self):
         # to its fully-qualified name if it's a usable import, or otherwise to the node which
         # bound it so we can give a useful error if the name is passed to one of our functions.
         for node in root.body:
-            if isinstance(node, (ast.FunctionDef if sys.version_info < (3, 5)
-                                 else (ast.FunctionDef, ast.AsyncFunctionDef))):
+            if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
                 self.bindings[node.name] = node
             elif isinstance(node, ast.ClassDef):
                 c = self.process_class(node)
@@ -179,8 +178,7 @@ def process(self):
             elif isinstance(node, ast.Assign):
                 for t in node.targets:
                     self.process_assign(t)
-            elif isinstance(node, (ast.AugAssign if sys.version_info < (3, 6)
-                                   else (ast.AugAssign, ast.AnnAssign))):
+            elif isinstance(node, (ast.AugAssign, ast.AnnAssign)):
                 self.process_assign(node.target)
             elif isinstance(node, ast.Import):
                 self.process_import(node.names, lambda name: name)
@@ -274,16 +272,10 @@ def call(self, function, call, **kwargs):
         return result
 
     def has_starargs(self, call):
-        if sys.version_info < (3, 5):
-            return bool(call.starargs)
-        else:
-            return any(isinstance(a, ast.Starred) for a in call.args)
+        return any(isinstance(a, ast.Starred) for a in call.args)
 
     def has_kwargs(self, call):
-        if sys.version_info < (3, 5):
-            return bool(call.kwargs)
-        else:
-            return any(kw.arg is None for kw in call.keywords)
+        return any(kw.arg is None for kw in call.keywords)
 
     def evaluate(self, expr):
         if isinstance(expr, ast.Constant):

product/gradle-plugin/src/test/integration/data/BuildPython/default/posix/python3.8 renamed to product/gradle-plugin/src/test/integration/data/BuildPython/default/posix/python3.11

@@ -7,12 +7,7 @@
     import os
     import subprocess
     compiler = os.environ.get("CC", "gcc")
-    try:
-        subprocess.check_call([compiler])
-    except OSError:
-        # Exception string doesn't contain the filename on Python 2.7.
-        print("Failed to run " + compiler)
-        raise
+    subprocess.check_call([compiler])
 
 setup(
     name="sdist_native_cc",

product/gradle-plugin/src/test/integration/data/BuildPython/default_minor_fail/posix/python3.8 renamed to product/gradle-plugin/src/test/integration/data/BuildPython/default_minor_fail/posix/python3.11

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# This file requires Python 3.6 or later.
 
 import argparse
 import os