Merge branch 'master' into alissa-huskey/master

This brings in the fix to CI for Python 3.7.

Author: diazona

.github/workflows/tests.yml

@@ -16,13 +16,17 @@ jobs:
         # Not all Python versions are available for linux AND x64
         # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
         os: ['ubuntu-latest']
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.8', 'pypy-3.9']
         extra: ['', '-smtp']
         # The forced pytest versions correspond with the lower bounds in tox.ini
         pytest-version: ['', '--force-dep pytest==4.6', '--force-dep pytest==6.2.4']
         include:
         - os: 'ubuntu-20.04'
           python-version: '3.6'
+        - os: 'ubuntu-22.04'
+          python-version: '3.7'
+        - os: 'ubuntu-22.04'
+          python-version: 'pypy-3.7'
         exclude:
         - python-version: '3.10'
           pytest-version: '--force-dep pytest==4.6'

.pre-commit-config.yaml

@@ -37,13 +37,13 @@ repos:
         args: [--py3-plus]
 
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
     -   id: pyupgrade
         args: [--py3-plus]
 
 -   repo: https://github.com/rhysd/actionlint
-    rev: v1.7.4
+    rev: v1.7.7
     hooks:
     -   id: actionlint-docker