Merge pull request #1216 from dbfixtures/pre-commit-updates

Various pre-commit updates

Author: fizyk

.pre-commit-config.yaml

@@ -22,24 +22,24 @@ repos:
       - id: detect-private-key
       - id: debug-statements
 
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.9.0
-    hooks:
-      - id: black
-        entry: black --config pyproject.toml .
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.3
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix, --respect-gitignore, --show-fixes]
+      - id: ruff-format
 
   - repo: https://github.com/rstcheck/rstcheck
     rev: v6.2.5
     hooks:
       - id: rstcheck
         additional_dependencies: [sphinx, toml]
 
+  - repo: https://github.com/fizyk/pyproject-validator
+    rev: v0.1.0
+    hooks:
+    -   id: check-python-version-consistency
+
   - repo: local
     hooks:
       - id: pipenv

mypy.ini

@@ -0,0 +1,4 @@
+Updates to pre-commit
+
+Replaced black with ruff-format, Added https://github.com/fizyk/pyproject-validator,
+Moved mypy configuration into pyproject.toml, extended line length to 120 characters.

newsfragments/+a216cec3.misc.rst

@@ -63,13 +63,11 @@ testpaths = "tests"
 pytester_example_dir = "tests/examples"
 norecursedirs = "examples"
 
-[tool.black]
-line-length = 100
-target-version = ['py310']
-include = '.*\.pyi?$'
-
 [tool.ruff]
-line-length = 100
+line-length = 120
+target-version = 'py310'
+
+[tool.ruff.lint]
 select = [
   "E",   # pycodestyle
   "F",   # pyflakes
@@ -80,6 +78,27 @@ select = [
 [tool.rstcheck]
 report_level = "warning"
 
+[tool.mypy]
+allow_redefinition = "False"
+allow_untyped_globals = "False"
+check_untyped_defs = "True"
+disallow_incomplete_defs = "True"
+disallow_subclassing_any = "True"
+disallow_untyped_calls = "True"
+disallow_untyped_decorators = "True"
+disallow_untyped_defs = "True"
+follow_imports = "silent"
+ignore_missing_imports = "False"
+implicit_reexport = "False"
+no_implicit_optional = "True"
+pretty = "True"
+show_error_codes = "True"
+strict_equality = "True"
+warn_no_return = "True"
+warn_return_any = "True"
+warn_unreachable = "True"
+warn_unused_ignores = "True"
+
 [tool.towncrier]
 directory = "newsfragments"
 single_file=true

pyproject.toml

@@ -16,6 +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
 
 import psycopg

pytest_postgresql/executor_noop.py

@@ -16,6 +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
 
 import psycopg
@@ -50,9 +51,7 @@ def postgresql_factory(request: FixtureRequest) -> Iterator[Connection]:
         :param request: fixture request object
         :returns: postgresql client
         """
-        proc_fixture: PostgreSQLExecutor | NoopExecutor = request.getfixturevalue(
-            process_fixture_name
-        )
+        proc_fixture: PostgreSQLExecutor | NoopExecutor = request.getfixturevalue(process_fixture_name)
         config = get_config(request)
 
         pg_host = proc_fixture.host

pytest_postgresql/factories/client.py

@@ -16,6 +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 existing postgresql server."""
+
 import os
 from pathlib import Path
 from typing import Callable, Iterator

pytest_postgresql/factories/noprocess.py

@@ -43,20 +43,14 @@ def _pg_exe(executable: str | None, config: PostgresqlConfigDict) -> str:
     # 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(
-                ["pg_config", "--bindir"], universal_newlines=True
-            ).strip()
+            pg_bindir = subprocess.check_output(["pg_config", "--bindir"], universal_newlines=True).strip()
         except FileNotFoundError as ex:
-            raise ExecutableMissingException(
-                "Could not found pg_config executable. Is it in systenm $PATH?"
-            ) from ex
+            raise ExecutableMissingException("Could not found pg_config executable. Is it in systenm $PATH?") from ex
         postgresql_ctl = os.path.join(pg_bindir, "pg_ctl")
     return postgresql_ctl
 
 
-def _pg_port(
-    port: PortType | None, config: PostgresqlConfigDict, excluded_ports: Iterable[int]
-) -> int:
+def _pg_port(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

pytest_postgresql/factories/process.py

@@ -139,9 +139,7 @@ def connect() -> Connection:
                 port=self.port,
             )
 
-        conn = retry(
-            connect, timeout=self._connection_timeout, possible_exception=psycopg.OperationalError
-        )
+        conn = retry(connect, timeout=self._connection_timeout, possible_exception=psycopg.OperationalError)
         conn.isolation_level = self.isolation_level
         # We must not run a transaction since we create a database.
         conn.autocommit = True

pytest_postgresql/janitor.py

@@ -44,9 +44,7 @@
 
 def pytest_addoption(parser: Parser) -> None:
     """Configure options for pytest-postgresql."""
-    parser.addini(
-        name="postgresql_exec", help=_help_executable, default="/usr/lib/postgresql/13/bin/pg_ctl"
-    )
+    parser.addini(name="postgresql_exec", help=_help_executable, default="/usr/lib/postgresql/13/bin/pg_ctl")
 
     parser.addini(name="postgresql_host", help=_help_host, default="127.0.0.1")
 
@@ -97,13 +95,9 @@ def pytest_addoption(parser: Parser) -> None:
 
     parser.addoption("--postgresql-user", action="store", dest="postgresql_user", help=_help_user)
 
-    parser.addoption(
-        "--postgresql-password", action="store", dest="postgresql_password", help=_help_password
-    )
+    parser.addoption("--postgresql-password", action="store", dest="postgresql_password", help=_help_password)
 
-    parser.addoption(
-        "--postgresql-options", action="store", dest="postgresql_options", help=_help_options
-    )
+    parser.addoption("--postgresql-options", action="store", dest="postgresql_options", help=_help_options)
 
     parser.addoption(
         "--postgresql-startparams",
@@ -119,9 +113,7 @@ def pytest_addoption(parser: Parser) -> None:
         help=_help_unixsocketdir,
     )
 
-    parser.addoption(
-        "--postgresql-dbname", action="store", dest="postgresql_dbname", help=_help_dbname
-    )
+    parser.addoption("--postgresql-dbname", action="store", dest="postgresql_dbname", help=_help_dbname)
 
     parser.addoption("--postgresql-load", action="append", dest="postgresql_load", help=_help_load)