diff --git a/api/conftest.py b/api/conftest.py index deec0b19fb03..7315a209c8ed 100644 --- a/api/conftest.py +++ b/api/conftest.py @@ -120,7 +120,7 @@ def json(self) -> str: return mocker.patch("requests.post", side_effect=mocked_request) -@pytest.hookimpl(trylast=True) # type: ignore[misc] +@pytest.hookimpl(trylast=True) def pytest_configure(config: pytest.Config) -> None: if ( config.option.ci diff --git a/api/poetry.lock b/api/poetry.lock index a10b9de29e30..c51d2ff3d4d5 100644 --- a/api/poetry.lock +++ b/api/poetry.lock @@ -3569,19 +3569,19 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co [[package]] name = "pluggy" -version = "1.2.0" +version = "1.6.0" description = "plugin and hook calling mechanisms for python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.9" groups = ["dev"] files = [ - {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, - {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, + {file = "pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746"}, + {file = "pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3"}, ] [package.extras] dev = ["pre-commit", "tox"] -testing = ["pytest", "pytest-benchmark"] +testing = ["coverage", "pytest", "pytest-benchmark"] [[package]] name = "pre-commit" @@ -4259,25 +4259,25 @@ s2repoze = ["paste", "repoze.who", "zope.interface"] [[package]] name = "pytest" -version = "7.2.2" +version = "9.0.3" description = "pytest: simple powerful testing with Python" optional = false -python-versions = ">=3.7" +python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "pytest-7.2.2-py3-none-any.whl", hash = "sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e"}, - {file = "pytest-7.2.2.tar.gz", hash = "sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4"}, + {file = "pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9"}, + {file = "pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c"}, ] [package.dependencies] -attrs = ">=19.2.0" -colorama = {version = "*", markers = "sys_platform == \"win32\""} -iniconfig = "*" -packaging = "*" -pluggy = ">=0.12,<2.0" +colorama = {version = ">=0.4", markers = "sys_platform == \"win32\""} +iniconfig = ">=1.0.1" +packaging = ">=22" +pluggy = ">=1.5,<2" +pygments = ">=2.7.2" [package.extras] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] +dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-cov" @@ -4334,19 +4334,19 @@ freezegun = ">0.3" pytest = ">=3.0.0" [[package]] -name = "pytest-lazy-fixture" -version = "0.6.3" -description = "It helps to use fixtures in pytest.mark.parametrize" +name = "pytest-lazy-fixtures" +version = "1.1.1" +description = "Allows you to use fixtures in @pytest.mark.parametrize." optional = false -python-versions = "*" +python-versions = "<4.0,>=3.8" groups = ["dev"] files = [ - {file = "pytest-lazy-fixture-0.6.3.tar.gz", hash = "sha256:0e7d0c7f74ba33e6e80905e9bfd81f9d15ef9a790de97993e34213deb5ad10ac"}, - {file = "pytest_lazy_fixture-0.6.3-py3-none-any.whl", hash = "sha256:e0b379f38299ff27a653f03eaa69b08a6fd4484e46fd1c9907d984b9f9daeda6"}, + {file = "pytest_lazy_fixtures-1.1.1-py3-none-any.whl", hash = "sha256:a4b396a361faf56c6305535fd0175ce82902ca7cf668c4d812a25ed2bcde8183"}, + {file = "pytest_lazy_fixtures-1.1.1.tar.gz", hash = "sha256:0c561f0d29eea5b55cf29b9264a3241999ffdb74c6b6e8c4ccc0bd2c934d01ed"}, ] [package.dependencies] -pytest = ">=3.2.5" +pytest = ">=7" [[package]] name = "pytest-mock" @@ -6022,4 +6022,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = ">3.11,<3.14" -content-hash = "3887d5db2a2c09afcc53b6bdda606a15226230b49c0e1712346099b7a3a71d52" +content-hash = "2b377d891da4eef473cd5fd12da5d7dbd42d29a327d6aac779e7c2e5fbe7c31c" diff --git a/api/pyproject.toml b/api/pyproject.toml index 91a41d6d1a2e..9907d5e008ad 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -233,7 +233,7 @@ django-test-migrations = "^1.2.0" responses = "~0.22.0" pre-commit = "^4.0.1" pytest-mock = "~3.10.0" -pytest-lazy-fixture = "~0.6.3" +pytest-lazy-fixtures = "^1.1.1" moto = "~4.1.3" # TODO: move to https://github.com/adamchainz/time-machine pytest-freezegun = "^0.4.2" @@ -242,7 +242,7 @@ pytest-xdist = "~3.6.1" pylint = "~2.16.2" pep8 = "~1.7.1" autopep8 = "~2.0.1" -pytest = "~7.2.1" +pytest = "~9.0.3" pytest-django = "^4.8.0" pytest-cov = "~4.1.0" datamodel-code-generator = "~0.25" diff --git a/api/tests/integration/core/test_commands.py b/api/tests/integration/core/test_commands.py index a23965dc1bae..8196a169e98d 100644 --- a/api/tests/integration/core/test_commands.py +++ b/api/tests/integration/core/test_commands.py @@ -3,7 +3,7 @@ from django.db.models import Model from djoser.utils import decode_uid # type: ignore[import-untyped] from pytest_django.fixtures import SettingsWrapper -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from organisations.models import ( Organisation, diff --git a/api/tests/integration/core/test_user_rate_throttle.py b/api/tests/integration/core/test_user_rate_throttle.py index d5e473a96473..86f91a120caa 100644 --- a/api/tests/integration/core/test_user_rate_throttle.py +++ b/api/tests/integration/core/test_user_rate_throttle.py @@ -2,7 +2,7 @@ import pytest from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/integration/edge_api/identities/test_edge_identity_featurestates_viewset.py b/api/tests/integration/edge_api/identities/test_edge_identity_featurestates_viewset.py index e017a8729dd4..1433fe09e765 100644 --- a/api/tests/integration/edge_api/identities/test_edge_identity_featurestates_viewset.py +++ b/api/tests/integration/edge_api/identities/test_edge_identity_featurestates_viewset.py @@ -8,7 +8,7 @@ from django.urls import reverse from mypy_boto3_dynamodb.service_resource import Table from mypy_boto3_dynamodb.type_defs import TableAttributeValueTypeDef -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.exceptions import NotFound diff --git a/api/tests/integration/environments/identities/test_integration_identities.py b/api/tests/integration/environments/identities/test_integration_identities.py index fa2fa0dec78d..a5d4c7fcffd3 100644 --- a/api/tests/integration/environments/identities/test_integration_identities.py +++ b/api/tests/integration/environments/identities/test_integration_identities.py @@ -5,7 +5,7 @@ import pytest from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/integration/environments/test_integration_environments.py b/api/tests/integration/environments/test_integration_environments.py index caef5c08e55e..f16a36ba20e5 100644 --- a/api/tests/integration/environments/test_integration_environments.py +++ b/api/tests/integration/environments/test_integration_environments.py @@ -4,7 +4,7 @@ import pytest from django.urls import reverse from pytest_django.fixtures import DjangoAssertNumQueries -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/integration/features/featurestate/test_environment_featurestate_viewset.py b/api/tests/integration/features/featurestate/test_environment_featurestate_viewset.py index 52c46456b253..588c4e323169 100644 --- a/api/tests/integration/features/featurestate/test_environment_featurestate_viewset.py +++ b/api/tests/integration/features/featurestate/test_environment_featurestate_viewset.py @@ -2,7 +2,7 @@ import pytest from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status diff --git a/api/tests/integration/features/featurestate/test_simple_featurestate_viewset.py b/api/tests/integration/features/featurestate/test_simple_featurestate_viewset.py index ba099e8b8ba5..6baf2352c761 100644 --- a/api/tests/integration/features/featurestate/test_simple_featurestate_viewset.py +++ b/api/tests/integration/features/featurestate/test_simple_featurestate_viewset.py @@ -2,7 +2,7 @@ import pytest from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status diff --git a/api/tests/integration/features/featurestate/test_webhooks.py b/api/tests/integration/features/featurestate/test_webhooks.py index 44bb33bc9f4f..85156c2c2d97 100644 --- a/api/tests/integration/features/featurestate/test_webhooks.py +++ b/api/tests/integration/features/featurestate/test_webhooks.py @@ -6,7 +6,7 @@ import responses from django.urls import reverse from freezegun import freeze_time -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/integration/features/multivariate/test_integration_multivariate.py b/api/tests/integration/features/multivariate/test_integration_multivariate.py index 8b89b2f49224..9f01664beb6a 100644 --- a/api/tests/integration/features/multivariate/test_integration_multivariate.py +++ b/api/tests/integration/features/multivariate/test_integration_multivariate.py @@ -2,7 +2,7 @@ import pytest from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/api/test_unit_api.py b/api/tests/unit/api/test_unit_api.py index 44601c375304..a54b9b375b00 100644 --- a/api/tests/unit/api/test_unit_api.py +++ b/api/tests/unit/api/test_unit_api.py @@ -1,6 +1,6 @@ import pytest from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/api_keys/test_user.py b/api/tests/unit/api_keys/test_user.py index 5093c14a36cb..c7a71683799d 100644 --- a/api/tests/unit/api_keys/test_user.py +++ b/api/tests/unit/api_keys/test_user.py @@ -1,5 +1,5 @@ import pytest -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from api_keys.models import MasterAPIKey from api_keys.user import APIKeyUser diff --git a/api/tests/unit/edge_api/identities/test_edge_api_identities_serializers.py b/api/tests/unit/edge_api/identities/test_edge_api_identities_serializers.py index 361118396f56..49374ceef516 100644 --- a/api/tests/unit/edge_api/identities/test_edge_api_identities_serializers.py +++ b/api/tests/unit/edge_api/identities/test_edge_api_identities_serializers.py @@ -1,7 +1,7 @@ import pytest from django.test import RequestFactory from django.utils import timezone -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from api_keys.user import APIKeyUser diff --git a/api/tests/unit/edge_api/identities/test_edge_identity_models.py b/api/tests/unit/edge_api/identities/test_edge_identity_models.py index 64c7740c44a8..6b2f845e1ef5 100644 --- a/api/tests/unit/edge_api/identities/test_edge_identity_models.py +++ b/api/tests/unit/edge_api/identities/test_edge_identity_models.py @@ -6,7 +6,7 @@ from django.utils import timezone from freezegun import freeze_time from pytest_django import DjangoAssertNumQueries -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from api_keys.user import APIKeyUser diff --git a/api/tests/unit/environments/test_unit_environments_views.py b/api/tests/unit/environments/test_unit_environments_views.py index 1b53ada87a55..30b0a9a71cd4 100644 --- a/api/tests/unit/environments/test_unit_environments_views.py +++ b/api/tests/unit/environments/test_unit_environments_views.py @@ -10,7 +10,7 @@ from django.urls import reverse from flag_engine.segments.constants import EQUAL from pytest_django import DjangoAssertNumQueries -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/environments/test_unit_environments_views_sdk_environment.py b/api/tests/unit/environments/test_unit_environments_views_sdk_environment.py index 4b471ab4b4a7..22a4f46e2573 100644 --- a/api/tests/unit/environments/test_unit_environments_views_sdk_environment.py +++ b/api/tests/unit/environments/test_unit_environments_views_sdk_environment.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils import timezone from django.utils.http import http_date -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/features/feature_segments/test_unit_feature_segments_views.py b/api/tests/unit/features/feature_segments/test_unit_feature_segments_views.py index ba1e99fffe1e..92fe9afc0f9e 100644 --- a/api/tests/unit/features/feature_segments/test_unit_feature_segments_views.py +++ b/api/tests/unit/features/feature_segments/test_unit_feature_segments_views.py @@ -10,7 +10,7 @@ from django.conf import settings from django.urls import reverse from pytest_django import DjangoAssertNumQueries -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/features/feature_states/test_unit_feature_states_views.py b/api/tests/unit/features/feature_states/test_unit_feature_states_views.py index d11244a590c4..99bd8428210e 100644 --- a/api/tests/unit/features/feature_states/test_unit_feature_states_views.py +++ b/api/tests/unit/features/feature_states/test_unit_feature_states_views.py @@ -4,7 +4,7 @@ import pytest from common.environments.permissions import UPDATE_FEATURE_STATE from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/features/multivariate/test_unit_multivariate_views.py b/api/tests/unit/features/multivariate/test_unit_multivariate_views.py index b98f1323155e..888a6dc5c73c 100644 --- a/api/tests/unit/features/multivariate/test_unit_multivariate_views.py +++ b/api/tests/unit/features/multivariate/test_unit_multivariate_views.py @@ -6,7 +6,7 @@ VIEW_PROJECT, ) from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from features.multivariate.views import MultivariateFeatureOptionViewSet diff --git a/api/tests/unit/features/test_unit_features_models.py b/api/tests/unit/features/test_unit_features_models.py index 4b5d07ecd23f..10c5f368a000 100644 --- a/api/tests/unit/features/test_unit_features_models.py +++ b/api/tests/unit/features/test_unit_features_models.py @@ -6,7 +6,7 @@ from django.core.exceptions import ValidationError from django.db.utils import IntegrityError from django.utils import timezone -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from environments.identities.models import Identity diff --git a/api/tests/unit/features/test_unit_features_tasks.py b/api/tests/unit/features/test_unit_features_tasks.py index 480b872a3d17..24e86fb6b684 100644 --- a/api/tests/unit/features/test_unit_features_tasks.py +++ b/api/tests/unit/features/test_unit_features_tasks.py @@ -1,5 +1,5 @@ import pytest -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from api_keys.models import MasterAPIKey diff --git a/api/tests/unit/features/test_unit_features_views.py b/api/tests/unit/features/test_unit_features_views.py index d4e95211f581..44fbf5a73b6c 100644 --- a/api/tests/unit/features/test_unit_features_views.py +++ b/api/tests/unit/features/test_unit_features_views.py @@ -23,7 +23,7 @@ from freezegun import freeze_time from pytest_django import DjangoAssertNumQueries from pytest_django.fixtures import SettingsWrapper -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/integrations/dynatrace/test_unit_dynatrace.py b/api/tests/unit/integrations/dynatrace/test_unit_dynatrace.py index 64afb3ca470c..609c22cb363b 100644 --- a/api/tests/unit/integrations/dynatrace/test_unit_dynatrace.py +++ b/api/tests/unit/integrations/dynatrace/test_unit_dynatrace.py @@ -2,7 +2,7 @@ import pytest from django.contrib.auth.models import AbstractUser -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from audit.models import AuditLog diff --git a/api/tests/unit/integrations/github/test_unit_github_views.py b/api/tests/unit/integrations/github/test_unit_github_views.py index 6f6cf5ead487..4e2abbdc1e8a 100644 --- a/api/tests/unit/integrations/github/test_unit_github_views.py +++ b/api/tests/unit/integrations/github/test_unit_github_views.py @@ -7,7 +7,7 @@ import requests import responses from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.response import Response diff --git a/api/tests/unit/organisations/invites/test_unit_invites_views.py b/api/tests/unit/organisations/invites/test_unit_invites_views.py index 2f2547f065e6..ad872220a753 100644 --- a/api/tests/unit/organisations/invites/test_unit_invites_views.py +++ b/api/tests/unit/organisations/invites/test_unit_invites_views.py @@ -9,7 +9,7 @@ from django.urls import reverse from django.utils import timezone from pytest_django.fixtures import SettingsWrapper -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock.plugin import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/organisations/subscriptions/test_unit_subscriptions_permissions.py b/api/tests/unit/organisations/subscriptions/test_unit_subscriptions_permissions.py index 166bf90bf47e..3a153aeed380 100644 --- a/api/tests/unit/organisations/subscriptions/test_unit_subscriptions_permissions.py +++ b/api/tests/unit/organisations/subscriptions/test_unit_subscriptions_permissions.py @@ -1,7 +1,7 @@ from unittest.mock import MagicMock import pytest -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework.request import Request from organisations.models import Organisation, Subscription diff --git a/api/tests/unit/organisations/test_unit_organisations_views.py b/api/tests/unit/organisations/test_unit_organisations_views.py index be0a07fd8ae3..96efd9872a66 100644 --- a/api/tests/unit/organisations/test_unit_organisations_views.py +++ b/api/tests/unit/organisations/test_unit_organisations_views.py @@ -15,7 +15,7 @@ from django.utils import timezone from freezegun import freeze_time from pytest_django.fixtures import SettingsWrapper -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from pytz import UTC from rest_framework import status diff --git a/api/tests/unit/permissions/permission_service/test_get_permitted_environments_for_user.py b/api/tests/unit/permissions/permission_service/test_get_permitted_environments_for_user.py index b47d3dcad6c8..93d3e77775f9 100644 --- a/api/tests/unit/permissions/permission_service/test_get_permitted_environments_for_user.py +++ b/api/tests/unit/permissions/permission_service/test_get_permitted_environments_for_user.py @@ -6,7 +6,7 @@ UPDATE_FEATURE_STATE, VIEW_ENVIRONMENT, ) -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from environments.models import Environment from environments.permissions.models import ( diff --git a/api/tests/unit/permissions/permission_service/test_get_permitted_projects_for_user.py b/api/tests/unit/permissions/permission_service/test_get_permitted_projects_for_user.py index 99a80f0e995c..47f1157f23c7 100644 --- a/api/tests/unit/permissions/permission_service/test_get_permitted_projects_for_user.py +++ b/api/tests/unit/permissions/permission_service/test_get_permitted_projects_for_user.py @@ -6,7 +6,7 @@ DELETE_FEATURE, VIEW_PROJECT, ) -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from organisations.models import Organisation, UserOrganisation from permissions.models import PermissionModel diff --git a/api/tests/unit/permissions/permission_service/test_is_user_environment_admin.py b/api/tests/unit/permissions/permission_service/test_is_user_environment_admin.py index 4b91851a7b31..556eec3b127f 100644 --- a/api/tests/unit/permissions/permission_service/test_is_user_environment_admin.py +++ b/api/tests/unit/permissions/permission_service/test_is_user_environment_admin.py @@ -2,7 +2,7 @@ import pytest from django.conf import settings -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from environments.models import Environment from environments.permissions.models import ( diff --git a/api/tests/unit/permissions/permission_service/test_is_user_project_admin.py b/api/tests/unit/permissions/permission_service/test_is_user_project_admin.py index 054f91bf3dd3..de95c546bf5e 100644 --- a/api/tests/unit/permissions/permission_service/test_is_user_project_admin.py +++ b/api/tests/unit/permissions/permission_service/test_is_user_project_admin.py @@ -1,7 +1,7 @@ import typing import pytest -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from organisations.models import Organisation, UserOrganisation from permissions.permission_service import is_user_project_admin diff --git a/api/tests/unit/permissions/permission_service/test_master_api_key_permission_service.py b/api/tests/unit/permissions/permission_service/test_master_api_key_permission_service.py index 8c8cfe466082..3d8940074f76 100644 --- a/api/tests/unit/permissions/permission_service/test_master_api_key_permission_service.py +++ b/api/tests/unit/permissions/permission_service/test_master_api_key_permission_service.py @@ -1,5 +1,5 @@ import pytest -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from environments.permissions.models import EnvironmentPermissionModel from organisations.permissions.models import OrganisationPermissionModel diff --git a/api/tests/unit/projects/tags/test_unit_projects_tags_views.py b/api/tests/unit/projects/tags/test_unit_projects_tags_views.py index ce31a9ba0c5e..2ffd74c05900 100644 --- a/api/tests/unit/projects/tags/test_unit_projects_tags_views.py +++ b/api/tests/unit/projects/tags/test_unit_projects_tags_views.py @@ -3,7 +3,7 @@ import pytest from common.projects.permissions import VIEW_PROJECT from django.urls import reverse -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/projects/test_unit_projects_views.py b/api/tests/unit/projects/test_unit_projects_views.py index 03747f288934..6d839380b956 100644 --- a/api/tests/unit/projects/test_unit_projects_views.py +++ b/api/tests/unit/projects/test_unit_projects_views.py @@ -11,7 +11,7 @@ from django.urls import reverse from django.utils import timezone from pytest_django.fixtures import SettingsWrapper -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/segments/test_unit_segments_views.py b/api/tests/unit/segments/test_unit_segments_views.py index 54e3cd786c81..4e8aeb17d721 100644 --- a/api/tests/unit/segments/test_unit_segments_views.py +++ b/api/tests/unit/segments/test_unit_segments_views.py @@ -13,7 +13,7 @@ from flag_engine.segments.constants import EQUAL from pytest_django import DjangoAssertNumQueries from pytest_django.fixtures import SettingsWrapper -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from rest_framework import status from rest_framework.test import APIClient diff --git a/api/tests/unit/sse/test_sse_service.py b/api/tests/unit/sse/test_sse_service.py index 8f60c1d6f6a3..3526ba09586a 100644 --- a/api/tests/unit/sse/test_sse_service.py +++ b/api/tests/unit/sse/test_sse_service.py @@ -3,7 +3,7 @@ from botocore.exceptions import ClientError from django.conf import settings from moto import mock_s3 # type: ignore[import-untyped] -from pytest_lazyfixture import lazy_fixture # type: ignore[import-untyped] +from pytest_lazy_fixtures import lf as lazy_fixture from pytest_mock import MockerFixture from sse.dataclasses import SSEAccessLogs