Merge branch 'main' into edit

tboy1337 · cursoragent · tboy1337 · commit b71a3c3b31e7 · 2026-02-17T04:48:56.000+07:00
Resolved conflict in .github/workflows/dockerised-postgres.yml by keeping the three-step workflow approach from edit branch and updating pipenv-setup action version to v4.2.1 to match main branch updates.

The resolution maintains consistency with other workflow files (oldest-postgres.yml and single-postgres.yml) which use the same pattern:
- pipenv-setup@v4.2.1 for environment setup
- pipenv-run@v4.1.1 for package installation and test execution

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -0,0 +1,28 @@
+language: en-GB
+reviews:
+  path_instructions:
+    - path: "newsfragments/*.rst"
+      instructions: |
+        Validate newsfragment files:
+        1. Read valid types from [tool.towncrier.fragment] in pyproject.toml
+        2. Filename must follow the pattern: [number].[type].rst OR +[hash].[type].rst where:
+           - [number] is an issue number or PR number
+           - [type] must be one of the types defined in towncrier configuration
+        3. Content must be a clear, concise description of the change
+        4. Content should be suitable for inclusion in CHANGES.rst
+        5. Verify the type matches the nature of the change based on towncrier type definitions
+        6. Some changes may require multiple types. Especially breaking changes
+        7. Flag any files with invalid types or malformed filenames
+        8. Check that the description is meaningful (not just "fix" or "update")
+
+  pre_merge_checks:
+    custom_checks:
+      - name: "Newsfragment Check"
+        mode: "warning"
+        instructions: |
+          Check if a newsfragment file has been added to the newsfragments/ directory.
+          Read the towncrier configuration from pyproject.toml to determine valid newsfragment types.
+          If no newsfragment is present, suggest which type should be added based on the PR changes.
+          Suggest the filename format: [issue_or_pr_number].[type].rst (or +[hash].[type].rst for orphan fragments)
+          Remind contributors to use: `pipenv run towncrier create [number].[type].rst` (or `pipenv run towncrier create +.[type]` for orphan fragments)
+          Skip the check if the PR only updates existing newsfragments or is a trivial change.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.2.1
+    uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.3.0
diff --git a/.github/workflows/diagram.yml b/.github/workflows/diagram.yml
@@ -17,8 +17,12 @@ jobs:
       - name: Install Mermaid CLI
         run: npm install -g @mermaid-js/mermaid-cli
 
