Skip to content

Commit d5aec7a

Browse files
fizykfizyk
committed
Merge branch 'main' into edit
2 parents 403d31b + 820fa69 commit d5aec7a

11 files changed

Lines changed: 62 additions & 21 deletions

File tree

‎.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.2.1
16+
uses: fizyk/actions-reuse/.github/workflows/shared-automerge.yml@v4.4.0
1717
secrets:
1818
app_id: ${{ secrets.MERGE_APP_ID }}
1919
private_key: ${{ secrets.MERGE_APP_PRIVATE_KEY }}

‎.github/workflows/build.yml‎

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

99
jobs:
1010
build:
11-
uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.3.0
11+
uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.4.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
6868
with:
6969
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
70-
- uses: actions/upload-artifact@v6
70+
- uses: actions/upload-artifact@v7
7171
if: failure()
7272
with:
7373
name: postgresql-${{ matrix.python-version }}-${{ inputs.postgresql }}

‎.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.1

‎.github/workflows/pypi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- v*
66
jobs:
77
build-n-publish:
8-
uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.3.0
8+
uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.4.0
99
with:
1010
publish: true
1111
secrets:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
103103
with:
104104
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 }}/pytest-basetemp"
105-
- uses: actions/upload-artifact@v6
105+
- uses: actions/upload-artifact@v7
106106
if: failure()
107107
with:
108108
name: postgresql-${{ matrix.python-version }}-${{ inputs.postgresql }}

‎.github/workflows/tests.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,101 +11,135 @@ 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
windows_postgres_18:
6381
needs: [postgresql_18]
6482
uses: ./.github/workflows/single-postgres.yml
6583
with:
6684
postgresql: 18
6785
os: windows-latest
6886
python-versions: '["3.12", "3.13", "3.14"]'
87+
secrets:
88+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
6989
windows_postgres_17:
7090
needs: [postgresql_17, windows_postgres_18]
7191
uses: ./.github/workflows/single-postgres.yml
7292
with:
7393
postgresql: 17
7494
os: windows-latest
7595
python-versions: '["3.12", "3.13", "3.14"]'
96+
secrets:
97+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
7698
windows_postgres_16:
7799
needs: [postgresql_16, windows_postgres_17]
78100
uses: ./.github/workflows/single-postgres.yml
79101
with:
80102
postgresql: 16
81103
os: windows-latest
82104
python-versions: '["3.13", "3.14"]'
105+
secrets:
106+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
83107
docker_postgresql_18:
84108
needs: [postgresql_18]
85109
uses: ./.github/workflows/dockerised-postgres.yml
86110
with:
87111
postgresql: 18
112+
secrets:
113+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
88114
docker_postgresql_17:
89115
needs: [postgresql_17, docker_postgresql_18]
90116
uses: ./.github/workflows/dockerised-postgres.yml
91117
with:
92118
postgresql: 17
93119
python-versions: '["3.11", "3.12", "3.13", "3.14"]'
120+
secrets:
121+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
94122
docker_postgresql_16:
95123
needs: [postgresql_16, docker_postgresql_18]
96124
uses: ./.github/workflows/dockerised-postgres.yml
97125
with:
98126
postgresql: 16
99127
python-versions: '["3.12", "3.13", "3.14"]'
128+
secrets:
129+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
100130
docker_postgresql_15:
101131
needs: [postgresql_15, docker_postgresql_16]
102132
uses: ./.github/workflows/dockerised-postgres.yml
103133
with:
104134
postgresql: 15
105135
python-versions: '["3.13", "3.14"]'
136+
secrets:
137+
codecov_token: ${{ secrets.CODECOV_TOKEN }}
106138
docker_postgresql_14:
107139
needs: [postgresql_14, docker_postgresql_15]
108140
uses: ./.github/workflows/dockerised-postgres.yml
109141
with:
110142
postgresql: 14
111143
python-versions: '["3.14"]'
144+
secrets:
145+
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.0
28+
rev: v0.15.2
2929
hooks:
3030
- id: ruff-check
3131
args: [--fix, --exit-non-zero-on-fix, --respect-gitignore, --show-fixes]

‎Pipfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ pytest = "==9.0.2"
88
port-for = "==1.0.0"
99
mirakuru = "==3.0.2"
1010
packaging = "==26.0"
11-
psycopg = "==3.3.2"
11+
psycopg = "==3.3.3"
1212

1313
[dev-packages]
1414
towncrier = "==25.8.0"
15-
psycopg-binary = {version = "==3.3.2", markers="implementation_name == 'cpython'"}
15+
psycopg-binary = {version = "==3.3.3", markers="implementation_name == 'cpython'"}
1616
pytest-cov = "==7.0.0"
1717
pytest-xdist = "==3.8.0"
1818
mock = "==5.2.0"

‎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)