Skip to content

Commit 1bda413

Browse files
committed
Merge branch 'main' of https://github.com/Mause/duckdb_engine into pytest-snapshot
2 parents d474ce0 + 67c5054 commit 1bda413

File tree

8 files changed

+181
-485
lines changed

8 files changed

+181
-485
lines changed

.github/workflows/pythonapp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python: [3.8, 3.9, "3.10"]
14+
python: [3.9, "3.10"]
1515

1616
env:
1717
FORCE_COLOR: 1

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- id: trailing-whitespace
1313

1414
- repo: https://github.com/pre-commit/mirrors-mypy
15-
rev: v1.14.1
15+
rev: v1.15.0
1616
hooks:
1717
- id: mypy
1818
additional_dependencies:
@@ -28,7 +28,7 @@ repos:
2828
- id: tox-ini-fmt
2929
- repo: https://github.com/astral-sh/ruff-pre-commit
3030
# Ruff version.
31-
rev: 'v0.9.3'
31+
rev: 'v0.11.2'
3232
hooks:
3333
- id: ruff
3434
args:

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.15.0"
2+
".": "0.15.1"
33
}

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [0.15.1](https://github.com/Mause/duckdb_engine/compare/v0.15.0...v0.15.1) (2025-03-29)
4+
5+
6+
### Bug Fixes
7+
8+
* panics in multi-threaded environments ([694d227](https://github.com/Mause/duckdb_engine/commit/694d2276a619256643b045ba9568d00ac0e6f9ef))
9+
* panics in multi-threaded environments ([d42c977](https://github.com/Mause/duckdb_engine/commit/d42c977c5db98a023984c7aed986b702e4228035)), closes [#1190](https://github.com/Mause/duckdb_engine/issues/1190)
10+
311
## [0.15.0](https://github.com/Mause/duckdb_engine/compare/v0.14.2...v0.15.0) (2025-01-16)
412

513

duckdb_engine/__init__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from .config import apply_config, get_core_config
4040
from .datatypes import ISCHEMA_NAMES, register_extension_types
4141

42-
__version__ = "0.15.0"
42+
__version__ = "0.15.1"
4343
sqlalchemy_version = sqlalchemy.__version__
4444
duckdb_version: str = duckdb.__version__
4545
supports_attach: bool = duckdb_version >= "0.7.0"
@@ -194,9 +194,11 @@ def __init__(self, dialect: "Dialect", **kwargs: Any) -> None:
194194
self.reserved_words.update(
195195
{
196196
keyword_name
197-
for (keyword_name,) in duckdb.execute(
197+
for (keyword_name,) in duckdb.cursor()
198+
.execute(
198199
"select keyword_name from duckdb_keywords() where keyword_category == 'reserved'"
199-
).fetchall()
200+
)
201+
.fetchall()
200202
}
201203
)
202204

noxfile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def group(title: str) -> Generator[None, None, None]:
2323

2424
# TODO: "0.5.1", "0.6.1", "0.7.1", "0.8.1"
2525
# TODO: 3.11, 3.12, 3.13
26-
@nox.session(py=["3.8", "3.9", "3.10"])
26+
@nox.session(py=["3.9", "3.10"])
2727
@nox.parametrize("duckdb", ["0.9.2", "1.0.0"])
2828
@nox.parametrize("sqlalchemy", ["1.3", "1.4", "2.0.35"])
2929
def tests(session: nox.Session, duckdb: str, sqlalchemy: str) -> None:
@@ -32,6 +32,7 @@ def tests(session: nox.Session, duckdb: str, sqlalchemy: str) -> None:
3232

3333
@nox.session(py=["3.8"])
3434
def nightly(session: nox.Session) -> None:
35+
session.skip("DuckDB nightly installs are broken right now")
3536
tests_core(session, "master", "1.4")
3637

3738

poetry.lock

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

pyproject.toml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
[tool.poetry]
1+
[project]
22
name = "duckdb_engine"
3-
version = "0.15.0"
3+
version = "0.15.1"
44
description = "SQLAlchemy driver for duckdb"
5-
authors = ["Elliana <me@mause.me>"]
6-
license = "MIT"
5+
authors = [
6+
{name = "Elliana May", email = "me@mause.me"},
7+
]
8+
license = {text = "MIT"}
9+
requires-python = ">=3.9,<4"
710
readme = "README.md"
8-
repository = "https://github.com/Mause/duckdb_engine"
11+
dependencies = [
12+
"duckdb>=0.5.0",
13+
"sqlalchemy>=1.3.22",
14+
"packaging>=21",
15+
]
916

10-
[tool.poetry.urls]
17+
[project.urls]
1118
"Bug Tracker" = "https://github.com/Mause/duckdb_engine/issues"
12-
"Changelog" = "https://github.com/Mause/duckdb_engine/releases"
13-
14-
[tool.poetry.dependencies]
15-
python = ">=3.8,<4"
16-
duckdb = ">=0.5.0"
17-
sqlalchemy = ">=1.3.22"
18-
packaging = ">=21"
19+
Changelog = "https://github.com/Mause/duckdb_engine/releases"
20+
repository = "https://github.com/Mause/duckdb_engine"
1921

2022
[tool.poetry.group.dev.dependencies]
2123
numpy = "*"
@@ -35,7 +37,7 @@ toml = "^0.10.2"
3537
pdbpp = "^0.10.3"
3638
pre-commit = { version = "^4.0.0", markers = "python_version >= '3.9'" }
3739

38-
[tool.poetry.plugins."sqlalchemy.dialects"]
40+
[project.entry-points."sqlalchemy.dialects"]
3941
duckdb = "duckdb_engine:Dialect"
4042

4143
[tool.pytest.ini_options]

0 commit comments

Comments
 (0)