-      - name: Render Diagram
-        run: mmdc -p docs/puppeteer-config.json -i docs/architecture.mmd -o docs/images/architecture.svg -t neutral
+      - name: Render Diagrams
+        run: |
+          for file in docs/*.mmd; do
+            base="$(basename "${file}" .mmd)"
+            mmdc -p docs/puppeteer-config.json -i "${file}" -o "docs/images/${base}.svg" -t neutral
+          done
 
       - name: Commit and Push
         uses: stefanzweifel/git-auto-commit-action@v7
diff --git a/.github/workflows/dockerised-postgres.yml b/.github/workflows/dockerised-postgres.yml
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Set up Pipenv on python ${{ matrix.python-version }}
-        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.2.1
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
diff --git a/.github/workflows/oldest-postgres.yml b/.github/workflows/oldest-postgres.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Set up Pipenv on python ${{ matrix.python-version }}
-        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.2.1
         with:
           python-version: ${{ matrix.python-version }}
           cache: false
@@ -55,19 +55,19 @@ jobs:
         if: ${{ contains(inputs.python-versions, 'pypy') }}
         run: sudo apt install libpq5
       - name: Install oldest supported versions
-        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
         with:
           command: pip install -r oldest/requirements.txt
       - name: Install package in editable mode
         uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
         with:
           command: pip install -e . --no-deps
       - name: Run tests without xdist
-        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
         with:
           command: pytest -c pyproject.oldest.toml -svv -p no:xdist --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml
       - name: Run xdist test
-        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
         with:
           command: pytest -n auto -c pyproject.oldest.toml --dist loadgroup --max-worker-restart 0 --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml:coverage-xdist.xml
       - uses: actions/upload-artifact@v6
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -6,4 +6,4 @@ on:
 
 jobs:
   pr-check:
-    uses: fizyk/actions-reuse/.github/workflows/shared-pr-check.yml@v4.1.1
+    uses: fizyk/actions-reuse/.github/workflows/shared-pr-check.yml@v4.3.0
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -9,4 +9,4 @@ on:
 
 jobs:
   pre-commit:
-    uses: fizyk/actions-reuse/.github/workflows/shared-pre-commit.yml@v4.2.1
+    uses: fizyk/actions-reuse/.github/workflows/shared-pre-commit.yml@v4.3.0
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -5,7 +5,7 @@ on:
       - v*
 jobs:
   build-n-publish:
-    uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.2.1
+    uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.3.0
     with:
       publish: true
     secrets:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   release:
-    uses: fizyk/actions-reuse/.github/workflows/shared-release.yml@v4.2.1
+    uses: fizyk/actions-reuse/.github/workflows/shared-release.yml@v4.3.0
     with:
       version: ${{ inputs.version }}
     secrets:
diff --git a/.github/workflows/single-postgres.yml b/.github/workflows/single-postgres.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Set up Pipenv on python ${{ matrix.python-version }}
-        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.2.1
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
@@ -98,11 +98,11 @@ jobs:
         if: ${{ contains(inputs.python-versions, 'pypy') && runner.os == 'Linux' }}
         run: sudo apt install libpq5
       - name: Run test
-        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
         with:
           command: pytest -svv -p no:xdist --postgresql-exec="${{ env.POSTGRESQL_EXEC }}" -k "not docker" --cov-report=xml --basetemp="${{ runner.temp }}"
       - name: Run xdist test
-        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.1.1
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
         with:
           command: pytest -n auto --dist loadgroup --max-worker-restart 0 --postgresql-exec="${{ env.POSTGRESQL_EXEC }}" -k "not docker" --cov-report=xml:coverage-xdist.xml --basetemp="${{ runner.temp }}"
       - uses: actions/upload-artifact@v6
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -25,7 +25,7 @@ repos:
       - id: debug-statements
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.14
+    rev: v0.15.0
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix, --respect-gitignore, --show-fixes]
diff --git a/Pipfile b/Pipfile
@@ -6,7 +6,7 @@ name = "pypi"
 [packages]
 pytest = "==9.0.2"
 port-for = "==1.0.0"
-mirakuru = "==3.0.1"
+mirakuru = "==3.0.2"
 packaging = "==26.0"
 psycopg = "==3.3.2"
 
@@ -17,5 +17,5 @@ pytest-cov = "==7.0.0"
 pytest-xdist = "==3.8.0"
 mock = "==5.2.0"
 mypy = {version = "==1.19.1", markers="implementation_name == 'cpython'"}
-types-setuptools = "==80.10.0.20260124"
+types-setuptools = "==82.0.0.20260210"
 tbump = "==6.11.0"
diff --git a/docs/architecture.mmd b/docs/architecture.mmd
@@ -1,14 +1,14 @@
 sequenceDiagram
     autonumber
     participant Pytest as Pytest runner
-    participant ProcFactory as postgresql_proc_factory
-    participant PgServer as PostgreSQL process
+    participant BaseProc as base_proc fixture (postgresql_proc_factory)
+    participant PgServer as PostgreSQL server
     participant TemplateDB as Template DB (seeded)
     participant TestDB as Per-test DB (clone)
 
-    Pytest->>ProcFactory: request postgresql_proc with load=[load_database]
-    ProcFactory->>PgServer: start server
-    ProcFactory->>TemplateDB: invoke load_database (create metadata, seed data)
+    Pytest->>BaseProc: request base_proc with load=[load_database]
+    BaseProc->>PgServer: start server
+    BaseProc->>TemplateDB: invoke load_database (create metadata, seed data)
     Note right of TemplateDB: Template is created and seeded once per full run
     loop per test
         Pytest->>PgServer: request clone of TemplateDB
diff --git a/docs/architecture_chaining.mmd b/docs/architecture_chaining.mmd
@@ -1,22 +1,25 @@
 sequenceDiagram
-        participant Test as Test
-        participant ProcF as base_proc Fixture
-        participant NoProc1 as seeded_noproc Fixture
-        participant NoProc2 as more_seeded_noproc Fixture
-        participant DB as PostgreSQL DB
+    participant Pytest as Pytest runner
+    participant BaseProc as base_proc fixture (postgresql_proc_factory)
+    participant NoProc1 as seeded_noproc fixture
+    participant NoProc2 as more_seeded_noproc fixture
+    participant PgServer as PostgreSQL server
+    participant TemplateDB as Template DB (seeded)
+    participant LayeredDB as Layered DB (seeded)
 
-        Test->>ProcF: request base_proc
-        ProcF->>DB: init database & run load_schema
-        ProcF-->>Test: return PostgreSQLExecutor
+    Pytest->>BaseProc: request base_proc
+    BaseProc->>PgServer: start server
+    BaseProc->>TemplateDB: init database & run load_schema
+    BaseProc-->>Pytest: return PostgreSQLExecutor
 
-        Test->>NoProc1: request seeded_noproc (depends_on=base_proc)
-        NoProc1->>ProcF: read connection/template info
-        NoProc1->>DB: create layered DB / run load_data
-        NoProc1-->>Test: return NoopExecutor
+    Pytest->>NoProc1: request seeded_noproc (depends_on=base_proc)
+    NoProc1->>BaseProc: read connection/template info
+    NoProc1->>LayeredDB: create layered DB / run load_data
+    NoProc1-->>Pytest: return NoopExecutor
 
-        Test->>NoProc2: request more_seeded_noproc (depends_on=seeded_noproc)
-        NoProc2->>NoProc1: read connection/template info
-        NoProc2->>DB: run load_more_data on layered DB
-        NoProc2-->>Test: return NoopExecutor
+    Pytest->>NoProc2: request more_seeded_noproc (depends_on=seeded_noproc)
+    NoProc2->>NoProc1: read connection/template info
+    NoProc2->>LayeredDB: run load_more_data on layered DB
+    NoProc2-->>Pytest: return NoopExecutor
 
-        Test->>Test: validate tables and data across layers
+    Pytest->>Pytest: validate tables and data across layers
diff --git a/docs/images/architecture.svg b/docs/images/architecture.svg
diff --git a/docs/images/architecture_chaining.svg b/docs/images/architecture_chaining.svg
diff --git a/newsfragments/+4593101b.misc.rst b/newsfragments/+4593101b.misc.rst
@@ -0,0 +1 @@
+Add coderabbitai configuration with instructions to keep an eye for newsfragments.
diff --git a/newsfragments/+56cec843.docs.rst b/newsfragments/+56cec843.docs.rst
@@ -0,0 +1 @@
+Make sure diagrams are using unified terminology.
diff --git a/newsfragments/+ba8eaaf7.misc.rst b/newsfragments/+ba8eaaf7.misc.rst
@@ -0,0 +1 @@
+Fixes for diagram workflow.
diff --git a/newsfragments/1267.misc.rst b/newsfragments/1267.misc.rst
@@ -0,0 +1 @@
+Fix typos
diff --git a/pytest_postgresql/executor.py b/pytest_postgresql/executor.py
@@ -231,7 +231,7 @@ def version(self) -> Any:
             version_string = subprocess.check_output([self.executable, "--version"]).decode("utf-8")
         except FileNotFoundError as ex:
             raise ExecutableMissingException(
-                f"Could not found {self.executable}. Is PostgreSQL server installed? "
+                f"Could not find {self.executable}. Is PostgreSQL server installed? "
                 f"Alternatively pg_config installed might be from different "
                 f"version that postgresql-server."
             ) from ex
diff --git a/pytest_postgresql/factories/process.py b/pytest_postgresql/factories/process.py
@@ -45,7 +45,7 @@ def _pg_exe(executable: str | None, config: PostgreSQLConfig) -> str:
         try:
             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 find pg_config executable. Is it in system $PATH?") from ex
         postgresql_ctl = os.path.join(pg_bindir, "pg_ctl")
     return postgresql_ctl
 
