Add support for Python 3.13 (#985)

* Run tests under 3.13.0-rc2

* Work around lack of wheels for some packages

* Use newer gevent on Python 3.13

* Use Python 3.13 final

* Add legacy-cgi package on Python>=3.13

* Require grpcio>=1.66.2 on 3.13

* Require gevent>=24.10.3 on 3.13

* poetry lock --no-update

* poetry update pylint

* Upgrade psycopg2

* Require newer confluent-kafka on Python 3.13

* Ignore mypy error

* Add pylint import-error disable for collections.abc

Workaround for pylint-dev/pylint#10112

* Upgrade some pytest-related packages

* Fix some tests broken by package upgrades

* Fix missing teardown functions in cassandra tests

These caused tests to hang under Python 3.13.

* Remove now-unnecessary workarounds for packages without wheels

* poetry update

* Remove now-unnecessary "type: ignore" comment

Author: chriskuehl

.github/workflows/python-package.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     container:
       image: python:${{ matrix.python-version }}
@@ -37,6 +37,14 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-poetry-
 
+      # TODO(ckuehl|2024-09-26): Remove this once Python 3.13 wheels are
+      # available for our dependencies.
+      - name: Install temporary Python 3.13 build dependencies
+        if: ${{ matrix.python-version == '3.13' }}
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
+
       - name: Update PATH
         run: 'echo "$HOME/.local/bin" >> "$GITHUB_PATH"'
 
@@ -45,7 +53,7 @@ jobs:
           CASS_DRIVER_NO_EXTENSIONS: theytaketoolongtobuild
         run: |
           pip install pipx
-          pipx install poetry==1.8.2
+          pipx install poetry==1.8.3
           make .venv
 
       - name: Lint

.github/workflows/python-publish.yaml

@@ -22,7 +22,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        pipx install poetry==1.8.2
+        pipx install poetry==1.8.3
 
     - name: Build and publish
       env:

Dockerfile

@@ -1,16 +1,20 @@
 FROM ghcr.io/reddit/thrift-compiler:0.19.0 AS thrift
 
-FROM python:3.12
+FROM public.ecr.aws/docker/library/python:3.13
+
+# This is needed for pendulum due to no wheel: https://github.com/sdispater/pendulum/issues/844
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:$PATH"
 
 COPY --from=thrift /usr/local/bin/thrift /usr/local/bin/thrift
 
 WORKDIR /src
 
 RUN python -m venv /tmp/poetry && \
-    /tmp/poetry/bin/pip install poetry==1.8.2 && \
+    /tmp/poetry/bin/pip install poetry==1.8.3 && \
     ln -s /tmp/poetry/bin/poetry /usr/local/bin/poetry
 
-COPY pyproject.toml poetry.lock ./
+COPY pyproject.toml poetry.lock README.md ./
 RUN poetry install --all-extras
 
 CMD ["/bin/bash"]

baseplate/__init__.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import random
-from collections.abc import Iterator
+from collections.abc import Iterator  # pylint: disable=import-error
 from contextlib import contextmanager
 from types import TracebackType
 from typing import Any, Callable, NamedTuple, Optional

baseplate/clients/cassandra.py

@@ -1,6 +1,6 @@
 import logging
 import time
-from collections.abc import Mapping, Sequence
+from collections.abc import Mapping, Sequence  # pylint: disable=import-error
 from threading import Event
 from typing import (
     TYPE_CHECKING,

baseplate/clients/memcache/__init__.py

@@ -1,4 +1,4 @@
-from collections.abc import Iterable, Sequence
+from collections.abc import Iterable, Sequence  # pylint: disable=import-error
 from time import perf_counter
 from typing import Any, Callable, Optional, Union
 

baseplate/clients/sqlalchemy.py

@@ -2,7 +2,7 @@
 
 import re
 import typing
-from collections.abc import Sequence
+from collections.abc import Sequence  # pylint: disable=import-error
 from time import perf_counter
 from typing import Any, Optional, Union
 

baseplate/clients/thrift.py

@@ -5,7 +5,7 @@
 import sys
 import time
 from collections import OrderedDict
-from collections.abc import Iterator
+from collections.abc import Iterator  # pylint: disable=import-error
 from math import ceil
 from typing import Any, Callable, Optional
 

baseplate/frameworks/pyramid/__init__.py

@@ -2,7 +2,7 @@
 import logging
 import sys
 import time
-from collections.abc import Iterable, Iterator, Mapping
+from collections.abc import Iterable, Iterator, Mapping  # pylint: disable=import-error
 from typing import Any, Callable, Optional
 
 import pyramid.events

baseplate/frameworks/queue_consumer/kafka.py

@@ -3,7 +3,7 @@
 import queue
 import socket
 import time
-from collections.abc import Sequence
+from collections.abc import Sequence  # pylint: disable=import-error
 from typing import TYPE_CHECKING, Any, Callable, NamedTuple, Optional
 
 import confluent_kafka

baseplate/frameworks/queue_consumer/kombu.py

@@ -2,7 +2,7 @@
 import queue
 import socket
 import time
-from collections.abc import Sequence
+from collections.abc import Sequence  # pylint: disable=import-error
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Callable, NamedTuple, Optional
 

baseplate/frameworks/thrift/__init__.py

@@ -2,7 +2,7 @@
 import random
 import sys
 import time
-from collections.abc import Iterator, Mapping
+from collections.abc import Iterator, Mapping  # pylint: disable=import-error
 from contextlib import contextmanager
 from logging import Logger
 from typing import Any, Callable, Optional

baseplate/lib/_requests.py

@@ -6,7 +6,7 @@
 
 import socket
 import urllib.parse
-from collections.abc import Mapping
+from collections.abc import Mapping  # pylint: disable=import-error
 from typing import Optional
 
 import requests.adapters

baseplate/lib/config.py

@@ -93,7 +93,7 @@
 import pwd
 import re
 import socket
-from collections.abc import Sequence
+from collections.abc import Sequence  # pylint: disable=import-error
 from typing import (
     IO,
     Any,

baseplate/lib/propagator_redditb3_http.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Iterable
+from collections.abc import Iterable  # pylint: disable=import-error
 from re import compile as re_compile
 from typing import Any, Optional
 

baseplate/lib/propagator_redditb3_thrift.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Iterable
+from collections.abc import Iterable  # pylint: disable=import-error
 from re import compile as re_compile
 from typing import Any, Optional
 

baseplate/lib/random.py

@@ -3,7 +3,7 @@
 import bisect
 import random
 import typing
-from collections.abc import Iterable
+from collections.abc import Iterable  # pylint: disable=import-error
 from typing import Callable, Generic, Optional, TypeVar
 
 T = TypeVar("T")

baseplate/lib/retry.py

@@ -1,7 +1,7 @@
 """Policies for retrying an operation safely."""
 
 import time
-from collections.abc import Iterator
+from collections.abc import Iterator  # pylint: disable=import-error
 from typing import Optional
 
 

baseplate/lib/secrets.py

@@ -5,7 +5,7 @@
 import json
 import logging
 import os
-from collections.abc import Iterator
+from collections.abc import Iterator  # pylint: disable=import-error
 from pathlib import Path
 from typing import Any, NamedTuple, Optional, Protocol
 

baseplate/lib/service_discovery.py

@@ -19,7 +19,7 @@
 """
 
 import json
-from collections.abc import Sequence
+from collections.abc import Sequence  # pylint: disable=import-error
 from typing import IO, NamedTuple, Optional
 
 from baseplate.lib.config import Endpoint, EndpointConfiguration

baseplate/lib/thrift_pool.py

@@ -20,7 +20,7 @@
 import queue
 import socket
 import time
-from collections.abc import Generator
+from collections.abc import Generator  # pylint: disable=import-error
 from typing import TYPE_CHECKING, Any, Optional
 
 from thrift.protocol import THeaderProtocol

baseplate/lib/tracing.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable, Sequence
+from collections.abc import Callable, Sequence  # pylint: disable=import-error
 from typing import Any, Optional, Protocol
 
 import gevent.pool

baseplate/server/__init__.py

@@ -22,7 +22,7 @@
 import time
 import traceback
 import warnings
-from collections.abc import Mapping, MutableMapping, Sequence
+from collections.abc import Mapping, MutableMapping, Sequence  # pylint: disable=import-error
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum

baseplate/server/prometheus.py

@@ -15,7 +15,7 @@
 import logging
 import os
 import sys
-from collections.abc import Iterable
+from collections.abc import Iterable  # pylint: disable=import-error
 from typing import TYPE_CHECKING
 
 from gevent.pywsgi import LoggingLogAdapter, WSGIServer

baseplate/server/queue_consumer.py

@@ -8,7 +8,7 @@
 import signal
 import socket
 import uuid
-from collections.abc import Sequence
+from collections.abc import Sequence  # pylint: disable=import-error
 from threading import Thread
 from typing import TYPE_CHECKING, Any, Callable
 

baseplate/server/reloader.py

@@ -12,7 +12,7 @@
 import sys
 import threading
 import time
-from collections.abc import Iterator, Sequence
+from collections.abc import Iterator, Sequence  # pylint: disable=import-error
 from typing import NoReturn
 
 logger = logging.getLogger(__name__)