Skip to content
Open
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: 1 addition & 1 deletion api/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 23 additions & 23 deletions api/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/tests/integration/core/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion api/tests/integration/core/test_user_rate_throttle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion api/tests/unit/api/test_unit_api.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion api/tests/unit/api_keys/test_user.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/tests/unit/features/test_unit_features_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/tests/unit/features/test_unit_features_tasks.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/tests/unit/features/test_unit_features_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading