From 1b0ed56545610e60e17c2a36486078ad5f810643 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 18:55:44 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/mitol/authentication/test_serializers.py | 1 + tests/mitol/common/test_apps.py | 1 + tests/mitol/common/test_decorators.py | 1 + tests/mitol/common/test_envs.py | 1 + tests/mitol/common/test_models.py | 5 +++-- tests/mitol/common/test_pytest_utils.py | 1 + tests/mitol/common/utils/test_collections.py | 1 + tests/mitol/common/utils/test_currency.py | 1 + tests/mitol/common/utils/test_datetime.py | 1 + tests/mitol/common/utils/test_http_requests.py | 3 ++- tests/mitol/common/utils/test_urls.py | 1 + tests/mitol/digitalcredentials/test_backend.py | 3 ++- tests/mitol/digitalcredentials/test_models.py | 3 ++- tests/mitol/digitalcredentials/test_requests_utils.py | 3 ++- tests/mitol/digitalcredentials/test_serializers.py | 9 +++++---- tests/mitol/digitalcredentials/test_views.py | 5 +++-- tests/mitol/geoip/test_api.py | 1 + tests/mitol/google_sheets/test_api.py | 1 + tests/mitol/google_sheets/test_sheet_handler_api.py | 3 ++- tests/mitol/google_sheets/test_utils.py | 3 ++- tests/mitol/google_sheets/test_views.py | 7 ++++--- tests/mitol/google_sheets_deferrals/test_api.py | 7 ++++--- tests/mitol/google_sheets_refunds/test_api.py | 7 ++++--- tests/mitol/hubspot_api/test_api.py | 1 + tests/mitol/hubspot_api/test_decorators.py | 1 + tests/mitol/mail/test_api.py | 1 + tests/mitol/mail/test_messages.py | 1 + tests/mitol/oauth_toolkit_extensions/test_backends.py | 3 ++- tests/mitol/oauth_toolkit_extensions/test_models.py | 1 + tests/mitol/olposthog/test_features.py | 1 + tests/mitol/scim/test_parser.py | 1 + tests/mitol/scim/test_views.py | 1 + 32 files changed, 56 insertions(+), 24 deletions(-) diff --git a/tests/mitol/authentication/test_serializers.py b/tests/mitol/authentication/test_serializers.py index 17f404d1..d7857c3c 100644 --- a/tests/mitol/authentication/test_serializers.py +++ b/tests/mitol/authentication/test_serializers.py @@ -1,4 +1,5 @@ import pytest + from mitol.authentication.serializers.djoser_serializers import ( CustomSendEmailResetSerializer, ) diff --git a/tests/mitol/common/test_apps.py b/tests/mitol/common/test_apps.py index ff6a6357..fc81cd5f 100644 --- a/tests/mitol/common/test_apps.py +++ b/tests/mitol/common/test_apps.py @@ -3,6 +3,7 @@ import pytest import testapp from django.core.exceptions import ImproperlyConfigured + from mitol.common.apps import BaseApp diff --git a/tests/mitol/common/test_decorators.py b/tests/mitol/common/test_decorators.py index d7651163..a830c090 100644 --- a/tests/mitol/common/test_decorators.py +++ b/tests/mitol/common/test_decorators.py @@ -1,6 +1,7 @@ """Tests for decorators""" import pytest + from mitol.common.decorators import single_task diff --git a/tests/mitol/common/test_envs.py b/tests/mitol/common/test_envs.py index e0fc2d8c..254c5c58 100644 --- a/tests/mitol/common/test_envs.py +++ b/tests/mitol/common/test_envs.py @@ -4,6 +4,7 @@ import pytest from django.core.exceptions import ImproperlyConfigured + from mitol.common import envs FAKE_ENVIRONS = { diff --git a/tests/mitol/common/test_models.py b/tests/mitol/common/test_models.py index 9aeb724b..103a7cb3 100644 --- a/tests/mitol/common/test_models.py +++ b/tests/mitol/common/test_models.py @@ -6,8 +6,6 @@ import pytest import pytz from freezegun import freeze_time -from mitol.common.factories import UserFactory -from mitol.common.utils.serializers import serialize_model_object from testapp.models import ( AuditableTestModel, AuditableTestModelAudit, @@ -19,6 +17,9 @@ Updateable, ) +from mitol.common.factories import UserFactory +from mitol.common.utils.serializers import serialize_model_object + pytestmark = pytest.mark.django_db diff --git a/tests/mitol/common/test_pytest_utils.py b/tests/mitol/common/test_pytest_utils.py index a6afbbd2..7d97f7b1 100644 --- a/tests/mitol/common/test_pytest_utils.py +++ b/tests/mitol/common/test_pytest_utils.py @@ -3,6 +3,7 @@ import json import pytest + from mitol.common.pytest_utils import MockResponse, any_instance_of, assert_not_raises from mitol.common.pytest_utils import test_app_json_modified as _test_app_json_modified diff --git a/tests/mitol/common/utils/test_collections.py b/tests/mitol/common/utils/test_collections.py index 9cc8948a..745c1963 100644 --- a/tests/mitol/common/utils/test_collections.py +++ b/tests/mitol/common/utils/test_collections.py @@ -5,6 +5,7 @@ from types import SimpleNamespace import pytest + from mitol.common.utils.collections import ( all_equal, all_unique, diff --git a/tests/mitol/common/utils/test_currency.py b/tests/mitol/common/utils/test_currency.py index ee3cfdc6..df7efebd 100644 --- a/tests/mitol/common/utils/test_currency.py +++ b/tests/mitol/common/utils/test_currency.py @@ -3,6 +3,7 @@ from decimal import Decimal import pytest + from mitol.common.utils.currency import format_price diff --git a/tests/mitol/common/utils/test_datetime.py b/tests/mitol/common/utils/test_datetime.py index 2d1927e5..863fa71d 100644 --- a/tests/mitol/common/utils/test_datetime.py +++ b/tests/mitol/common/utils/test_datetime.py @@ -3,6 +3,7 @@ from datetime import datetime, timedelta import pytz + from mitol.common.utils.datetime import is_near_now, now_in_utc diff --git a/tests/mitol/common/utils/test_http_requests.py b/tests/mitol/common/utils/test_http_requests.py index f7f7613f..e927ff06 100644 --- a/tests/mitol/common/utils/test_http_requests.py +++ b/tests/mitol/common/utils/test_http_requests.py @@ -4,13 +4,14 @@ import pytest import responses +from requests.exceptions import HTTPError + from mitol.common.pytest_utils import MockResponse from mitol.common.utils.http_requests import ( get_error_response_summary, is_json_response, request_get_with_timeout_retry, ) -from requests.exceptions import HTTPError @pytest.mark.parametrize( diff --git a/tests/mitol/common/utils/test_urls.py b/tests/mitol/common/utils/test_urls.py index 5622e97a..c0bc6f41 100644 --- a/tests/mitol/common/utils/test_urls.py +++ b/tests/mitol/common/utils/test_urls.py @@ -1,6 +1,7 @@ """URLs utils tests""" import pytest + from mitol.common.utils.urls import ensure_trailing_slash, remove_password_from_url diff --git a/tests/mitol/digitalcredentials/test_backend.py b/tests/mitol/digitalcredentials/test_backend.py index 42121eec..944e71b8 100644 --- a/tests/mitol/digitalcredentials/test_backend.py +++ b/tests/mitol/digitalcredentials/test_backend.py @@ -7,6 +7,8 @@ import responses from django.core.exceptions import ImproperlyConfigured from django.urls import reverse +from testapp.factories import DemoCoursewareDigitalCredentialRequestFactory + from mitol.digitalcredentials.backend import ( build_api_url, build_credential, @@ -14,7 +16,6 @@ issue_credential, verify_presentations, ) -from testapp.factories import DemoCoursewareDigitalCredentialRequestFactory def test_build_api_url(): diff --git a/tests/mitol/digitalcredentials/test_models.py b/tests/mitol/digitalcredentials/test_models.py index 48e07d89..8043967d 100644 --- a/tests/mitol/digitalcredentials/test_models.py +++ b/tests/mitol/digitalcredentials/test_models.py @@ -5,12 +5,13 @@ from hashlib import sha256 import pytest -from mitol.digitalcredentials.factories import LearnerDIDFactory from testapp.factories import ( DemoCoursewareDigitalCredentialFactory, DemoCoursewareDigitalCredentialRequestFactory, ) +from mitol.digitalcredentials.factories import LearnerDIDFactory + pytestmark = pytest.mark.django_db diff --git a/tests/mitol/digitalcredentials/test_requests_utils.py b/tests/mitol/digitalcredentials/test_requests_utils.py index eb974ca0..42ce0c33 100644 --- a/tests/mitol/digitalcredentials/test_requests_utils.py +++ b/tests/mitol/digitalcredentials/test_requests_utils.py @@ -4,11 +4,12 @@ import hashlib import pytest +from requests.models import PreparedRequest + from mitol.digitalcredentials.requests_utils import ( prepare_request_digest, prepare_request_hmac_signature, ) -from requests.models import PreparedRequest REQUEST_BODY = '{"content": 1}' REQUEST_DIGEST = base64.b64encode( diff --git a/tests/mitol/digitalcredentials/test_serializers.py b/tests/mitol/digitalcredentials/test_serializers.py index f9e6fffa..525bd572 100644 --- a/tests/mitol/digitalcredentials/test_serializers.py +++ b/tests/mitol/digitalcredentials/test_serializers.py @@ -5,6 +5,11 @@ import pytest import responses from django.contrib.contenttypes.models import ContentType +from testapp.factories import ( + DemoCoursewareDigitalCredentialFactory, + DemoCoursewareDigitalCredentialRequestFactory, +) + from mitol.digitalcredentials.factories import LearnerDIDFactory from mitol.digitalcredentials.models import ( DigitalCredential, @@ -15,10 +20,6 @@ DigitalCredentialIssueSerializer, DigitalCredentialRequestSerializer, ) -from testapp.factories import ( - DemoCoursewareDigitalCredentialFactory, - DemoCoursewareDigitalCredentialRequestFactory, -) pytestmark = pytest.mark.django_db diff --git a/tests/mitol/digitalcredentials/test_views.py b/tests/mitol/digitalcredentials/test_views.py index 673a5264..aae352ff 100644 --- a/tests/mitol/digitalcredentials/test_views.py +++ b/tests/mitol/digitalcredentials/test_views.py @@ -5,14 +5,15 @@ import pytest import responses from django.urls import reverse -from mitol.digitalcredentials.backend import create_deep_link_url -from mitol.digitalcredentials.models import DigitalCredentialRequest from rest_framework.test import APIClient from testapp.factories import ( DemoCoursewareDigitalCredentialRequestFactory, DemoCoursewareFactory, ) +from mitol.digitalcredentials.backend import create_deep_link_url +from mitol.digitalcredentials.models import DigitalCredentialRequest + pytestmark = pytest.mark.django_db diff --git a/tests/mitol/geoip/test_api.py b/tests/mitol/geoip/test_api.py index 5c4f21b2..b9aaa3c6 100644 --- a/tests/mitol/geoip/test_api.py +++ b/tests/mitol/geoip/test_api.py @@ -6,6 +6,7 @@ import faker import pytest + from mitol.geoip.api import ip_to_country_code from mitol.geoip.factories import NetBlockIPv4Factory, NetBlockIPv6Factory diff --git a/tests/mitol/google_sheets/test_api.py b/tests/mitol/google_sheets/test_api.py index 055cd03e..ccc33825 100644 --- a/tests/mitol/google_sheets/test_api.py +++ b/tests/mitol/google_sheets/test_api.py @@ -3,6 +3,7 @@ import pytest from django.core.exceptions import ImproperlyConfigured from google.oauth2.credentials import Credentials + from mitol.google_sheets.api import get_credentials from mitol.google_sheets.constants import REQUIRED_GOOGLE_API_SCOPES from mitol.google_sheets.factories import GoogleApiAuthFactory diff --git a/tests/mitol/google_sheets/test_sheet_handler_api.py b/tests/mitol/google_sheets/test_sheet_handler_api.py index 69bc3d7a..5617f37d 100644 --- a/tests/mitol/google_sheets/test_sheet_handler_api.py +++ b/tests/mitol/google_sheets/test_sheet_handler_api.py @@ -1,7 +1,8 @@ import pytest -from mitol.google_sheets.sheet_handler_api import SheetHandler from pytest_lazy_fixtures import lf as lazy_fixture +from mitol.google_sheets.sheet_handler_api import SheetHandler + @pytest.mark.usefixtures("google_sheets_base_settings") @pytest.mark.parametrize( diff --git a/tests/mitol/google_sheets/test_utils.py b/tests/mitol/google_sheets/test_utils.py index 07295037..9db838fe 100644 --- a/tests/mitol/google_sheets/test_utils.py +++ b/tests/mitol/google_sheets/test_utils.py @@ -1,12 +1,13 @@ """Sheets app util function tests""" +from pygsheets.worksheet import Worksheet + from mitol.google_sheets.constants import ( GOOGLE_AUTH_PROVIDER_X509_CERT_URL, GOOGLE_AUTH_URI, GOOGLE_TOKEN_URI, ) from mitol.google_sheets.utils import generate_google_client_config, get_data_rows -from pygsheets.worksheet import Worksheet def test_generate_google_client_config(settings): diff --git a/tests/mitol/google_sheets/test_views.py b/tests/mitol/google_sheets/test_views.py index 792cc73d..fcd6deef 100644 --- a/tests/mitol/google_sheets/test_views.py +++ b/tests/mitol/google_sheets/test_views.py @@ -3,13 +3,14 @@ import pytest from django.test.client import RequestFactory from django.urls import reverse -from mitol.google_sheets.factories import GoogleApiAuthFactory -from mitol.google_sheets.models import GoogleApiAuth -from mitol.google_sheets.views import complete_google_auth from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from testapp.utils import set_request_session +from mitol.google_sheets.factories import GoogleApiAuthFactory +from mitol.google_sheets.models import GoogleApiAuth +from mitol.google_sheets.views import complete_google_auth + lazy = lazy_fixture diff --git a/tests/mitol/google_sheets_deferrals/test_api.py b/tests/mitol/google_sheets_deferrals/test_api.py index 7cfb5abe..9137f0ec 100644 --- a/tests/mitol/google_sheets_deferrals/test_api.py +++ b/tests/mitol/google_sheets_deferrals/test_api.py @@ -4,15 +4,16 @@ from types import SimpleNamespace import pytest -from mitol.google_sheets.factories import GoogleApiAuthFactory -from mitol.google_sheets.utils import ResultType -from mitol.google_sheets_deferrals.api import DeferralRequestHandler from pygsheets import Spreadsheet, Worksheet from pygsheets.client import Client as PygsheetsClient from pygsheets.drive import DriveAPIWrapper from pygsheets.sheet import SheetAPIWrapper from pytest_lazy_fixtures import lf as lazy_fixture +from mitol.google_sheets.factories import GoogleApiAuthFactory +from mitol.google_sheets.utils import ResultType +from mitol.google_sheets_deferrals.api import DeferralRequestHandler + @pytest.fixture() def request_csv_rows(settings): diff --git a/tests/mitol/google_sheets_refunds/test_api.py b/tests/mitol/google_sheets_refunds/test_api.py index 798beb1e..633c3096 100644 --- a/tests/mitol/google_sheets_refunds/test_api.py +++ b/tests/mitol/google_sheets_refunds/test_api.py @@ -4,15 +4,16 @@ from types import SimpleNamespace import pytest -from mitol.google_sheets.factories import GoogleApiAuthFactory -from mitol.google_sheets.utils import ResultType -from mitol.google_sheets_refunds.api import RefundRequestHandler from pygsheets import Spreadsheet, Worksheet from pygsheets.client import Client as PygsheetsClient from pygsheets.drive import DriveAPIWrapper from pygsheets.sheet import SheetAPIWrapper from pytest_lazy_fixtures import lf as lazy_fixture +from mitol.google_sheets.factories import GoogleApiAuthFactory +from mitol.google_sheets.utils import ResultType +from mitol.google_sheets_refunds.api import RefundRequestHandler + @pytest.fixture() def request_csv_rows(settings): diff --git a/tests/mitol/hubspot_api/test_api.py b/tests/mitol/hubspot_api/test_api.py index b3fdba02..f1259157 100644 --- a/tests/mitol/hubspot_api/test_api.py +++ b/tests/mitol/hubspot_api/test_api.py @@ -15,6 +15,7 @@ SimplePublicObject, SimplePublicObjectInput, ) + from mitol.common.factories import UserFactory from mitol.hubspot_api import api from mitol.hubspot_api.factories import HubspotObjectFactory, SimplePublicObjectFactory diff --git a/tests/mitol/hubspot_api/test_decorators.py b/tests/mitol/hubspot_api/test_decorators.py index 2fa40ab2..c983126e 100644 --- a/tests/mitol/hubspot_api/test_decorators.py +++ b/tests/mitol/hubspot_api/test_decorators.py @@ -2,6 +2,7 @@ import pytest from hubspot.crm.objects import ApiException + from mitol.hubspot_api.decorators import raise_429 from mitol.hubspot_api.exceptions import TooManyRequestsException diff --git a/tests/mitol/mail/test_api.py b/tests/mitol/mail/test_api.py index 3293f238..616be499 100644 --- a/tests/mitol/mail/test_api.py +++ b/tests/mitol/mail/test_api.py @@ -3,6 +3,7 @@ import pytest from django.contrib.auth import get_user_model from django.core.exceptions import ImproperlyConfigured + from mitol.mail.api import ( build_message, can_email_user, diff --git a/tests/mitol/mail/test_messages.py b/tests/mitol/mail/test_messages.py index 4613b993..6e636e0d 100644 --- a/tests/mitol/mail/test_messages.py +++ b/tests/mitol/mail/test_messages.py @@ -1,6 +1,7 @@ """Message tests""" import pytest + from mitol.mail.messages import TemplatedMessage diff --git a/tests/mitol/oauth_toolkit_extensions/test_backends.py b/tests/mitol/oauth_toolkit_extensions/test_backends.py index eb3b1edc..5e8472f5 100644 --- a/tests/mitol/oauth_toolkit_extensions/test_backends.py +++ b/tests/mitol/oauth_toolkit_extensions/test_backends.py @@ -1,9 +1,10 @@ """Backends tests""" import pytest -from mitol.oauth_toolkit_extensions.backends import ApplicationAccessOrSettingsScopes from oauth2_provider.settings import oauth2_settings +from mitol.oauth_toolkit_extensions.backends import ApplicationAccessOrSettingsScopes + @pytest.mark.parametrize( "application_exists, is_configured", # noqa: PT006 diff --git a/tests/mitol/oauth_toolkit_extensions/test_models.py b/tests/mitol/oauth_toolkit_extensions/test_models.py index 6f05683f..ee85be99 100644 --- a/tests/mitol/oauth_toolkit_extensions/test_models.py +++ b/tests/mitol/oauth_toolkit_extensions/test_models.py @@ -1,6 +1,7 @@ """Admin interfaces""" import pytest + from mitol.oauth_toolkit_extensions.factories import ApplicationAccessFactory pytestmark = pytest.mark.django_db diff --git a/tests/mitol/olposthog/test_features.py b/tests/mitol/olposthog/test_features.py index c6f49a44..20839312 100644 --- a/tests/mitol/olposthog/test_features.py +++ b/tests/mitol/olposthog/test_features.py @@ -6,6 +6,7 @@ import pytest from django.core.cache import caches from freezegun import freeze_time + from mitol.common.utils.datetime import now_in_utc from mitol.olposthog import features diff --git a/tests/mitol/scim/test_parser.py b/tests/mitol/scim/test_parser.py index b688141d..53689910 100644 --- a/tests/mitol/scim/test_parser.py +++ b/tests/mitol/scim/test_parser.py @@ -1,5 +1,6 @@ import pytest from faker import Faker + from mitol.scim.parser import Filters faker = Faker() diff --git a/tests/mitol/scim/test_views.py b/tests/mitol/scim/test_views.py index 2055ec82..5e8f6d58 100644 --- a/tests/mitol/scim/test_views.py +++ b/tests/mitol/scim/test_views.py @@ -14,6 +14,7 @@ from django.test import Client from django.urls import reverse from django_scim import constants as djs_constants + from mitol.common.factories import UserFactory from mitol.scim import constants