Merge pull request #518 from zodb/py314

jamadden · web-flow · commit 9e3f0c2ce19c · 2025-09-29T14:23:00.000-05:00
Python 3.14 support
diff --git a/.coveragerc b/.coveragerc
@@ -9,6 +9,13 @@ omit =
 # Probably not since we're now installing in non-editable mode.
 relative_files = True
 
+# In 7.9.1, the default trace engine changed to ``sys.monitoring``
+# for Python 3.14rc1+, but that breaks us when we test gevent (
+# where me manually pass the --concurrency=greenlet arg):
+#   ConfigError: Can't support concurrency=greenlet with SysMonitor, only threads
+# so force it to always be ctrace.
+core = ctrace
+
 [report]
 # Coverage is run on Linux under cPython 2 and 3,
 # against MySQL and PostgreSQL, so
diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
@@ -14,8 +14,7 @@ runs:
   steps:
     - name: Test gevent concurrency
       shell: bash
-      # Do we need to test this on macOS? At this writing, that's the only platform
-      # we're testing 3.12 on, and gevent isn't out yet for 3.12.
+      # See also .coveragerc because we force the tracer.
       if: startsWith(runner.os, 'Linux')
       run: |
         echo "Using coverage? ${{ inputs.useCoverage }}"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# Keep GitHub Actions up to date with GitHub's Dependabot...
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    groups:
+      github-actions:
+        patterns:
+          - "*"  # Group all Actions updates into a single larger pull request
+    schedule:
+      interval: monthly
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -93,7 +93,8 @@ jobs:
           - '3.11'
           - "3.12"
           - "3.13"
-          - "pypy-3.10-v7.3.17"
+          - "pypy-3.11"
+          - "3.14.0-rc.3"
         os: [ubuntu-latest, macos-latest]
         exclude:
           # Can't build persistent on 3.12 with -UNDEBUG because it
@@ -102,14 +103,14 @@ jobs:
           # persistent wheel, we have to exclude that one.
           # The same thing goes for PyPy.
           - os: ubuntu-latest
