Bump black from 23.11.0 to 23.12.0

Pipfile

@@ -14,7 +14,7 @@ towncrier = "==23.11.0"
 pytest-cov = "==4.1.0"
 pytest-xdist = "==3.5.0"
 mock = "==5.1.0"
-black = "==23.11.0"
+black = "==23.12.0"
 mypy = "==1.7.1"
 types-setuptools = "==69.0.0.0"
 tbump = "==6.11.0"

newsfragments/858.misc.rst

@@ -0,0 +1 @@
+Replace usage of `pkg_resources.parse_version` with `packaging.version.parse`

pytest_postgresql/executor.py

@@ -28,7 +28,7 @@
 
 from mirakuru import TCPExecutor
 from mirakuru.exceptions import ProcessFinishedWithError
-from pkg_resources import parse_version
+from packaging.version import parse
 
 from pytest_postgresql.exceptions import ExecutableMissingException, PostgreSQLUnsupported
 
@@ -57,7 +57,7 @@ class PostgreSQLExecutor(TCPExecutor):
     )
 
     VERSION_RE = re.compile(r".* (?P<version>\d+(?:\.\d+)?)")
-    MIN_SUPPORTED_VERSION = parse_version("10")
+    MIN_SUPPORTED_VERSION = parse("10")
 
     def __init__(
         self,
@@ -203,7 +203,7 @@ def version(self) -> Any:
             ) from ex
         matches = self.VERSION_RE.search(version_string)
         assert matches is not None
-        return parse_version(matches.groupdict()["version"])
+        return parse(matches.groupdict()["version"])
 
     def running(self) -> bool:
         """Check if server is running."""

pytest_postgresql/executor_noop.py

@@ -19,7 +19,7 @@
 from typing import Any, Optional, Union
 
 import psycopg
-from pkg_resources import parse_version
+from packaging.version import parse
 
 
 class NoopExecutor:
@@ -84,5 +84,5 @@ def version(self) -> Any:
                     if not int(part):
                         continue
                     version_parts.append(part)
-                self._version = parse_version(".".join(version_parts[:2]))
+                self._version = parse(".".join(version_parts[:2]))
         return self._version

pytest_postgresql/janitor.py

@@ -6,13 +6,13 @@
 from typing import Callable, Iterator, Optional, Type, TypeVar, Union
 
 import psycopg
-from pkg_resources import parse_version
+from packaging.version import parse
 from psycopg import Connection, Cursor
 
 from pytest_postgresql.retry import retry
 from pytest_postgresql.sql import loader
 
-Version = type(parse_version("1"))
+Version = type(parse("1"))
 
 
 DatabaseJanitorType = TypeVar("DatabaseJanitorType", bound="DatabaseJanitor")
@@ -53,7 +53,7 @@ def __init__(
         self._connection_timeout = connection_timeout
         self.isolation_level = isolation_level
         if not isinstance(version, Version):
-            self.version = parse_version(str(version))
+            self.version = parse(str(version))
         else:
             self.version = version
 

tests/test_executor.py

@@ -4,7 +4,7 @@
 
 import psycopg
 import pytest
-from pkg_resources import parse_version
+from packaging.version import parse
 from port_for import get_port
 from psycopg import Connection
 from pytest import FixtureRequest
@@ -22,7 +22,7 @@ class PatchedPostgreSQLExecutor(PostgreSQLExecutor):
     @property
     def version(self) -> Any:
         """Overwrite version, to always return highest unsupported version."""
-        return parse_version("8.9")
+        return parse("8.9")
 
 
 def test_unsupported_version(request: FixtureRequest) -> None:

tests/test_janitor.py

@@ -4,11 +4,11 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from pkg_resources import parse_version
+from packaging.version import parse
 
 from pytest_postgresql.janitor import DatabaseJanitor
 
-VERSION = parse_version("10")
+VERSION = parse("10")
 
 
 @pytest.mark.parametrize("version", (VERSION, 10, "10"))