From f739ca3b9c9d7a7227bc2aeea9049c0a10e2f782 Mon Sep 17 00:00:00 2001 From: Wilfried BARADAT Date: Fri, 12 Apr 2024 16:33:00 +0200 Subject: [PATCH] =?UTF-8?q?fixup!=20=F0=9F=8F=97=EF=B8=8F(project)=20migra?= =?UTF-8?q?te=20to=20`pydantic`=20v2=20and=20switch=20tests=20to=20`polyfa?= =?UTF-8?q?ctory`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ralph/conf.py | 4 ++-- src/ralph/models/edx/bookmark/fields/events.py | 2 +- src/ralph/models/edx/certificate/fields/events.py | 2 +- src/ralph/models/edx/notes/fields/events.py | 2 +- src/ralph/models/edx/teams_related/fields/events.py | 2 +- tests/backends/data/test_async_lrs.py | 1 - tests/backends/data/test_base.py | 1 - tests/models/edx/notes/test_events.py | 7 ------- tests/models/edx/notes/test_statements.py | 2 +- 9 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/ralph/conf.py b/src/ralph/conf.py index bee98a0ba..8b35f66a0 100644 --- a/src/ralph/conf.py +++ b/src/ralph/conf.py @@ -3,7 +3,7 @@ import io from enum import Enum from pathlib import Path -from typing import List, Literal, Optional, Tuple, Union +from typing import List, Optional, Tuple, Union from pydantic import ( AfterValidator, @@ -132,7 +132,7 @@ class AuthBackend(str, Enum): def validate_auth_backends( - value: Union[AuthBackend, Tuple[AuthBackend], List[AuthBackend]] + value: Union[str, Tuple[str, ...], List[str]] ) -> Tuple[AuthBackend]: """Check whether the value is a comma separated string or a list/tuple.""" if isinstance(value, (tuple, list)): diff --git a/src/ralph/models/edx/bookmark/fields/events.py b/src/ralph/models/edx/bookmark/fields/events.py index 5bce8211c..0d486757f 100644 --- a/src/ralph/models/edx/bookmark/fields/events.py +++ b/src/ralph/models/edx/bookmark/fields/events.py @@ -2,9 +2,9 @@ import sys from typing import Optional -from typing_extensions import Annotated from pydantic import StringConstraints +from typing_extensions import Annotated from ...base import AbstractBaseEventField diff --git a/src/ralph/models/edx/certificate/fields/events.py b/src/ralph/models/edx/certificate/fields/events.py index eac23a2a7..535522804 100644 --- a/src/ralph/models/edx/certificate/fields/events.py +++ b/src/ralph/models/edx/certificate/fields/events.py @@ -1,10 +1,10 @@ """Cohort event field definition.""" import sys -from typing_extensions import Annotated from uuid import UUID from pydantic import AnyHttpUrl, StringConstraints +from typing_extensions import Annotated from ...base import AbstractBaseEventField diff --git a/src/ralph/models/edx/notes/fields/events.py b/src/ralph/models/edx/notes/fields/events.py index bd00ccdcd..2b0b09545 100644 --- a/src/ralph/models/edx/notes/fields/events.py +++ b/src/ralph/models/edx/notes/fields/events.py @@ -2,9 +2,9 @@ import sys from typing import Dict, List -from typing_extensions import Annotated from pydantic import StringConstraints +from typing_extensions import Annotated from ...base import AbstractBaseEventField diff --git a/src/ralph/models/edx/teams_related/fields/events.py b/src/ralph/models/edx/teams_related/fields/events.py index b0bc75992..3bacc71cb 100644 --- a/src/ralph/models/edx/teams_related/fields/events.py +++ b/src/ralph/models/edx/teams_related/fields/events.py @@ -2,9 +2,9 @@ import sys from typing import List, Union -from typing_extensions import Annotated from pydantic import StringConstraints, validator +from typing_extensions import Annotated from ...base import AbstractBaseEventField diff --git a/tests/backends/data/test_async_lrs.py b/tests/backends/data/test_async_lrs.py index 99adacc1f..ea81a9b78 100644 --- a/tests/backends/data/test_async_lrs.py +++ b/tests/backends/data/test_async_lrs.py @@ -48,7 +48,6 @@ def test_backends_data_async_lrs_default_instantiation(monkeypatch, fs, lrs_back assert backend.query_class == LRSStatementsQuery assert backend.base_url == parse_obj_as(AnyHttpUrl, "http://0.0.0.0:8100") assert backend.auth == ("ralph", "secret") - print(f"{backend.settings.HEADERS =}") assert backend.settings.HEADERS == LRSHeaders() assert backend.settings.LOCALE_ENCODING == "utf8" assert backend.settings.READ_CHUNK_SIZE == 500 diff --git a/tests/backends/data/test_base.py b/tests/backends/data/test_base.py index d2219e469..2e1df421c 100644 --- a/tests/backends/data/test_base.py +++ b/tests/backends/data/test_base.py @@ -2,7 +2,6 @@ import asyncio import logging -import re from typing import Any, Dict, Generic, TypeVar, Union import pytest diff --git a/tests/models/edx/notes/test_events.py b/tests/models/edx/notes/test_events.py index 43d31ef6d..60749b6cd 100644 --- a/tests/models/edx/notes/test_events.py +++ b/tests/models/edx/notes/test_events.py @@ -1,8 +1,6 @@ """Tests for notes models event fields.""" import json -import sys -from typing import List import pytest from pydantic.error_wrappers import ValidationError @@ -15,11 +13,6 @@ from tests.factories import mock_instance -if sys.version_info >= (3, 8): - from typing import Literal -else: - from typing_extensions import Literal - def test_models_edx_notes_event_field_with_valid_field(): """Test that a valid `NotesEventField` does not raise a diff --git a/tests/models/edx/notes/test_statements.py b/tests/models/edx/notes/test_statements.py index 52f7f06c5..9c5f9dd2b 100644 --- a/tests/models/edx/notes/test_statements.py +++ b/tests/models/edx/notes/test_statements.py @@ -75,7 +75,7 @@ def test_models_edx_ui_edx_course_student_notes_searched_with_valid_statement(): assert statement.name == "edx.course.student_notes.searched" -def test_models_edx_ui_edx_course_student_notes_notes_page_viewed_with_valid_statement(): +def test_models_edx_ui_edx_course_student_notes_notes_page_viewed_with_valid_statement(): # noqa: E501 """Test that a `edx.course.student_notes.notes_page_viewed` statement has the expected `event_type` and `name`. """