Skip to content

Commit 81e248f

Browse files
author
Daniil Babin
committed
Merge branch 'main' into fix/docs
2 parents 06d164e + fcd691a commit 81e248f

File tree

99 files changed

+11843
-8897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+11843
-8897
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: PyO3/maturin-action@v1
2626
with:
2727
target: ${{ matrix.target }}
28-
args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
28+
args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11
2929
sccache: 'true'
3030
manylinux: auto
3131
before-script-linux: |
@@ -112,7 +112,7 @@ jobs:
112112
uses: PyO3/maturin-action@v1
113113
with:
114114
target: ${{ matrix.target }}
115-
args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
115+
args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11
116116
sccache: 'true'
117117
- name: Upload wheels
118118
uses: actions/upload-artifact@v4
@@ -168,7 +168,7 @@ jobs:
168168
uses: messense/maturin-action@v1
169169
with:
170170
target: ${{ matrix.target }}
171-
args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
171+
args: --release --out dist -i 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11
172172
manylinux: musllinux_1_2
173173
- name: Upload wheels
174174
uses: actions/upload-artifact@v4

.github/workflows/release_docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Node.js
1616
uses: actions/setup-node@v3
1717
with:
18-
node-version: 18
18+
node-version: 20
1919
cache: pnpm
2020
- name: Install deps
2121
run: pnpm install

.github/workflows/test.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,28 @@ jobs:
3030
- uses: actions-rs/clippy-check@v1
3131
with:
3232
token: ${{ secrets.GITHUB_TOKEN }}
33-
args: -p psqlpy --all-features -- -W clippy::all -W clippy::pedantic
33+
args: -p psqlpy --all-features -- -W clippy::all -W clippy::pedantic -D warnings
3434
pytest:
35-
name: ${{matrix.job.os}}-${{matrix.py_version}}
35+
name: ${{matrix.job.os}}-${{matrix.py_version}}-${{ matrix.postgres_version }}
3636
strategy:
3737
matrix:
3838
py_version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
39+
postgres_version: ["14", "15", "16", "17"]
3940
job:
4041
- os: ubuntu-latest
4142
ssl_cmd: sudo apt-get update && sudo apt-get install libssl-dev openssl
4243
runs-on: ${{matrix.job.os}}
4344
steps:
4445
- uses: actions/checkout@v1
4546
- name: Setup Postgres
46-
uses: ./.github/actions/setup_postgres/
47+
id: postgres
48+
uses: ikalnytskyi/action-setup-postgres@v7
4749
with:
4850
username: postgres
4951
password: postgres
5052
database: psqlpy_test
51-
ssl_on: "on"
52-
id: postgres
53+
ssl: true
54+
postgres-version: ${{ matrix.postgres_version }}
5355
- uses: actions-rs/toolchain@v1
5456
with:
5557
toolchain: stable
@@ -64,4 +66,6 @@ jobs:
6466
- name: Install tox
6567
run: pip install "tox-gh>=1.2,<2"
6668
- name: Run pytest
69+
env:
70+
POSTGRES_CERT_FILE: "${{ steps.postgres.outputs.certificate-path }}"
6771
run: tox -v -c tox.ini

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,8 @@ _load_test
7777

7878
# JS
7979
node_modules
80-
.temp
80+
.temp
81+
node_modules/
82+
docs/.vuepress/.cache/
83+
docs/.vuepress/.temp/
84+
docs/.vuepress/dist/

.pre-commit-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ci:
33

44
repos:
55
- repo: https://github.com/pre-commit/pre-commit-hooks
6-
rev: v2.1.0
6+
rev: v5.0.0
77
hooks:
88
- id: trailing-whitespace
99
- repo: https://github.com/pre-commit/mirrors-mypy
@@ -58,6 +58,8 @@ repos:
5858
- clippy::all
5959
- -W
6060
- clippy::pedantic
61+
- -D
62+
- warnings
6163

6264
- id: check
6365
types:

0 commit comments

Comments
 (0)