Skip to content

Commit a68cd6a

Browse files
authored
Merge branch 'main' into pypy3.11
2 parents 506d209 + 1f3b4e0 commit a68cd6a

38 files changed

+634
-466
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ 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:
3535
name: ${{matrix.job.os}}-${{matrix.py_version}}-${{ matrix.postgres_version }}
3636
strategy:

.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:

Cargo.lock

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
1010

1111
[dependencies]
1212
deadpool-postgres = { git = "https://github.com/chandr-andr/deadpool.git", branch = "psqlpy" }
13-
pyo3 = { version = "0.23.4", features = [
13+
pyo3 = { version = "0.25.1", features = [
1414
"chrono",
1515
"experimental-async",
1616
"rust_decimal",

python/psqlpy/_internal/__init__.pyi

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -815,16 +815,6 @@ class Connection:
815815
816816
Return representation of prepared statement.
817817
"""
818-
async def commit(self: Self) -> None:
819-
"""Commit the transaction.
820-
821-
Do nothing if there is no active transaction.
822-
"""
823-
async def rollback(self: Self) -> None:
824-
"""Rollback the transaction.
825-
826-
Do nothing if there is no active transaction.
827-
"""
828818
async def execute(
829819
self: Self,
830820
querystring: str,

0 commit comments

Comments
 (0)