Skip to content

Commit 9aa2113

Browse files
committed
Merge remote-tracking branch 'origin/main' into meilisearch-1.15.0
2 parents 79fb91e + 768f948 commit 9aa2113

File tree

4 files changed

+128
-131
lines changed

4 files changed

+128
-131
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ repos:
1414
- id: mypy
1515
additional_dependencies: [pydantic, orjson, types-aiofiles, types-ujson]
1616
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.11.10
17+
rev: v0.11.11
1818
hooks:
19-
- id: ruff
19+
- id: ruff-check
2020
args: [--fix, --exit-non-zero-on-fix]
2121
- id: ruff-format

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ dev = [
4747
"pre-commit==4.2.0",
4848
"pytest==8.3.5",
4949
"pytest-cov==6.1.1",
50-
"pytest-asyncio==0.26.0",
51-
"pytest-xdist==3.6.1",
52-
"ruff==0.11.10",
50+
"pytest-asyncio==1.0.0",
51+
"pytest-xdist==3.7.0",
52+
"ruff==0.11.11",
5353
"types-aiofiles==24.1.0.20250516",
5454
"typing-extensions==4.13.2",
5555
"types-ujson==5.10.0.20250326",
@@ -70,6 +70,7 @@ minversion = "6.0"
7070
addopts = "--cov=meilisearch_python_sdk --cov-report term-missing --no-cov-on-fail --ignore examples"
7171
asyncio_mode = "auto"
7272
asyncio_default_fixture_loop_scope = "session"
73+
asyncio_default_test_loop_scope = "session"
7374
markers = ["no_parallel"]
7475

7576
[tool.mypy]

tests/conftest.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from uuid import uuid4
99

1010
import pytest
11-
from pytest_asyncio import is_async_test
1211

1312
try:
1413
import truststore as truststore
@@ -37,13 +36,6 @@
3736
SMALL_MOVIES_PATH = ROOT_PATH / "datasets" / "small_movies.json"
3837

3938

40-
def pytest_collection_modifyitems(items):
41-
pytest_asyncio_tests = (item for item in items if is_async_test(item))
42-
session_scope_marker = pytest.mark.asyncio(loop_scope="session")
43-
for async_test in pytest_asyncio_tests:
44-
async_test.add_marker(session_scope_marker, append=False)
45-
46-
4739
def pytest_addoption(parser):
4840
parser.addoption("--http2", action="store_true")
4941

0 commit comments

Comments
 (0)