Merge pull request #1212 from dbfixtures/python3.14

fizyk · web-flow · commit 1af5eb62f772 · 2025-10-31T22:21:47.000+01:00
Add support for Python 3.14, drop for Python 3.9
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,6 +3,8 @@ updates:
 - package-ecosystem: pip
   directories:
     - "/"
+  exclude-paths:
+    - "oldest/*"
   schedule:
     interval: daily
     time: "02:00"
diff --git a/.github/workflows/dockerised-postgres.yml b/.github/workflows/dockerised-postgres.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       python-versions:
         description: 'Supported python versions'
-        default: '["3.9", "3.10", "3.11", "3.12", "3.13"]'
+        default: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
         required: false
         type: string
       postgresql:
diff --git a/.github/workflows/oldest-postgres.yml b/.github/workflows/oldest-postgres.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       python-versions:
         description: 'Supported python versions'
-        default: '["3.9", "3.10", "3.11", "3.12", "3.13", "pypy-3.10"]'
+        default: '["3.10", "3.11", "3.12", "3.13", "3.14", "pypy-3.11"]'
         required: false
         type: string
       postgresql:
@@ -57,7 +57,7 @@ jobs:
       - name: Install oldest supported versions
         uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
         with:
-          command: pip install -r oldest/requirements.rq
+          command: pip install -r oldest/requirements.txt
       - name: Run tests without xdist
         uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
         with:
diff --git a/.github/workflows/single-postgres.yml b/.github/workflows/single-postgres.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       python-versions:
         description: 'Supported python versions'
-        default: '["3.9", "3.10", "3.11", "3.12", "3.13", "pypy-3.10"]'
+        default: '["3.10", "3.11", "3.12", "3.13", "3.14", "pypy-3.11"]'
         required: false
         type: string
       postgresql:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,46 +19,46 @@ jobs:
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 16
-      python-versions: '["3.10", "3.11", "3.12", "3.13", "pypy-3.10"]'
+      python-versions: '["3.11", "3.12", "3.13", "3.14", "pypy-3.11"]'
   postgresql_15:
     needs: [postgresql_16]
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 15
-      python-versions: '["3.11", "3.12", "3.13"]'
+      python-versions: '["3.12", "3.13", "3.14"]'
   postgresql_14:
     needs: [postgresql_15]
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 14
-      python-versions: '["3.13"]'
+      python-versions: '["3.14"]'
   postgresql_13:
     needs: [postgresql_14]
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 13
-      python-versions: '["3.13"]'
+      python-versions: '["3.14"]'
   macos_postgres_17:
     needs: [postgresql_17]
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 17
       os: macos-latest
-      python-versions: '["3.11", "3.12", "3.13"]'
+      python-versions: '["3.12", "3.13", "3.14"]'
   macos_postgres_16:
     needs: [postgresql_16, macos_postgres_17]
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 16
       os: macos-latest
-      python-versions: '["3.11", "3.12", "3.13"]'
+      python-versions: '["3.12", "3.13", "3.14"]'
   macos_postgres_15:
     needs: [postgresql_15, macos_postgres_16]
     uses: ./.github/workflows/single-postgres.yml
     with:
       postgresql: 15
       os: macos-latest
-      python-versions: '["3.12", "3.13"]'
+      python-versions: '["3.13", "3.14"]'
   docker_postgresql_17:
     needs: [postgresql_17]
     uses: ./.github/workflows/dockerised-postgres.yml
@@ -69,22 +69,22 @@ jobs:
     uses: ./.github/workflows/dockerised-postgres.yml
     with:
       postgresql: 16
-      python-versions: '["3.10", "3.11", "3.12", "3.13"]'
+      python-versions: '["3.11", "3.12", "3.13", "3.14"]'
   docker_postgresql_15:
     needs: [postgresql_15, docker_postgresql_17]
     uses: ./.github/workflows/dockerised-postgres.yml
     with:
       postgresql: 15
-      python-versions: '["3.11", "3.12", "3.13"]'
+      python-versions: '["3.12", "3.13", "3.14"]'
   docker_postgresql_14:
     needs: [postgresql_14, docker_postgresql_15]
     uses: ./.github/workflows/dockerised-postgres.yml
     with:
       postgresql: 14
-      python-versions: '["3.12", "3.13"]'
+      python-versions: '["3.13", "3.14"]'
   docker_postgresql_13:
     needs: [postgresql_13, docker_postgresql_14]
     uses: ./.github/workflows/dockerised-postgres.yml
     with:
       postgresql: 13
