Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
Configuration for Sphinx.
"""

# pylint: disable=invalid-name

import datetime
import importlib.metadata

Expand Down
13 changes: 5 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ optional-dependencies.dev = [
"pre-commit==3.8.0",
"pydocstyle==6.3",
"pyenchant==3.2.2",
"pylint==3.2.7",
"pylint==3.3.0",
"pylint-per-file-ignores==1.3.2",
"pyproject-fmt==2.2.4",
"pyright==1.1.381",
Expand Down Expand Up @@ -253,26 +253,23 @@ enable = [
disable = [
# Style issues that we can deal with ourselves
'too-few-public-methods',
'too-many-ancestors',
'too-many-locals',
'too-many-arguments',
'too-many-instance-attributes',
'too-many-return-statements',
'too-many-lines',
'too-many-statements',
'locally-disabled',
# Let flake8 handle long lines
# Let ruff handle long lines
'line-too-long',
# Let flake8 handle unused imports
# Let ruff handle unused imports
'unused-import',
# Let isort deal with sorting
# Let ruff deal with sorting
'ungrouped-imports',
# We don't need everything to be documented because of mypy
'missing-type-doc',
'missing-return-type-doc',
# Too difficult to please
'duplicate-code',
# Let isort handle imports
# Let ruff handle imports
'wrong-import-order',
]

Expand Down
2 changes: 1 addition & 1 deletion src/mock_vws/_requests_mock_server/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ class MockVWS(ContextDecorator):

def __init__(
self,
*,
base_vws_url: str = "https://vws.vuforia.com",
base_vwq_url: str = "https://cloudreco.vuforia.com",
duplicate_match_checker: ImageMatcher = _STRUCTURAL_SIMILARITY_MATCHER,
query_match_checker: ImageMatcher = _STRUCTURAL_SIMILARITY_MATCHER,
processing_time_seconds: float = 2.0,
target_tracking_rater: TargetTrackingRater = _BRISQUE_TRACKING_RATER,
*,
real_http: bool = False,
) -> None:
"""
Expand Down
10 changes: 5 additions & 5 deletions tests/mock_vws/fixtures/vuforia_backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def _enable_use_real_vuforia(
working_database: VuforiaDatabase,
inactive_database: VuforiaDatabase,
monkeypatch: pytest.MonkeyPatch,
) -> Generator[None, None, None]:
) -> Generator[None]:
"""Test against the real Vuforia."""
assert monkeypatch
assert inactive_database
Expand All @@ -80,7 +80,7 @@ def _enable_use_mock_vuforia(
working_database: VuforiaDatabase,
inactive_database: VuforiaDatabase,
monkeypatch: pytest.MonkeyPatch,
) -> Generator[None, None, None]:
) -> Generator[None]:
"""Test against the in-memory mock Vuforia."""
assert monkeypatch
working_database = VuforiaDatabase(
Expand Down Expand Up @@ -112,7 +112,7 @@ def _enable_use_docker_in_memory(
working_database: VuforiaDatabase,
inactive_database: VuforiaDatabase,
monkeypatch: pytest.MonkeyPatch,
) -> Generator[None, None, None]:
) -> Generator[None]:
"""Test against mock Vuforia created to be run in a container."""
# We set ``wsgi.input_terminated`` to ``True`` so that when going through
# ``requests`` in our tests, the Flask applications
Expand Down Expand Up @@ -239,7 +239,7 @@ def fixture_verify_mock_vuforia(
vuforia_database: VuforiaDatabase,
inactive_database: VuforiaDatabase,
monkeypatch: pytest.MonkeyPatch,
) -> Generator[None, None, None]:
) -> Generator[None]:
"""
Test functions which use this fixture are run multiple times. Once with the
real Vuforia, and once with each mock.
Expand Down Expand Up @@ -284,7 +284,7 @@ def mock_only_vuforia(
vuforia_database: VuforiaDatabase,
inactive_database: VuforiaDatabase,
monkeypatch: pytest.MonkeyPatch,
) -> Generator[None, None, None]:
) -> Generator[None]:
"""
Test functions which use this fixture are run multiple times. Once with the
each mock.
Expand Down
1 change: 1 addition & 0 deletions tests/mock_vws/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ class TestContentType:
],
)
def test_incorrect_no_boundary(
*,
high_quality_image: io.BytesIO,
vuforia_database: VuforiaDatabase,
content_type: str,
Expand Down