Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/dockerised-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,15 @@ jobs:

steps:
- uses: actions/checkout@v6
- name: Run test noproc fixture on docker
uses: fizyk/actions-reuse/.github/actions/pipenv@v4.4.4
- name: Set up Pipenv on python ${{ matrix.python-version }}
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.4
with:
python-version: ${{ matrix.python-version }}
command: pytest -n 0 --max-worker-restart 0 -k docker --postgresql-host=localhost --postgresql-port 5433 --postgresql-password=postgres --cov-report=xml:coverage-docker.xml
allow-prereleases: true
- name: Run test noproc fixture on docker
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
with:
command: pytest -n 0 --max-worker-restart 0 -k docker --postgresql-host=localhost --postgresql-port 5433 --postgresql-password=postgres --cov-report=xml:coverage-docker.xml
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v6.0.0
with:
Expand Down
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ port-for = "==1.0.0"
mirakuru = "==3.0.2"
packaging = "==26.0"
psycopg = "==3.3.3"
pytest-postgresql = {path = ".", editable = true}

[dev-packages]
towncrier = "==25.8.0"
Expand Down
1 change: 1 addition & 0 deletions newsfragments/+pipfile-editable.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``pytest-postgresql`` as an editable self-install in the Pipfile; remove the manual ``from pytest_postgresql.plugin import *`` import from ``tests/conftest.py`` and the ``makeconftest`` call in ``tests/test_postgres_options_plugin.py`` that re-registered the plugin and caused duplicate-plugin errors under editable install.
1 change: 0 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from pathlib import Path

from pytest_postgresql import factories
from pytest_postgresql.plugin import * # noqa: F403,F401

pytest_plugins = ["pytester"]
POSTGRESQL_VERSION = os.environ.get("POSTGRES", "13")
Expand Down
1 change: 0 additions & 1 deletion tests/test_postgres_options_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def pointed_pytester(pytester: Pytester) -> Pytester:
pytest_postgresql_path = Path(pytest_postgresql.__file__)
root_path = pytest_postgresql_path.parent.parent
pytester.syspathinsert(root_path)
pytester.makeconftest("from pytest_postgresql.plugin import *\n")
return pytester


Expand Down
Loading