-      python-versions: '["3.13"]'
+      python-versions: '["3.14"]'
diff --git a/newsfragments/+6028688d.break.rst b/newsfragments/+6028688d.break.rst
@@ -0,0 +1 @@
+Dropped support for Python 3.9 as it has reached End of Life
diff --git a/newsfragments/+910e271c.feature.rst b/newsfragments/+910e271c.feature.rst
@@ -0,0 +1 @@
+Marked support for Python 3.14
diff --git a/oldest/requirements.rq b/oldest/requirements.rq
diff --git a/oldest/requirements.txt b/oldest/requirements.txt
@@ -0,0 +1,5 @@
+pytest == 7.4; python_version >= "3.14"
+pytest == 7.2; python_version < "3.14"
+port-for == 0.7.3
+mirakuru == 2.6.0
+psycopg == 3.0.0
diff --git a/pyproject.toml b/pyproject.toml
@@ -17,11 +17,11 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "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 :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Testing",
@@ -34,7 +34,7 @@ dependencies = [
     "packaging",
     "psycopg >= 3.0.0"
 ]
-requires-python = ">= 3.9"
+requires-python = ">= 3.10"
 
 [project.urls]
 "Source" = "https://github.com/dbfixtures/pytest-postgresql"
@@ -65,7 +65,7 @@ norecursedirs = "examples"
 
 [tool.black]
 line-length = 100
-target-version = ['py39']
+target-version = ['py310']
 include = '.*\.pyi?$'
 
 [tool.ruff]
diff --git a/pytest_postgresql/config.py b/pytest_postgresql/config.py
@@ -1,7 +1,7 @@
 """Plugin's configuration."""
 
 from pathlib import Path
-from typing import Any, List, Optional, TypedDict, Union
+from typing import Any, TypedDict
 
 from _pytest._py.path import LocalPath
 from pytest import FixtureRequest
@@ -12,15 +12,15 @@ class PostgresqlConfigDict(TypedDict):
 
     exec: str
     host: str
-    port: Optional[str]
+    port: str | None
     port_search_count: int
     user: str
     password: str
     options: str
     startparams: str
     unixsocketdir: str
     dbname: str
-    load: List[Union[Path, str]]
+    load: list[Path | str]
     postgres_options: str
     drop_test_database: bool
 
@@ -52,9 +52,9 @@ def get_postgresql_option(option: str) -> Any:
     )
 
 
-def detect_paths(load_paths: List[Union[LocalPath, str]]) -> List[Union[Path, str]]:
+def detect_paths(load_paths: list[LocalPath | str]) -> list[Path | str]:
     """Convert path to sql files to Path instances."""
-    converted_load_paths: List[Union[Path, str]] = []
+    converted_load_paths: list[Path | str] = []
     for path in load_paths:
         if isinstance(path, LocalPath):
             path = str(path)
diff --git a/pytest_postgresql/executor_noop.py b/pytest_postgresql/executor_noop.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """PostgreSQL Noop executor providing connection details for postgres client."""
-from typing import Any, Optional, Union
+from typing import Any
 
 import psycopg
 from packaging.version import parse
@@ -33,11 +33,11 @@ class NoopExecutor:
     def __init__(
         self,
         host: str,
-        port: Union[str, int],
+        port: str | int,
         user: str,
         options: str,
         dbname: str,
-        password: Optional[str] = None,
+        password: str | None = None,
     ):
         """Initialize nooperator executor mock.
 
diff --git a/pytest_postgresql/factories/client.py b/pytest_postgresql/factories/client.py
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """Fixture factory for postgresql client."""
-from typing import Callable, Iterator, Optional, Union
+from typing import Callable, Iterator
 
 import psycopg
 import pytest
@@ -31,8 +31,8 @@
 
 def postgresql(
     process_fixture_name: str,
-    dbname: Optional[str] = None,
-    isolation_level: "Optional[psycopg.IsolationLevel]" = None,
+    dbname: str | None = None,
+    isolation_level: "psycopg.IsolationLevel | None" = None,
 ) -> Callable[[FixtureRequest], Iterator[Connection]]:
     """Return connection fixture factory for PostgreSQL.
 
