Skip to content

Commit f43cd41

Browse files
tboy1337tboy1337
committed
Merge branch 'main' into editable-package - resolve dockerised-postgres.yml conflict keeping split setup/run steps at v4.4.4
Made-with: Cursor
2 parents a3d8a7e + 0e0b2e2 commit f43cd41

11 files changed

Lines changed: 23 additions & 23 deletions

‎.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.3
16+
uses: fizyk/actions-reuse/.github/workflows/shared-automerge.yml@v4.4.5
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.4.0
11+
uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.4.5

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ jobs:
5050
steps:
5151
- uses: actions/checkout@v6
5252
- name: Set up Pipenv on python ${{ matrix.python-version }}
53-
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.0
53+
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.4
5454
with:
5555
python-version: ${{ matrix.python-version }}
5656
allow-prereleases: true
5757
- name: Run test noproc fixture on docker
58-
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.2.1
58+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
5959
with:
6060
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
6161
- name: Upload coverage to Codecov
62-
uses: codecov/codecov-action@v5.5.2
62+
uses: codecov/codecov-action@v6.0.0
6363
with:
6464
token: ${{ secrets.codecov_token }}
6565
flags: unittests

‎.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.3
39+
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.4
4040
with:
4141
python-version: ${{ matrix.python-version }}
4242
cache: false
@@ -55,15 +55,15 @@ 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.4.3
58+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
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.4.3
62+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
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.4.3
66+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
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
6969
- uses: actions/upload-artifact@v7
@@ -72,7 +72,7 @@ jobs:
7272
name: postgresql-${{ matrix.python-version }}-${{ inputs.postgresql }}
7373
path: /tmp/pytest-of-runner/**
7474
- name: Upload coverage to Codecov
75-
uses: codecov/codecov-action@v5.5.2
75+
uses: codecov/codecov-action@v6.0.0
7676
with:
7777
token: ${{ secrets.codecov_token }}
7878
flags: unittests

‎.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.4.3
9+
uses: fizyk/actions-reuse/.github/workflows/shared-pr-check.yml@v4.4.5

‎.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.4.3
12+
uses: fizyk/actions-reuse/.github/workflows/shared-pre-commit.yml@v4.4.5

‎.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.4.0
8+
uses: fizyk/actions-reuse/.github/workflows/shared-pypi.yml@v4.4.5
99
with:
1010
publish: true
1111
secrets:

‎.github/workflows/release.yml‎

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

1111
jobs:
1212
release:
13-
uses: fizyk/actions-reuse/.github/workflows/shared-release.yml@v4.3.0
13+
uses: fizyk/actions-reuse/.github/workflows/shared-release.yml@v4.4.5
1414
with:
1515
version: ${{ inputs.version }}
1616
secrets:

‎.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.3
39+
uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v4.4.4
4040
with:
4141
python-version: ${{ matrix.python-version }}
4242
allow-prereleases: true
@@ -54,11 +54,11 @@ 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.4.3
57+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
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.4.3
61+
uses: fizyk/actions-reuse/.github/actions/pipenv-run@v4.4.4
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
6464
- uses: actions/upload-artifact@v7
@@ -67,7 +67,7 @@ jobs:
6767
name: postgresql-${{ matrix.python-version }}-${{ inputs.postgresql }}
6868
path: /tmp/pytest-of-runner/**
6969
- name: Upload coverage to Codecov
70-
uses: codecov/codecov-action@v5.5.2
70+
uses: codecov/codecov-action@v6.0.0
7171
with:
7272
token: ${{ secrets.codecov_token }}
7373
flags: unittests

‎.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.6
28+
rev: v0.15.9
2929
hooks:
3030
- id: ruff-check
3131
args: [--fix, --exit-non-zero-on-fix, --respect-gitignore, --show-fixes]

0 commit comments

Comments
 (0)