-            python-version: "pypy-3.10-v7.3.17"
+            python-version: "pypy-3.11"
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -258,7 +259,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up QEMU
@@ -275,7 +276,7 @@ jobs:
           path: wheelhouse/*whl
           name: ${{ matrix.image }}_wheels.zip
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.10.3
+        uses: pypa/gh-action-pypi-publish@v1.13.0
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
         with:
           user: __token__
diff --git a/.travis/zope_testrunner_gevent.py b/.travis/zope_testrunner_gevent.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
 Script to run zope.testrunner in a gevent monkey-patched environment.
@@ -9,10 +10,6 @@
 threadpool isn't functional.
 
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import gevent.monkey
 gevent.monkey.patch_all()
 # pylint:disable=wrong-import-position, wrong-import-order
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,10 +2,28 @@
  Changes
 =========
 
-4.1.2 (unreleased)
+4.3.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for Python 3.14.
+
+  .. note::
+
+     This will be the last RelStorage release to support Python 3.9.
+
+  .. warning::
+
+     Current releases of ``persistent``, up through at least 6.1.1,
+     do not properly invalidate objects on Python 3.14. Most
+     applications probably won't notice, but there may be issues with
+     blobs, or if applications have a particular reliance on
+     ``__dict__`` being immediately cleared after an object is
+     invalidated. See `PR 221 <https://github.com/zopefoundation/persistent/pull/221>`_.
+
+- Include ``psycopg2`` in the ``postgresql`` extra on CPython 3.13+.
+  See :issue:`515`.
+- Increase the minimum supported version of ``mysql-connector-python``
+  from 8.0.32 to 9.2.0.
 
 
 4.1.1 (2024-12-12)
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,6 +15,7 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\.travis\\run_with_env.cmd"
     # Use a fixed hash seed for reproducability
     PYTHONHASHSEED: 8675309
+    PYTHONWARNINGS: ignore
     MYSQL_PWD: "Password12!"
     PGPASSWORD: "Password12!"
     PGUSER: "postgres"
@@ -37,6 +38,11 @@ environment:
     # Fully supported 64-bit versions, with testing. This should be
     # all the current (non EOL) versions.
 
+    - PYTHON: "C:\\Python314-x64"
+      PYTHON_VERSION: "3.14.0rc3"
+      PYTHON_ARCH: "64"
+      PYTHON_EXE: python
+
     - PYTHON: "C:\\Python313-x64"
       PYTHON_VERSION: "3.13.0"
       PYTHON_ARCH: "64"
diff --git a/docs/mysql/options.rst b/docs/mysql/options.rst
@@ -62,7 +62,7 @@ driver
       This is the `official client
       <https://dev.mysql.com/doc/connector-python/en/>`_ built by
       Oracle and distributed as `mysql-connector-python on PyPI
-      <https://pypi.org/project/mysql-connector-python/8.0.17/#files>`_.
+      <https://pypi.org/project/mysql-connector-python/9.4.0/#files>`_.
 
       It has an optional C extension. The C extension (which uses the
       MySQL client libraries) performs about as well as mysqlclient,
diff --git a/scripts/releases/make-manylinux b/scripts/releases/make-manylinux
@@ -58,14 +58,8 @@ if [ -d /RelStorage ] && [ -d /opt/python ]; then
     rm -rf wheelhouse
     mkdir wheelhouse
     ls -l /opt/python
-    for variant in `ls -d /opt/python/cp{312,39,310,311,313}*`; do
+    for variant in `ls -d /opt/python/cp{314,312,39,310,311,313}*`; do
         echo "Building $variant"
-        if [ "$variant" = "/opt/python/cp313-cp313t" ]; then
-            # It appears that Cython 3.0.11 cannot produce code that
-            # works here. Lots of compiler errors.
-            echo "Unable to build without gil"
-            continue
-        fi
         mkdir /tmp/build
         cd /tmp/build
         git clone /RelStorage RelStorage
@@ -74,9 +68,9 @@ if [ -d /RelStorage ] && [ -d /opt/python ]; then
         $variant/bin/pip install -U setuptools
         $variant/bin/pip install -U 'cython>=3.0'
         PATH=$variant/bin:$PATH $variant/bin/python setup.py bdist_wheel
-        auditwheel show dist/RelStorage*.whl
-        auditwheel repair dist/RelStorage*.whl
-        cp wheelhouse/RelStorage*.whl /RelStorage/wheelhouse
+        auditwheel show dist/relstorage*.whl
+        auditwheel repair dist/relstorage*.whl
+        cp wheelhouse/relstorage*.whl /RelStorage/wheelhouse
         cd /RelStorage
         rm -rf /tmp/build
     done
diff --git a/setup.py b/setup.py
@@ -165,21 +165,23 @@ def read_file(*path):
     packages=find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,
-    license="ZPL 2.1",
+    license="ZPL-2.1",
     platforms=["any"],
     description="A backend for ZODB that stores pickles in a relational database.",
-    # 3.8: importlib.metadata
+    # Bump to 3.10 or even 3.11 at next release. We'll have to make changes
+    # in this file and our CI configuration to make sure we still have the
+    # same test coverage, as we were using just 3.9  for some things.
     python_requires=">=3.9",
     classifiers=[
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: Zope Public License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Database",
@@ -298,19 +300,17 @@ def read_file(*path):
         # and the authors specifically request that other modules not depend on
         # psycopg2-binary.
         # See http://initd.org/psycopg/docs/install.html#binary-packages
-        'postgresql: platform_python_implementation == "CPython" and python_version != "3.13"' : [
+        'postgresql: platform_python_implementation == "CPython"' : [
             # 2.4.1+ is required for proper bytea handling;
             # 2.6+ is needed for 64-bit lobject support;
             # 2.7+ is needed for Python 3.7 support and PostgreSQL 10+;
             # 2.7.6+ is needed for PostgreSQL 11;
             # 2.8 is needed for conn.info
             # 2.9.10 will be needed for Python 3.13, but it's not out yet.
             'psycopg2 >= 2.8.3',
-        ],
-        'postgresql: platform_python_implementation == "CPython" and python_version == "3.13"': [
-            # psycopg2 2.9.10 is needed, but not available yet.
-            # See also 'all tested drivers'
-            'pg8000',
+            # However, at this writing, psycopg2 2.9.10, even though it can be built
+            # for 3.14rc1 cannot be imported on that version. This is a fallback.
+            'pg8000 >= 1.29.0; python_version >= "3.14" and sys_platform == "win32"',
         ],
         'postgresql: platform_python_implementation == "PyPy"': [
             # 2.8.0+ is needed for Python 3.7
@@ -340,7 +340,7 @@ def read_file(*path):
         'all_tested_drivers': [
             # Install all the supported drivers for the platform.
             # Spread them out across the versions to not load any one
-            # up too heavy for better parallelism.
+            # up too heavy for better job-level parallelism in CI.
 
             # First, mysql
             # pymysql on 3.9 on all platforms.
@@ -349,17 +349,17 @@ def read_file(*path):
             'mysqlclient >= 2.0.0',
             # mysql-connector-python; one of two pure-python versions
             # This requirement is repeated in the driver class.
-            'mysql-connector-python >= 8.0.32; python_version == "3.10"',
+            'mysql-connector-python >= 9.2.0; python_version == "3.10"',
 
             # postgresql
             # pure-python
             # pg8000
             # This requirement is repeated in the driver class.
-            'pg8000 >= 1.29.0; python_version == "3.11" or python_version == "3.13"',
+            'pg8000 >= 1.29.0; python_version == "3.11"',
             # CFFI, runs on all implementations.
             'psycopg2cffi >= 2.7.4; python_version == "3.11" or platform_python_implementation == "PyPy"',
             # Psycopg2 on all CPython, it's the default
-            'psycopg2 >= 2.8.3; platform_python_implementation == "CPython" and python_version != "3.13"',
+            'psycopg2 >= 2.8.3; platform_python_implementation == "CPython"',
         ],
     },
     entry_points={
diff --git a/src/relstorage/adapters/mysql/drivers/mysqlconnector.py b/src/relstorage/adapters/mysql/drivers/mysqlconnector.py
@@ -45,9 +45,10 @@ class PyMySQLConnectorDriver(AbstractMySQLDriver):
     PRIORITY_PYPY = 2
     REQUIREMENTS = (
         # 8.0.32 changes character set handling,
-        # adds init_command
+        # adds init_command. 9.2.0 changed the
+        # handling of multiple result sets to be standard.
 
-        'mysql-connector-python >= 8.0.32',
+        'mysql-connector-python >= 9.2.0',
     )
 
 
@@ -196,16 +197,22 @@ def set_autocommit(self, conn, value):
         conn.autocommit = value
 
     def callproc_multi_result(self, cursor, proc, args=(), exit_critical_phase=False):
-        # This driver is weird, wants multi=True, returns an iterator of cursors
-        # instead of using nextset()
-        resultsets = cursor.execute("CALL " + proc, args, multi=True)
-        multi_results = []
-        for resultset in resultsets:
+        # Prior to 9.2.0, this driver is weird, requires
+        # ``execute(...,multi=True)``, returns an iterator of cursors
+        # instead of using nextset(). That's standardized in 9.2;
+        # our only difference now is checking for InterfaceError.
+        if exit_critical_phase:
+            self.exit_critical_phase(cursor.connection, cursor)
+
+        cursor.execute("CALL " + proc, args)
+        multi_results = [cursor.fetchall()]
+        while cursor.nextset():
             try:
-                multi_results.append(resultset.fetchall())
+                multi_results.append(cursor.fetchall())
             except self.driver_module.InterfaceError:
                 # This gets raised on the empty set at the end, for some reason.
                 # Ensure we put one there to be like the others
+                # TODO: Is this true for >= 9.2?
                 multi_results.append(())
                 break
         return multi_results
diff --git a/src/relstorage/adapters/postgresql/drivers/pg8000.py b/src/relstorage/adapters/postgresql/drivers/pg8000.py
@@ -15,10 +15,6 @@
 """
 pg8000 IDBDriver implementations.
 """
-
-from __future__ import absolute_import
-from __future__ import print_function
-
 from collections import deque
 
 from zope.interface import implementer
@@ -27,12 +23,10 @@
 
 from ...interfaces import IDBDriver
 from ...sql import Compiler
-
 from . import AbstractPostgreSQLDriver
 from . import PostgreSQLDialect
 from ._lobject import LobConnectionMixin
 
-
 __all__ = [
     'PG8000Driver',
 ]
@@ -249,3 +243,10 @@ def connection_may_need_commit(self, conn):
 
     def _get_exception_pgcode(self, exc):
         return exc.args[0]['C']
+
+    # pg8000 raises pg8000.dbapi.ProgrammingError, which is a DatabaseError.
+    # We've seen both
+    #    40P01 - deadlock_detected (Transaction Rollback)
+    #    55P03 - lock_not_available (Object Not In Prerequisite State)
+    # ERRCODE_DEADLOCK is the first one, checked by super.
+    # If we treat the other one like a deadlock, a bunch of tests break.
diff --git a/src/relstorage/adapters/tests/test_drivers.py b/src/relstorage/adapters/tests/test_drivers.py
@@ -150,7 +150,8 @@ class Driver(drivers.AbstractModuleDriver):
             REQUIREMENTS = (
                 # Guaranteed to have this. We didn't put a version
                 # on it, so it will always work.
-                MODULE_NAME,
+                # Note we're using the normalized distribution name here.
+                'zope-interface',
             )
 
         d = Driver.__new__(Driver)
@@ -159,7 +160,7 @@ class Driver(drivers.AbstractModuleDriver):
 
         # Multiple
         d.REQUIREMENTS = (
-            'zope.interface > 1, != 2',
+            'zope-interface > 1, != 2',
             'ZODB'
         )
         mod = d._check_preconditions()
diff --git a/src/relstorage/tests/blob/blob_cache.py b/src/relstorage/tests/blob/blob_cache.py
@@ -17,9 +17,6 @@
 This test is only for the non-shared (aka, "cached") case.
 
 """
-from __future__ import absolute_import
-from __future__ import print_function
-
 import sys
 import threading
 import traceback
@@ -57,15 +54,19 @@ class TestBlobCacheMixin(TestBlobMixin):
     def setUp(self):
         # and don't actually use native threads in gevent mode. They can't be
         # waited on which makes this test racy.
-
         from relstorage.blobhelper import cached
         from relstorage._util import thread_spawn
+        from relstorage._util import spawn as native_thread_spawn
         assert cached.native_thread_spawn is not thread_spawn
         cached.native_thread_spawn = thread_spawn
 
-        super().setUp()
-        # We're going to wait for any threads we started to finish, so...
-        self._old_threads = list(threading.enumerate())
+        try:
+            super().setUp()
+            # We're going to wait for any threads we started to finish, so...
+            self._old_threads = list(threading.enumerate())
+        except:
+            cached.native_thread_spawn = native_thread_spawn
+            raise
 
     def _wait_for_all_spawned_threads_to_finish(self):
         # pylint:disable=method-hidden
diff --git a/src/relstorage/tests/blob/blob_transaction.py b/src/relstorage/tests/blob/blob_transaction.py
diff --git a/src/relstorage/tests/locking.py b/src/relstorage/tests/locking.py
diff --git a/src/relstorage/tests/test_zodbconvert.py b/src/relstorage/tests/test_zodbconvert.py
