Skip to content

Commit a3d8a7e

Browse files
tboy1337tboy1337
authored
Merge branch 'main' into editable-package
2 parents 0e44282 + d0b5866 commit a3d8a7e

10 files changed

Lines changed: 54 additions & 24 deletions

File tree

‎.coderabbit.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ reviews:
44
- path: "newsfragments/*.rst"
55
instructions: |
66
Validate newsfragment files:
7-
1. Read valid types from [tool.towncrier.fragment] in pyproject.toml
8-
2. Filename must follow the pattern: [number].[type].rst OR +[hash].[type].rst where:
9-
- [number] is an issue number or PR number
10-
- [type] must be one of the types defined in towncrier configuration
11-
3. Content must be a clear, concise description of the change
12-
4. Content should be suitable for inclusion in CHANGES.rst
13-
5. Verify the type matches the nature of the change based on towncrier type definitions
14-
6. Some changes may require multiple types. Especially breaking changes
15-
7. Flag any files with invalid types or malformed filenames
16-
8. Check that the description is meaningful (not just "fix" or "update")
7+
1. Read valid types from [tool.towncrier.type] in pyproject.toml.
8+
2. Filename must follow one of these patterns:
9+
- `[issue_number].[type].rst` — use this when a dedicated **issue** exists in the issue tracker.
10+
- `+[hash].[type].rst` — use this (orphan format) when there is NO dedicated issue. A PR alone (without a backing issue) does NOT require the numbered format; orphan is acceptable.
11+
Do NOT flag orphan fragments as incorrect when only a PR exists but no issue does.
12+
3. Content must be a clear, concise description of the change (not just "fix" or "update").
13+
4. Content should be suitable for inclusion in CHANGES.rst.
14+
5. Verify the type matches the nature of the change based on towncrier type definitions.
15+
6. Some changes may require multiple types, especially breaking changes.
1716
1817
pre_merge_checks:
1918
custom_checks:

