Set default python version 3.9 and fix strenum problem

.github/workflows/server.yml

@@ -47,23 +47,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] # testcontainers is not supported on <3.9
     needs: build-server
     defaults:
         run:
             working-directory: server
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install '.[test]'
         python -m pip install .
     - name: Test with pytest
       run: |
-        pytest
+        pytest --log-cli-level=DEBUG

.pre-commit-config.yaml

@@ -6,13 +6,18 @@ repos:
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-    rev: v0.9.0
+    rev: v0.15.0
     hooks:
       # Run the linter.
-      - id: ruff
+      - id: ruff-check
         args: [ --fix ]
       # Run the formatter.
       - id: ruff-format
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: "v2.12.1"
+    hooks:
+      - id: pyproject-fmt
+
   #- repo: https://github.com/pre-commit/mirrors-clang-format
   #  rev: v15.0.7
   #  hooks:

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11 AS build
+FROM python:3.9 AS build
 
 WORKDIR /home/recceiver
 
@@ -8,7 +8,7 @@ RUN python -m venv venv
 
 RUN venv/bin/python -m pip install ./server
 
-FROM python:3.11-alpine
+FROM python:3.9-alpine
 
 WORKDIR /home/recceiver
 

server/docker/cf-compose.yml

@@ -6,7 +6,7 @@ services:
     networks:
       - net-2-cf
     ports:
-      - "8080:8080"
+      - "8080"
     depends_on:
       elasticsearch:
         condition: service_healthy

server/pyproject.toml

@@ -1,45 +1,50 @@
 [build-system]
-requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
+requires = [ "setuptools" ]
 
 [project]
-name="recceiver"
+name = "recceiver"
+version = "1.8dev"
+description = "recCeiver is a server component of the recsync protocol. It receives record updates from recsync clients (e.g., recCasters) and forwards them to a configurable backend such as ChannelFinder."
+readme = "README.md"
 authors = [
-    {name = "Michael Davidsaver", email = "mdavidsaver@gmail.com"},
+  { name = "Michael Davidsaver", email = "mdavidsaver@gmail.com" },
 ]
-description="resync server"
-version="1.5"
-readme = "README.md"
 requires-python = ">=3.6"
+classifiers = [
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.6",
+  "Programming Language :: Python :: 3.7",
+  "Programming Language :: Python :: 3.8",
+  "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",
+]
 dependencies = [
-    "dataclasses; python_version < '3.7'",
-    "requests",
-    "twisted",
-    "channelfinder @ https://github.com/ChannelFinder/pyCFClient/archive/refs/tags/v3.0.0.zip"
+  "channelfinder @ https://github.com/ChannelFinder/pyCFClient/archive/refs/tags/v3.0.0.zip",
+  "dataclasses; python_version<'3.7'",
+  "requests",
+  "twisted",
 ]
 
-[project.optional-dependencies]
-test = ["pytest", "testcontainers>=4"]
-
-[project.urls]
-Repository="https://github.com/mdavidsaver/recsync"
+optional-dependencies.test = [ "pytest", "testcontainers>=4" ]
+urls.Repository = "https://github.com/ChannelFinder/recsync"
 
 [tool.setuptools]
-packages = ["recceiver", "twisted.plugins"]
+packages = [ "recceiver", "twisted.plugins" ]
 include-package-data = true
 
 [tool.setuptools.package-data]
-twisted = ["plugins/recceiver_plugin.py"]
-
-[tool.pytest.ini_options]
-log_cli = true
-log_cli_level = "DEBUG"
+twisted = [ "plugins/recceiver_plugin.py" ]
 
 [tool.ruff]
-line-length = 120
+target-version = "py39"
 
-[tool.ruff.lint]
+line-length = 120
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
 # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
-select = ["E", "F", "I"]
+lint.select = [ "E", "F", "I" ]

server/recceiver/application.py

@@ -3,13 +3,13 @@
 import logging
 import random
 
-from zope.interface import implementer
-
-from twisted import plugin
 from twisted.application import service
 from twisted.internet import defer, pollreactor
 from twisted.internet.error import CannotListenError
 from twisted.python import log, usage
+from zope.interface import implementer
+
+from twisted import plugin
 
 from .announce import Announcer
 from .processors import ProcessorController

server/recceiver/cfstore.py

@@ -11,12 +11,11 @@
 
 from channelfinder import ChannelFinderClient
 from requests import ConnectionError, RequestException
-from zope.interface import implementer
-
 from twisted.application import service
 from twisted.internet import defer
 from twisted.internet.defer import DeferredLock
 from twisted.internet.threads import deferToThread
+from zope.interface import implementer
 
 from . import interfaces
 from .interfaces import CommitTransaction
@@ -31,7 +30,7 @@
 DEFAULT_QUERY_LIMIT = 10_000
 
 
-class PVStatus(enum.StrEnum):
+class PVStatus(str, enum.Enum):
     """PV Status values."""
 
     ACTIVE = "Active"
@@ -170,7 +169,7 @@ class RecordInfo:
     aliases: List[str] = field(default_factory=list)
 
 
-class CFPropertyName(enum.StrEnum):
+class CFPropertyName(str, enum.Enum):
     """Standard property names used in Channelfinder."""
 
     HOSTNAME = "hostName"

server/recceiver/dbstore.py

@@ -3,11 +3,10 @@
 import itertools
 import logging
 
-from zope.interface import implementer
-
 from twisted.application import service
 from twisted.enterprise import adbapi as db
 from twisted.internet import defer
+from zope.interface import implementer
 
 from . import interfaces
 

server/recceiver/interfaces.py

@@ -3,9 +3,8 @@
 from dataclasses import dataclass
 from typing import Dict, List, Set, Tuple
 
-from zope.interface import Attribute, Interface
-
 from twisted.application import service
+from zope.interface import Attribute, Interface
 
 
 class ITransaction(Interface):

server/recceiver/mock_client.py

@@ -1,5 +1,4 @@
 from requests import HTTPError
-
 from twisted.internet.address import IPv4Address
 
 

server/recceiver/processors.py

@@ -5,11 +5,11 @@
 from configparser import ConfigParser as Parser
 from os.path import expanduser
 
+from twisted.application import service
+from twisted.internet import defer, task
 from zope.interface import implementer
 
 from twisted import plugin
-from twisted.application import service
-from twisted.internet import defer, task
 
 from . import interfaces
 

server/recceiver/recast.py

@@ -7,10 +7,9 @@
 import sys
 import time
 
-from zope.interface import implementer
-
 from twisted.internet import defer, protocol
 from twisted.protocols import stateful
+from zope.interface import implementer
 
 from .interfaces import ITransaction
 

server/tests/client_checks.py

@@ -67,7 +67,7 @@ def create_client_and_wait(compose: DockerCompose, expected_channel_count) -> Ch
 
 
 def create_client_from_compose(compose: DockerCompose) -> ChannelFinderClient:
-    cf_host, cf_port = compose.get_service_host_and_port("cf")
+    cf_host, cf_port = compose.get_service_host_and_port("cf", 8080)
     cf_url = f"http://{cf_host if cf_host else 'localhost'}:{cf_port}/ChannelFinder"
     # wait for channels to sync
     LOG.info("CF URL: %s", cf_url)

server/tests/test_bash_ioc.py

@@ -4,10 +4,10 @@
 from typing import Optional
 
 from channelfinder import ChannelFinderClient
+from docker.models.containers import Container
 from testcontainers.compose import DockerCompose
 
 from docker import DockerClient
-from docker.models.containers import Container
 
 from .client_checks import (
     BASE_IOC_CHANNEL_COUNT,