From ba7707f6161463260710bd2b109b172fd63472a1 Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Tue, 16 Nov 2021 14:53:11 -0800 Subject: [PATCH] chore: enable mypy for tests/meta/* --- pyproject.toml | 1 - requirements-lint.txt | 2 ++ tests/meta/test_ensure_type_hints.py | 5 +++-- tests/meta/test_mro.py | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 31eeceab0..1619f8902 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,6 @@ module = [ "gitlab.v4.objects.sidekiq", "tests.functional.*", "tests.functional.api.*", - "tests.meta.*", "tests.unit.*", "tests.smoke.*" ] diff --git a/requirements-lint.txt b/requirements-lint.txt index 08ba6dc38..c0048eaff 100644 --- a/requirements-lint.txt +++ b/requirements-lint.txt @@ -2,6 +2,8 @@ black==20.8b1 flake8==4.0.1 isort==5.10.1 mypy==0.910 +pytest types-PyYAML==6.0.1 types-requests==2.26.0 types-setuptools==57.4.2 +types-toml==0.10.1 diff --git a/tests/meta/test_ensure_type_hints.py b/tests/meta/test_ensure_type_hints.py index f647b45a7..7a351ec39 100644 --- a/tests/meta/test_ensure_type_hints.py +++ b/tests/meta/test_ensure_type_hints.py @@ -7,13 +7,14 @@ import inspect from typing import Tuple, Type +import _pytest import toml import gitlab.mixins import gitlab.v4.objects -def pytest_generate_tests(metafunc): +def pytest_generate_tests(metafunc: _pytest.python.Metafunc) -> None: """Find all of the classes in gitlab.v4.objects and pass them to our test function""" @@ -54,7 +55,7 @@ def pytest_generate_tests(metafunc): class TestTypeHints: - def test_check_get_function_type_hints(self, class_info: Tuple[str, Type]): + def test_check_get_function_type_hints(self, class_info: Tuple[str, Type]) -> None: """Ensure classes derived from GetMixin have defined a 'get()' method with correct type-hints. """ diff --git a/tests/meta/test_mro.py b/tests/meta/test_mro.py index 8f67b7725..8558a8be3 100644 --- a/tests/meta/test_mro.py +++ b/tests/meta/test_mro.py @@ -49,7 +49,7 @@ class Wrongv4Object(RESTObject, Mixin): import gitlab.v4.objects -def test_show_issue(): +def test_show_issue() -> None: """Test case to demonstrate the TypeError that occurs""" class RESTObject(object): @@ -61,7 +61,7 @@ class Mixin(RESTObject): with pytest.raises(TypeError) as exc_info: # Wrong ordering here - class Wrongv4Object(RESTObject, Mixin): + class Wrongv4Object(RESTObject, Mixin): # type: ignore ... # The error message in the exception should be: @@ -76,7 +76,7 @@ class Correctv4Object(Mixin, RESTObject): ... -def test_mros(): +def test_mros() -> None: """Ensure objects defined in gitlab.v4.objects have REST* as last item in class definition.