Update python to 3.13 and update dependencies (#1720)

Author: mkrnr

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ setup_cache_name()
   if [ "$RUNNER_OS" = 'macOS' ]
   then
     . ./osx/deps.sh
-    [ "$target_python" = "${py_installer_version%.*}" ] || die 1 "versions mismatch: target=$target_python, installer=$py_installer_version"
+    [ "$target_python" = "$py_installer_version" ] || die 1 "versions mismatch: target=$target_python, installer=$py_installer_version"
     target_python="$py_installer_version"
   fi
   cache_name=$("$python" - "$GITHUB_JOB" "$target_python" "$platform_name" <<\EOF
@@ -66,7 +66,7 @@ setup_osx_python()
 {
   target_python="$1"
   . ./osx/deps.sh
-  [ "$target_python" = "${py_installer_version%.*}" ] || die 1 "versions mismatch: target=$target_python, installer=$py_installer_version"
+  [ "$target_python" = "$py_installer_version" ] || die 1 "versions mismatch: target=$target_python, installer=$py_installer_version"
   python='python3'
   python_dir="$cache_dir/python"
   if [ ! -e "$python_dir" ]
@@ -76,31 +76,12 @@ setup_osx_python()
   fi
   # Update PATH.
   run_eval "echo \"\$PWD/$python_dir/Python.framework/Versions/Current/bin\" >>\$GITHUB_PATH"
-  # Target High Sierra.
-  run_eval "echo MACOSX_DEPLOYMENT_TARGET=10.13 >>\$GITHUB_ENV"
+  run_eval "echo MACOSX_DEPLOYMENT_TARGET=12.0 >>\$GITHUB_ENV"
   # Fix SSL certificates so plover_build_utils.download works.
   SSL_CERT_FILE="$("$python" -m pip._vendor.certifi)" || die
   run_eval "echo SSL_CERT_FILE='$SSL_CERT_FILE' >>\$GITHUB_ENV"
 }
 
-setup_pip_options()
-{
-  # If the wheels cache is available, disable pip's index.
-  if [ -e "$wheels_cache" ]
-  then
-    run_eval "echo PIP_NO_INDEX=1 >>\$GITHUB_ENV"
-  else
-    run mkdir -p "$wheels_cache"
-  fi
-  if [ "$RUNNER_OS" = 'Windows' ]
-  then
-    PIP_FIND_LINKS="$(cygpath -a -w "$wheels_cache")" || die
-  else
-    PIP_FIND_LINKS="$PWD/$wheels_cache"
-  fi
-  run_eval "echo PIP_FIND_LINKS='$PIP_FIND_LINKS' >>\$GITHUB_ENV"
-}
-
 setup_python_env()
 {
   python_userbase="$cache_dir/python_userbase"
@@ -133,8 +114,8 @@ publish_github_release()
       title="$tag"
       is_draft='yes'
       is_prerelease="$("$python" <<EOF
-from pkg_resources import parse_version
-version = parse_version('$RELEASE_VERSION')
+from packaging.version import parse
+version = parse('$RELEASE_VERSION')
 print('1' if version.is_prerelease else '')
 EOF
 )" || die
@@ -183,10 +164,10 @@ EOF
       head -n20 <<<"$last_release"
       run_eval "last_version=\"\$(echo -n \"\$last_release\" | sed -n '/^# \\w\\+ \\([^ ]\\+\\)\$/{s//\\1/;P;Q0};\$Q1')\""
       if python <<EOF
-from pkg_resources import parse_version
+from packaging.version import parse
 import sys
-version = parse_version('$RELEASE_VERSION')
-last_version = parse_version('$last_version')
+version = parse('$RELEASE_VERSION')
+last_version = parse('$last_version')
 sys.exit(0 if version < last_version else 1)
 EOF
       then

.github/workflows/ci/helpers.sh

@@ -8,22 +8,21 @@ action_download_artifact: actions/download-artifact@v4
 
 skippy_enabled: true
 
+default_python: 3.13.3
+
 vars:
   - &dist_linux
     variant: Linux
-    python: "3.9"
     os: Linux
     platform: ubuntu-22.04
 
   - &dist_macos
     variant: macOS
-    python: "3.9"
     os: macOS
     platform: macos-15
 
   - &dist_win
     variant: Windows
-    python: "3.9"
     os: Windows
     platform: windows-2022
 
@@ -51,9 +50,14 @@ jobs:
   - &python_test
     <<: *test
     <<: *dist_other
-    variant: Python 3.8
-    python: "3.8"
+    variant: Python Latest Supported
     skiplists: ["job_test", "os_linux", "os_macos", "os_windows"]
+  - <<: *python_test
+    variant: Python 3.12
+    python: "3.12"
+  - <<: *python_test
+    variant: Python 3.11
+    python: "3.11"
   - <<: *python_test
     variant: Python 3.10
     python: "3.10"
@@ -70,7 +74,6 @@ jobs:
   - <<: *dist_other
     type: test_packaging
     variant: Packaging
-    python: "3.9"
     reqs: ["packaging", "setup"]
     skiplists: ["job_test_packaging"]
 

.github/workflows/ci/workflow_context.yml

@@ -45,6 +45,9 @@ def fetch_anchor(self):
     j['needs'] = j.get('needs', [])
     j['reqs'] = ['reqs/%s.txt' % r for r in j['reqs']]
     j['cache_extra_deps'] = j.get('cache_extra_deps', [])
+    if 'python' not in j:
+        j['python'] = context['default_python']
+
     if context['skippy_enabled']:
         # Path to the "skip_cache" file.
         j['skip_cache_path'] = '.skip_cache_{id}'.format(**j)

.github/workflows/ci/workflow_generate.py

@@ -120,9 +120,6 @@ jobs:
           path: .cache
           key: <@ cache_epoch @>_${{ steps.set_cache.outputs.cache_name }}_${{ hashFiles('reqs/constraints.txt'<% for d in (j.reqs + j.cache_extra_deps) %><@ ', %r' % d @><% endfor %>) }}
 
-      - name: Setup pip options
-        run: setup_pip_options
-
       <% if j.os == 'macOS' %>
       # To support older macOS versions, setup Python from an official installer.
       - name: Setup Python
@@ -288,11 +285,10 @@ jobs:
       - name: Checkout
         uses: <@ action_checkout @>
 
-      # FIXME pass python version via workflow_context
       - name: Setup Python
         uses: <@ action_setup_python @>
         with:
-          python-version: 3.9
+          python-version: <@ default_python @>
 
       - name: Install dependencies
         run: |

.github/workflows/ci/workflow_template.yml

@@ -6,7 +6,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.9"
 
 python:
   install:

.readthedocs.yml

@@ -61,17 +61,3 @@ The full path name of the Plover configuration file.
 
 The directory containing Plover's assets, such as icons and dictionaries.
 ```
-
-```{data} plover_dist
-:type: pkg_resources.DistInfoDistribution
-
-A {class}`pkg_resources.DistInfoDistribution` containing information about
-Plover's base distribution, such as resource paths and package metadata.
-```
-
-```{data} HAS_GUI_QT
-:type: bool
-
-`True` if Plover supports the Qt-based GUI and Qt is installed,
-`False` otherwise.
-```

doc/api/oslayer_config.md

@@ -42,7 +42,7 @@ This method does not get called automatically upon instantiating a Registry
 object, so make sure to call it before using any plugins.
 ```
 
-```{method} register_plugin_from_entrypoint(plugin_type: str, entrypoint: pkg_resources.EntryPoint)
+```{method} register_plugin_from_entrypoint(plugin_type: str, entrypoint: importlib.metadata.EntryPoint)
 Adds a plugin of the specified type discovered through the entry point
 mechanism to the registry.
 ```
@@ -86,13 +86,9 @@ function, class, or module.
 
 ````{class} PluginDistribution(dist, plugins)
 ```{attribute} dist
-:type: pkg_resources.Distribution
+:type: str
 
-A [`Distribution`](https://setuptools.readthedocs.io/en/latest/pkg_resources.html#distribution-objects)
-providing information on a single package either
-bundled with Plover, or installed from the plugins manager, for
-example, the main Plover package `plover 4.0.0-dev12`. Each
-distribution may contain multiple plugins.
+A string representing the entry point group of the distribution plugin.
 ```
 
 ```{attribute} plugins

doc/api/registry.md

@@ -1,6 +1,8 @@
 # Environment setup
 
-You need Python >= 3.8 installed, and you need [tox](https://pypi.org/project/tox/) >= 4.0.
+You need Python >= 3.10 installed, and you need [tox](https://pypi.org/project/tox/) >= 4.0.
+It is recommended to install the same Python version that is packaged in the official installer files.
+You can look up this version in the file `.github/workflows/ci/workflow_context.yml` in the vars section.
 
 Tox simplifies the process of creating and managing isolated virtual environments,
 handling dependency installation, and running the test suite in isolation. This

doc/developer_guide.md

@@ -1 +1 @@
-Fix keys getting stuck if keys held when starting Plover and emulating keyboard with Uinput
+Fix keys getting stuck if keys held when starting Plover and emulating keyboard with Uinput.