Skip to content

Commit 8bcee8f

Browse files
authored
Merge branch 'main' into fix/embedded-model-query-prefix
2 parents eb1faa6 + 6b521d5 commit 8bcee8f

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Checkout
99
uses: actions/checkout@v4
1010
- name: Check Spelling
11-
uses: rojopolis/spellcheck-github-actions@0.40.0
11+
uses: rojopolis/spellcheck-github-actions@0.44.0
1212
with:
1313
config_path: .github/spellcheck-settings.yml
1414
task_name: Markdown

aredis_om/model/encoders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def jsonable_encoder(
9090
sqlalchemy_safe=sqlalchemy_safe,
9191
)
9292
if dataclasses.is_dataclass(obj):
93-
return dataclasses.asdict(obj) # type: ignore[call-overload]
93+
return dataclasses.asdict(obj) # type: ignore
9494
if isinstance(obj, Enum):
9595
return obj.value
9696
if isinstance(obj, PurePath):

aredis_om/model/model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,8 @@ def outer_type_or_annotation(field):
14351435

14361436
class RedisModel(BaseModel, abc.ABC, metaclass=ModelMeta):
14371437
pk: Optional[str] = Field(default=None, primary_key=True)
1438-
ConfigDict: ClassVar
1438+
if PYDANTIC_V2:
1439+
ConfigDict: ClassVar
14391440

14401441
Meta = DefaultMeta
14411442

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redis-om"
3-
version = "0.3.2"
3+
version = "0.3.3"
44
description = "Object mappings, and more, for Redis."
55
authors = ["Redis OSS <[email protected]>"]
66
maintainers = ["Redis OSS <[email protected]>"]
@@ -44,7 +44,7 @@ python-ulid = "^1.0.3"
4444
typing-extensions = "^4.4.0"
4545
hiredis = ">=2.2.3,<4.0.0"
4646
more-itertools = ">=8.14,<11.0"
47-
setuptools = {version = ">=70.0,<73.0", markers = "python_version >= '3.12'"}
47+
setuptools = {version = ">=70.0,<76.0", markers = "python_version >= '3.12'"}
4848

4949
[tool.poetry.dev-dependencies]
5050
mypy = "^1.9.0"
@@ -58,7 +58,7 @@ coverage = "^7.1"
5858
pytest-cov = "^5.0.0"
5959
pytest-xdist = "^3.1.0"
6060
unasync = "^0.6.0"
61-
pytest-asyncio = "^0.23.5"
61+
pytest-asyncio = "^0.24.0"
6262
email-validator = "^2.0.0"
6363
tox = "^4.14.1"
6464
tox-pyenv = "^1.1.0"

0 commit comments

Comments
 (0)