pytest-postgresql 7.0.0__tar.gz → 7.0.2__tar.gz

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/CHANGES.rst

@@ -3,6 +3,38 @@ CHANGELOG
 
 .. towncrier release notes start
 
+7.0.2 (2025-05-17)
+==================
+
+Bugfixes
+--------
+
+- Fix an issue where number of search counts has been hard-default set to 5 by command-line default and ini setting could not override it. (`#1115 <https://github.com/dbfixtures/pytest-postgresql/issues/1115>`__)
+- Update minimum required pytest version to 7.2
+
+  Additionally added test run of `pytest-postgresql` against oldest supported versions. (`#1131 <https://github.com/dbfixtures/pytest-postgresql/issues/1131>`__)
+
+
+Miscellaneus
+------------
+
+- Different approach to oldest requirements file. Trying to get dependabot off of it.
+- Test pipeline optimisations
+
+
+7.0.1 (2025-03-19)
+==================
+
+Bugfixes
+--------
+
+- Close postgresql connection after loading sql files.
+
+  Fixes possible `ResourceWarning`
+- Fixed an issue, where defining load paths in ini/toml configuration would fail
+  due to pytest's LocalPath not having an endswith method.
+
+
 7.0.0 (2025-02-23)
 ==================
 

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pytest-postgresql
-Version: 7.0.0
+Version: 7.0.2
 Summary: Postgresql fixtures and fixture factories for Pytest.
 Author-email: Grzegorz Śliwiński <fizyk+pypi@fizyk.dev>
 Project-URL: Source, https://github.com/dbfixtures/pytest-postgresql
 Project-URL: Bug Tracker, https://github.com/dbfixtures/pytest-postgresql/issues
-Project-URL: Changelog, https://github.com/dbfixtures/pytest-postgresql/blob/v7.0.0/CHANGES.rst
+Project-URL: Changelog, https://github.com/dbfixtures/pytest-postgresql/blob/v7.0.2/CHANGES.rst
 Keywords: tests,pytest,fixture,postgresql
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -29,11 +29,12 @@ Description-Content-Type: text/x-rst
 License-File: COPYING
 License-File: COPYING.lesser
 License-File: AUTHORS.rst
-Requires-Dist: pytest>=6.2
+Requires-Dist: pytest>=7.2
 Requires-Dist: port-for>=0.7.3
 Requires-Dist: mirakuru>=2.6.0
 Requires-Dist: packaging
 Requires-Dist: psycopg>=3.0.0
+Dynamic: license-file
 
 .. image:: https://raw.githubusercontent.com/dbfixtures/pytest-postgresql/master/logo.png
     :width: 100px

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pytest-postgresql"
-version = "7.0.0"
+version = "7.0.2"
 description = "Postgresql fixtures and fixture factories for Pytest."
 readme = "README.rst"
 keywords = ["tests", "pytest", "fixture", "postgresql"]
@@ -28,7 +28,7 @@ classifiers = [
     "Framework :: Pytest",
 ]
 dependencies = [
-    "pytest >= 6.2",
+    "pytest >= 7.2",
     "port-for >= 0.7.3",
     "mirakuru >= 2.6.0",
     "packaging",
@@ -39,7 +39,7 @@ requires-python = ">= 3.9"
 [project.urls]
 "Source" = "https://github.com/dbfixtures/pytest-postgresql"
 "Bug Tracker" = "https://github.com/dbfixtures/pytest-postgresql/issues"
-"Changelog" = "https://github.com/dbfixtures/pytest-postgresql/blob/v7.0.0/CHANGES.rst"
+"Changelog" = "https://github.com/dbfixtures/pytest-postgresql/blob/v7.0.2/CHANGES.rst"
 
 [project.entry-points."pytest11"]
 pytest_postgresql = "pytest_postgresql.plugin"
@@ -107,7 +107,7 @@ name = "Miscellaneus"
 showcontent = false
 
 [tool.tbump.version]
-current = "7.0.0"
+current = "7.0.2"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql/__init__.py

@@ -18,4 +18,4 @@
 # along with pytest-postgresql. If not, see <http://www.gnu.org/licenses/>.
 """Main module for pytest-postgresql."""
 
-__version__ = "7.0.0"
+__version__ = "7.0.2"

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql/config.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 from typing import Any, List, Optional, TypedDict, Union
 
+from _pytest._py.path import LocalPath
 from pytest import FixtureRequest
 
 
@@ -37,7 +38,8 @@ def get_config(request: FixtureRequest) -> PostgresqlConfigDict:
         exec=get_postgresql_option("exec"),
         host=get_postgresql_option("host"),
         port=get_postgresql_option("port"),
-        port_search_count=get_postgresql_option("port_search_count"),
+        # Parse as int, because if it's defined in an INI file then it'll always be a string
+        port_search_count=int(get_postgresql_option("port_search_count")),
         user=get_postgresql_option("user"),
         password=get_postgresql_option("password"),
         options=get_postgresql_option("options"),
@@ -50,10 +52,12 @@ def get_config(request: FixtureRequest) -> PostgresqlConfigDict:
     )
 
 
-def detect_paths(load_paths: List[str]) -> List[Union[Path, str]]:
+def detect_paths(load_paths: List[Union[LocalPath, str]]) -> List[Union[Path, str]]:
     """Convert path to sql files to Path instances."""
     converted_load_paths: List[Union[Path, str]] = []
     for path in load_paths:
+        if isinstance(path, LocalPath):
+            path = str(path)
         if path.endswith(".sql"):
             converted_load_paths.append(Path(path))
         else:

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql/loader.py