‎.coveragerc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
[run]
2-
source = pytest_postgresql
2+
include =
3+
*/pytest_postgresql/*
4+
*/tests/*

‎.github/workflows/automerge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
automerge:
16-
uses: fizyk/actions-reuse/.github/workflows/shared-automerge.yml@v4.4.0
16+
uses: fizyk/actions-reuse/.github/workflows/shared-automerge.yml@v4.4.3
1717
secrets:
1818
app_id: ${{ secrets.MERGE_APP_ID }}
1919
private_key: ${{ secrets.MERGE_APP_PRIVATE_KEY }}

‎.github/workflows/oldest-postgres.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v6
3838
- name: Set up Pipenv on python ${{ matrix.python-version }}
39-
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.0
39+
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.3
4040
with:
4141
python-version: ${{ matrix.python-version }}
4242
cache: false
@@ -55,18 +55,18 @@ jobs:
5555
if: ${{ contains(inputs.python-versions, 'pypy') }}
5656
run: sudo apt install libpq5
5757
- name: Install oldest supported versions
58-
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
58+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.3
5959
with:
6060
command: pip install -r oldest/requirements.txt
6161
- name: Run tests without xdist
62-
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
62+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.3
6363
with:
6464
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
6565
- name: Run xdist test
66-
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
66+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.3
6767
with:
6868
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
69-
- uses: actions/upload-artifact@v6
69+
- uses: actions/upload-artifact@v7
7070
if: failure()
7171
with:
7272
name: postgresql-${{ matrix.python-version }}-${{ inputs.postgresql }}

‎.github/workflows/pr-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ on:
66

77
jobs:
88
pr-check:
9-
uses: fizyk/actions-reuse/.github/workflows/shared-pr-check.yml@v4.3.0
9+
uses: fizyk/actions-reuse/.github/workflows/shared-pr-check.yml@v4.4.3

‎.github/workflows/pre-commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ on:
99

1010
jobs:
1111
pre-commit:
12-
uses: fizyk/actions-reuse/.github/workflows/shared-pre-commit.yml@v4.3.0
12+
uses: fizyk/actions-reuse/.github/workflows/shared-pre-commit.yml@v4.4.3

‎.github/workflows/single-postgres.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v6
3838
- name: Set up Pipenv on python ${{ matrix.python-version }}
39-
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.0
39+
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.3
4040
with:
4141
python-version: ${{ matrix.python-version }}
4242
allow-prereleases: true
@@ -54,14 +54,14 @@ jobs:
5454
if: ${{ contains(inputs.python-versions, 'pypy') }}
5555
run: sudo apt install libpq5
5656
- name: Run test
57-
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
57+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.3
5858
with:
5959
command: pytest -svv -p no:xdist --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml
6060
- name: Run xdist test
61-
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
61+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.3
6262
with:
6363
command: pytest -n auto --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
64-
- uses: actions/upload-artifact@v6
64+
- uses: actions/upload-artifact@v7
6565
if: failure()
6666
with:
6767
name: postgresql-${{ matrix.python-version }}-${{ inputs.postgresql }}

‎.github/workflows/tests.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,80 +11,108 @@ jobs:
1111
uses: ./.github/workflows/single-postgres.yml
1212
with:
1313
postgresql: 18
14+
secrets:
15+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
1416
postgresql_oldest:
1517
needs: [postgresql_18]
1618
uses: ./.github/workflows/oldest-postgres.yml
19+
secrets:
20+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
1721
postgresql_17:
1822
needs: [postgresql_18]
1923
uses: ./.github/workflows/single-postgres.yml
2024
with:
2125
postgresql: 17
2226
python-versions: '["3.11", "3.12", "3.13", "3.14", "pypy-3.11"]'
27+
secrets:
28+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
2329
postgresql_16:
2430
needs: [postgresql_17]
2531
uses: ./.github/workflows/single-postgres.yml
2632
with:
2733
postgresql: 16
2834
python-versions: '["3.12", "3.13", "3.14"]'
35+
secrets:
36+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
2937
postgresql_15:
3038
needs: [postgresql_16]
3139
uses: ./.github/workflows/single-postgres.yml
3240
with:
3341
postgresql: 15
3442
python-versions: '["3.14"]'
43+
secrets:
44+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
3545
postgresql_14:
3646
needs: [postgresql_15]
3747
uses: ./.github/workflows/single-postgres.yml
3848
with:
3949
postgresql: 14
4050
python-versions: '["3.14"]'
51+
secrets:
52+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
4153
macos_postgres_18:
4254
needs: [postgresql_18]
4355
uses: ./.github/workflows/single-postgres.yml
4456
with:
4557
postgresql: 18
4658
os: macos-latest
4759
python-versions: '["3.12", "3.13", "3.14"]'
60+
secrets:
61+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
4862
macos_postgres_17:
4963
needs: [postgresql_17, macos_postgres_18]
5064
uses: ./.github/workflows/single-postgres.yml
5165
with:
5266
postgresql: 17
5367
os: macos-latest
5468
python-versions: '["3.12", "3.13", "3.14"]'
69+
secrets:
70+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
5571
macos_postgres_16:
5672
needs: [postgresql_16, macos_postgres_17]
5773
uses: ./.github/workflows/single-postgres.yml
5874
with:
5975
postgresql: 16
6076
os: macos-latest
6177
python-versions: '["3.13", "3.14"]'
78+
secrets:
79+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
6280
docker_postgresql_18:
6381
needs: [postgresql_18]
6482
uses: ./.github/workflows/dockerised-postgres.yml
6583
with:
6684
postgresql: 18
85+
secrets:
86+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
6787
docker_postgresql_17:
6888
needs: [postgresql_17, docker_postgresql_18]
6989
uses: ./.github/workflows/dockerised-postgres.yml
7090
with:
7191
postgresql: 17
7292
python-versions: '["3.11", "3.12", "3.13", "3.14"]'
93+
secrets:
94+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
7395
docker_postgresql_16:
7496
needs: [postgresql_16, docker_postgresql_18]
7597
uses: ./.github/workflows/dockerised-postgres.yml
7698
with:
7799
postgresql: 16
78100
python-versions: '["3.12", "3.13", "3.14"]'
101+
secrets:
102+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
79103
docker_postgresql_15:
80104
needs: [postgresql_15, docker_postgresql_16]
81105
uses: ./.github/workflows/dockerised-postgres.yml
82106
with:
83107
postgresql: 15
84108
python-versions: '["3.13", "3.14"]'
109+
secrets:
110+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
85111
docker_postgresql_14:
86112
needs: [postgresql_14, docker_postgresql_15]
87113
uses: ./.github/workflows/dockerised-postgres.yml
88114
with:
89115
postgresql: 14
90116
python-versions: '["3.14"]'
117+
secrets:
118+
codecov_token: ${{ secrets.CODECOV_TOKEN }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
- id: debug-statements
2626

2727
- repo: https://github.com/astral-sh/ruff-pre-commit
28-
rev: v0.15.2
28+
rev: v0.15.6
2929
hooks:
3030
- id: ruff-check
3131
args: [--fix, --exit-non-zero-on-fix, --respect-gitignore, --show-fixes]

‎newsfragments/+e9a4c914.misc.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix codecov pipeline configuration.

0 commit comments

Comments
 (0)