Skip to content
Merged
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
3 changes: 1 addition & 2 deletions base_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ django-timezone-field

# A REST API framework for Django projects
# https://www.django-rest-framework.org/community/release-notes/
# TODO: Re-evaluate the monkey-patch of get_unique_validators() before upgrading
djangorestframework==3.18.0
djangorestframework>=3.18.2

# Sane and flexible OpenAPI 3 schema generation for Django REST framework.
# https://github.com/tfranzel/drf-spectacular/blob/master/CHANGELOG.rst
Expand Down
39 changes: 0 additions & 39 deletions netbox/netbox/monkey.py

This file was deleted.

7 changes: 0 additions & 7 deletions netbox/netbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
from utilities.security import validate_peppers
from utilities.string import trailing_slash

from .monkey import get_unique_validators

#
# Environment setup
#
Expand Down Expand Up @@ -1044,7 +1042,6 @@ def _setting(name, default=None):
#

from django.db import models # noqa: E402
from rest_framework.utils import field_mapping # noqa: E402
from strawberry.schema.types.scalar import DEFAULT_SCALAR_REGISTRY # noqa: E402
from strawberry_django import pagination # noqa: E402
from strawberry_django.fields.field import StrawberryDjangoField # noqa: E402
Expand All @@ -1053,10 +1050,6 @@ def _setting(name, default=None):
from netbox.graphql.pagination import OffsetPaginationInput, apply_pagination # noqa: E402
from netbox.graphql.scalars import BigInt, BigIntScalar # noqa: E402

# TODO: Remove this once #20547 has been implemented
# Override DRF's get_unique_validators() function with our own (see bug #19302)
field_mapping.get_unique_validators = get_unique_validators

# Override strawberry-django's OffsetPaginationInput class to add the `start` parameter
pagination.OffsetPaginationInput = OffsetPaginationInput

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ django-storages==1.14.6
django-tables2==3.0.1
django-taggit==6.1.0
django-timezone-field==7.2.2
djangorestframework==3.18.0
djangorestframework==3.18.3
drf-spectacular==0.30.0
drf-spectacular-sidecar==2026.10.1
feedparser==6.0.14
Expand Down
Loading