Skip to content

Commit 72f6e2a

Browse files
Merge main into claude/issue-209-20251107-1858
Resolved merge conflicts by: - Merging opensearch (this branch) and duckdb (main) dependencies - Adding filetree store from main - Keeping 90s test timeout from this branch - Preserving correct py-key-value-sync package references - Keeping AsyncOpenSearch mapping and visit_Constant method in codegen - Regenerating uv.lock and running codegen Co-authored-by: William Easton <[email protected]>
2 parents da5cc62 + 1aa915d commit 72f6e2a

File tree

14 files changed

+1237
-8
lines changed

14 files changed

+1237
-8
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ test-sync-concise:
138138
test-shared-concise:
139139
@echo "Testing key-value-shared (concise output)..."
140140
@uv run pytest key-value/key-value-shared/tests -qq --tb=line --no-header
141+
141142
# Build target - supports PROJECT parameter
142143
build:
143144
ifdef PROJECT

key-value/key-value-aio/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ rocksdb = [
5050
"rocksdict>=0.3.24 ; python_version >= '3.12'", # RocksDB 0.3.24 is the first version to support Python 3.13
5151
"rocksdict>=0.3.2 ; python_version < '3.12'"
5252
]
53+
duckdb = ["duckdb>=1.1.1", "pytz>=2025.2"]
5354
wrappers-encryption = ["cryptography>=45.0.0"]
5455

5556
[tool.pytest.ini_options]
@@ -69,7 +70,7 @@ env_files = [".env"]
6970

7071
[dependency-groups]
7172
dev = [
72-
"py-key-value-aio[memory,disk,filetree,redis,elasticsearch,opensearch,memcached,mongodb,vault,dynamodb,rocksdb]",
73+
"py-key-value-aio[memory,disk,filetree,redis,elasticsearch,opensearch,memcached,mongodb,vault,dynamodb,rocksdb,duckdb]",
7374
"py-key-value-aio[valkey]; platform_system != 'Windows'",
7475
"py-key-value-aio[keyring]",
7576
"py-key-value-aio[pydantic]",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from key_value.aio.stores.duckdb.store import DuckDBStore
2+
3+
__all__ = ["DuckDBStore"]

0 commit comments

Comments
 (0)