@@ -25,8 +25,8 @@ def build_loader(load: Union[Callable, str, Path]) -> Callable:
 
 def sql(sql_filename: Path, **kwargs: Any) -> None:
     """Database loader for sql files."""
-    db_connection = psycopg.connect(**kwargs)
-    with open(sql_filename, "r") as _fd:
-        with db_connection.cursor() as cur:
-            cur.execute(_fd.read())
-    db_connection.commit()
+    with psycopg.connect(**kwargs) as db_connection:
+        with open(sql_filename, "r") as _fd:
+            with db_connection.cursor() as cur:
+                cur.execute(_fd.read())
+        db_connection.commit()

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql/plugin.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/>.
 """Plugin module of pytest-postgresql."""
+
 from tempfile import gettempdir
 
 from _pytest.config.argparsing import Parser
@@ -92,7 +93,6 @@ def pytest_addoption(parser: Parser) -> None:
         action="store",
         dest="postgresql_port_search_count",
         help=_help_port_search_count,
-        default=5,
     )
 
     parser.addoption("--postgresql-user", action="store", dest="postgresql_user", help=_help_user)

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pytest-postgresql
-Version: 7.0.0
+Version: 7.0.2
 Summary: Postgresql fixtures and fixture factories for Pytest.
 Author-email: Grzegorz Śliwiński <fizyk+pypi@fizyk.dev>
 Project-URL: Source, https://github.com/dbfixtures/pytest-postgresql
 Project-URL: Bug Tracker, https://github.com/dbfixtures/pytest-postgresql/issues
-Project-URL: Changelog, https://github.com/dbfixtures/pytest-postgresql/blob/v7.0.0/CHANGES.rst
+Project-URL: Changelog, https://github.com/dbfixtures/pytest-postgresql/blob/v7.0.2/CHANGES.rst
 Keywords: tests,pytest,fixture,postgresql
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -29,11 +29,12 @@ Description-Content-Type: text/x-rst
 License-File: COPYING
 License-File: COPYING.lesser
 License-File: AUTHORS.rst
-Requires-Dist: pytest>=6.2
+Requires-Dist: pytest>=7.2
 Requires-Dist: port-for>=0.7.3
 Requires-Dist: mirakuru>=2.6.0
 Requires-Dist: packaging
 Requires-Dist: psycopg>=3.0.0
+Dynamic: license-file
 
 .. image:: https://raw.githubusercontent.com/dbfixtures/pytest-postgresql/master/logo.png
     :width: 100px

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ pytest_postgresql/factories/__init__.py
 pytest_postgresql/factories/client.py
 pytest_postgresql/factories/noprocess.py
 pytest_postgresql/factories/process.py
+tests/test_config.py
 tests/test_executor.py
 tests/test_janitor.py
 tests/test_loader.py

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/pytest_postgresql.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pytest>=6.2
+pytest>=7.2
 port-for>=0.7.3
 mirakuru>=2.6.0
 packaging

pytest_postgresql-7.0.2/tests/test_config.py

@@ -0,0 +1,22 @@
+"""Config tests."""
+
+from pathlib import Path
+from typing import Union
+
+import pytest
+from _pytest._py.path import LocalPath
+
+from pytest_postgresql.config import detect_paths
+
+
+@pytest.mark.parametrize(
+    "path, want",
+    (
+        ("test.sql", Path("test.sql")),
+        ("load.function", "load.function"),
+        (LocalPath("test.sql"), Path("test.sql").absolute()),  # type: ignore[no-untyped-call]
+    ),
+)
+def test_detect_paths(path: Union[str, LocalPath], want: Union[Path, str]) -> None:
+    """Check the correctness of detect_paths function."""
+    assert detect_paths([path]) == [want]

{pytest_postgresql-7.0.0 → pytest_postgresql-7.0.2}/tests/test_postgres_options_plugin.py

@@ -48,6 +48,32 @@ def test_postgres_loader_in_cli(pointed_pytester: Pytester) -> None:
     ret.assert_outcomes(passed=1)
 
 
+def test_postgres_loader_in_ini(pointed_pytester: Pytester) -> None:
+    """Check that pytest.ini arguments are honored for load."""
+    pointed_pytester.copy_example("test_load.py")
+    test_sql_path = pointed_pytester.copy_example("test.sql")
+    pointed_pytester.makefile(".ini", pytest=f"[pytest]\npostgresql_load = {test_sql_path}\n")
+    ret = pointed_pytester.runpytest("test_load.py")
+    ret.assert_outcomes(passed=1)
+
+
+def test_postgres_port_search_count_in_cli_is_int(pointed_pytester: Pytester) -> None:
+    """Check that the --postgresql-port-search-count command line argument is parsed as an int."""
+    pointed_pytester.copy_example("test_assert_port_search_count_is_ten.py")
+    ret = pointed_pytester.runpytest(
+        "--postgresql-port-search-count", "10", "test_assert_port_search_count_is_ten.py"
+    )
+    ret.assert_outcomes(passed=1)
+
+
+def test_postgres_port_search_count_in_ini_is_int(pointed_pytester: Pytester) -> None:
+    """Check that pytest.ini arguments are honored for load."""
+    pointed_pytester.copy_example("test_assert_port_search_count_is_ten.py")
+    pointed_pytester.makefile(".ini", pytest="[pytest]\npostgresql_port_search_count = 10\n")
+    ret = pointed_pytester.runpytest("test_assert_port_search_count_is_ten.py")
+    ret.assert_outcomes(passed=1)
+
+
 postgresql_proc_to_override = postgresql_proc()