Change default Python version from 3.8 to 3.10 (#1039)

Author: mhsmith

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

@@ -1,8 +1,6 @@
 name: Setup Python
 description:
 
-# When updating this file, see the comment in ci.yml about integration test
-# runner versions.
 runs:
   using: composite
   steps:
@@ -15,24 +13,25 @@ runs:
       id: python-default
       shell: bash
       run: |
-        version=3.8
+        version="3.10"
+        echo "full_version=${version}.11"
         if [ $RUNNER_OS = Windows ]; then
             echo "command=py -$version"
-            echo "version=3.8.10"
         else
             echo "command=python$version"
-            echo "version=3.8.12"
         fi >> $GITHUB_OUTPUT
 
     - uses: actions/[email protected]
       with:
         # This should include all major.minor versions supported by the runtime, plus
-        # OLD_PYTHON_VERSION from test_gradle_plugin.
+        # 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.
         python-version: |
           3.7
-          ${{ steps.python-default.outputs.version }}
+          3.8
           3.9
-          3.10
+          ${{ steps.python-default.outputs.full_version }}
           3.11
           3.12
           3.13

.github/workflows/ci.yml

@@ -165,8 +165,7 @@ jobs:
         os: [macos, windows, linux]
         agp-version: ${{ fromJSON(needs.product.outputs.agp-versions) }}
         include:
-          # Runners must support all the Python versions in setup-python/action.yml: see
-          # https://github.com/actions/python-versions/blob/main/versions-manifest.json.
+          # Runners must support all the Python versions in setup-python/action.yml.
           - os: linux
             runs-on: ubuntu-22.04
           - os: macos

demo/app/build.gradle.kts

@@ -96,7 +96,7 @@ android {
 
 chaquopy {
     defaultConfig {
-        version = "3.8"
+        version = "3.10"
 
         // Android UI demo
         pip {

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

@@ -34,7 +34,7 @@ public class Common {
         }
     }
 
-    public static final String DEFAULT_PYTHON_VERSION = "3.8";
+    public static final String DEFAULT_PYTHON_VERSION = "3.10";
 
     // Wheel tags (PEP 425).
     public static final String PYTHON_IMPLEMENTATION = "cp";  // CPython

product/gradle-plugin/README.md

@@ -85,30 +85,46 @@ also be given here.
     directory](https://developer.android.com/studio/intro/studio-config#file_location).
 
 
-## Adding support for a buildPython version
+## Adding a Python version
+
+Target:
+
+* Update Common.java.
+* Build the target packages as described in target/README.md.
+
+Product:
+
+* In test_gradle_plugin.py, update the `PYTHON_VERSIONS` assertion.
+* Update the `MAGIC` lists in test_gradle_plugin.py and pyc.py.
+* Update .github/actions/setup-python/action.yml.
+* Build any packages used by the demo app.
+* Update android.rst and versions.rst.
+
+Tests (this list is referenced from target/README.md):
 
-* Update `MAX_BUILD_PYTHON_VERSION` in test_gradle_plugin.py, and run the tests which
-  use it.
 * Run `gradle:testPython`.
-* Update the list of Python versions in .github/actions/setup-python/action.yml.
-* Temporarily change the `buildPython` of the demo app, comment out `pyc.pip`, and check
-  it builds without any warnings other than the expected ones about .pyc compilation.
-  There's no point in running it now, as the failed compilation will break many of the
-  tests. We'll do this when we add runtime support for the same version (see
-  target/README.md).
+* Run integration tests.
+* Temporarily change the Python version of the demo app, and run the Python and Java
+  unit tests on the full set of pre-release devices (see release/README.md).
 
 
-## Removing support for a buildPython version
+## Removing a Python version
 
 * Increment Chaquopy major version if not already done.
-* Update gradle-plugin/src/main/python/chaquopy/util.py.
-* In test_gradle_plugin, update `OLD_BUILD_PYTHON_VERSION` and
-  `MIN_BUILD_PYTHON_VERSION`, and run the tests which use them.
-* Run `gradle:testPython`.
-* Update the list of Python versions in .github/actions/setup-python/action.yml.
-* See the comment in ci.yml about integration test runner versions, and consider
-  updating them.
-* Update android.rst.
+* 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.
+* 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.
+
+
+## Changing the default Python version
+
+* Update `DEFAULT_PYTHON_VERSION` in Common.java and test_gradle_plugin.py.
+* Update and test all the things listed in the "Adding / Removing a Python version"
+  sections.
+* Update the Python version in all apps in the repository, and test them.
 
 
 ## Increasing minimum API level (minSdk)
@@ -179,12 +195,11 @@ do the following:
 * Open tools/base as a project in IDEA.
 
 
-## Updating pip, setuptools or wheel
+## Updating pip
 
 Check out the upstream-pip branch.
 
-Delete the package from src/main/python, including the .dist-info directory. Note that
-setuptools includes some files outside of its main directory.
+Delete pip from src/main/python, including the .dist-info directory.
 
 Download the wheel of the new version, and unpack it into src/main/python.
 

product/gradle-plugin/src/test/integration/data/AndroidPlugin/missing/app/build.gradle

@@ -1,9 +1,3 @@
 plugins {
     id 'com.chaquo.python'
 }
-
-chaquopy {
-    defaultConfig {
-        version "3.8"
-    }
-}

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

@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "0.0.1"
         python {
-            version "3.9"
+            version "{{ secondPythonVersion }}"
             pip {
                 install "six"
             }

product/gradle-plugin/src/test/integration/data/BuildPython/default_change/app/build.gradle

@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "0.0.1"
         ndk {
-            abiFilters "x86"
+            abiFilters "x86_64"
         }
     }
 
@@ -39,7 +39,7 @@ chaquopy {
 
 // productFlavors properties
 def p = chaquopy.productFlavors.property
-p.version = "3.9"
+p.version = "{{ secondPythonVersion }}"
 p.extractPackages.add "ep_property"
 p.staticProxy.add "sp_property"
 p.pip.install("certifi")
@@ -52,7 +52,7 @@ p.pyc.stdlib = false
 chaquopy {
     productFlavors {
         method {
-            version "3.10"
+            version "{{ thirdPythonVersion }}"
             extractPackages("ep_method")
             staticProxy("sp_method")
             pip {