@@ -50,7 +50,7 @@ def postgresql_factory(request: FixtureRequest) -> Iterator[Connection]:
         :param request: fixture request object
         :returns: postgresql client
         """
-        proc_fixture: Union[PostgreSQLExecutor, NoopExecutor] = request.getfixturevalue(
+        proc_fixture: PostgreSQLExecutor | NoopExecutor = request.getfixturevalue(
             process_fixture_name
         )
         config = get_config(request)
diff --git a/pytest_postgresql/factories/noprocess.py b/pytest_postgresql/factories/noprocess.py
@@ -18,7 +18,7 @@
 """Fixture factory for existing postgresql server."""
 import os
 from pathlib import Path
-from typing import Callable, Iterator, List, Optional, Union
+from typing import Callable, Iterator
 
 import pytest
 from pytest import FixtureRequest
@@ -37,13 +37,13 @@ def xdistify_dbname(dbname: str) -> str:
 
 
 def postgresql_noproc(
-    host: Optional[str] = None,
-    port: Union[str, int, None] = None,
-    user: Optional[str] = None,
-    password: Optional[str] = None,
-    dbname: Optional[str] = None,
+    host: str | None = None,
+    port: str | int | None = None,
+    user: str | None = None,
+    password: str | None = None,
+    dbname: str | None = None,
     options: str = "",
-    load: Optional[List[Union[Callable, str, Path]]] = None,
+    load: list[Callable | str | Path] | None = None,
 ) -> Callable[[FixtureRequest], Iterator[NoopExecutor]]:
     """Postgresql noprocess factory.
 
diff --git a/pytest_postgresql/factories/process.py b/pytest_postgresql/factories/process.py
@@ -21,7 +21,7 @@
 import platform
 import subprocess
 from pathlib import Path
-from typing import Callable, Iterable, Iterator, List, Optional, Tuple, Union
+from typing import Callable, Iterable, Iterator
 
 import port_for
 import pytest
@@ -36,11 +36,11 @@
 PortType = port_for.PortType  # mypy requires explicit export
 
 
-def _pg_exe(executable: Optional[str], config: PostgresqlConfigDict) -> str:
+def _pg_exe(executable: str | None, config: PostgresqlConfigDict) -> str:
     """If executable is set, use it. Otherwise best effort to find the executable."""
     postgresql_ctl = executable or config["exec"]
-    # check if that executable exists, as it's no on system PATH
-    # only replace if executable isn't passed manually
+    # check if that executable exists, as it's no on systems' PATH
+    # only replace it if executable isn't passed manually
     if not os.path.exists(postgresql_ctl) and executable is None:
         try:
             pg_bindir = subprocess.check_output(
@@ -55,16 +55,16 @@ def _pg_exe(executable: Optional[str], config: PostgresqlConfigDict) -> str:
 
 
 def _pg_port(
-    port: Optional[PortType], config: PostgresqlConfigDict, excluded_ports: Iterable[int]
+    port: PortType | None, config: PostgresqlConfigDict, excluded_ports: Iterable[int]
 ) -> int:
     """User specified port, otherwise find an unused port from config."""
     pg_port = get_port(port, excluded_ports) or get_port(config["port"], excluded_ports)
     assert pg_port is not None
     return pg_port
 
 
-def _prepare_dir(tmpdir: Path, pg_port: PortType) -> Tuple[Path, Path]:
-    """Prepare directory for the executor."""
+def _prepare_dir(tmpdir: Path, pg_port: PortType) -> tuple[Path, Path]:
+    """Prepare a directory for the executor."""
     datadir = tmpdir / f"data-{pg_port}"
     datadir.mkdir()
     logfile_path = tmpdir / f"postgresql.{pg_port}.log"
@@ -76,17 +76,17 @@ def _prepare_dir(tmpdir: Path, pg_port: PortType) -> Tuple[Path, Path]:
 
 
 def postgresql_proc(
-    executable: Optional[str] = None,
-    host: Optional[str] = None,
-    port: Optional[PortType] = -1,
-    user: Optional[str] = None,
-    password: Optional[str] = None,
-    dbname: Optional[str] = None,
+    executable: str | None = None,
+    host: str | None = None,
+    port: PortType | None = -1,
+    user: str | None = None,
+    password: str | None = None,
+    dbname: str | None = None,
     options: str = "",
-    startparams: Optional[str] = None,
-    unixsocketdir: Optional[str] = None,
-    postgres_options: Optional[str] = None,
-    load: Optional[List[Union[Callable, str, Path]]] = None,
+    startparams: str | None = None,
+    unixsocketdir: str | None = None,
+    postgres_options: str | None = None,
+    load: list[Callable | str | Path] | None = None,
 ) -> Callable[[FixtureRequest, TempPathFactory], Iterator[PostgreSQLExecutor]]:
     """Postgresql process factory.
 
diff --git a/pytest_postgresql/janitor.py b/pytest_postgresql/janitor.py
diff --git a/pytest_postgresql/loader.py b/pytest_postgresql/loader.py
diff --git a/tests/test_config.py b/tests/test_config.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Dropped support for Python 3.9 as it has reached End of Life`