Merge branch 'develop' into feature

This commit is contained in:
Jeremy Stretch
2024-10-11 11:29:36 -04:00
232 changed files with 3956 additions and 3334 deletions

View File

@@ -15,7 +15,7 @@ __all__ = [
# TODO: Remove in v4.2
warnings.warn(
f"Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.",
"Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.",
DeprecationWarning
)

View File

@@ -6,7 +6,7 @@ class TenancyConfig(AppConfig):
def ready(self):
from netbox.models.features import register_models
from . import search
from . import search # noqa: F401
# Register models
register_models(*self.get_models())

View File

@@ -2,7 +2,6 @@ import django_filters
from django.db.models import Q
from django.utils.translation import gettext as _
from extras.filters import TagFilter
from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet
from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter
from .models import *

View File

@@ -1,8 +1,6 @@
from typing import Annotated, List
import strawberry
import strawberry_django
__all__ = (
'ContactAssignmentsMixin',
@@ -12,4 +10,4 @@ __all__ = (
@strawberry.type
class ContactAssignmentsMixin:
assignments: List[Annotated["ContactAssignmentType", strawberry.lazy('tenancy.graphql.types')]]
assignments: List[Annotated["ContactAssignmentType", strawberry.lazy('tenancy.graphql.types')]] # noqa: F821