From f7ffcb0c1221fbd2f10b99ba6af38b21d306f970 Mon Sep 17 00:00:00 2001 From: Kyler Date: Wed, 5 Aug 2020 15:01:33 -0500 Subject: [PATCH] :pushpin: Update cacheops, filter, and Django consumption (#40) --- netbox/utilities/forms.py | 6 +++++- requirements.txt | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 979b6ac32..840efdc4e 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -7,7 +7,7 @@ import django_filters import yaml from django import forms from django.conf import settings -from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput +from django.contrib.postgres.forms.jsonb import JSONField as _JSONField from django.core.exceptions import MultipleObjectsReturned from django.db.models import Count from django.forms import BoundField @@ -28,6 +28,10 @@ BOOLEAN_WITH_BLANK_CHOICES = ( ) +class InvalidJSONInput(str): + pass + + def parse_numeric_range(string, base=10): """ Expand a numeric range (continuous or not) into a decimal or diff --git a/requirements.txt b/requirements.txt index 36a62815c..fdda7bae8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ Django>=3.0,<3.1 -django-cacheops==4.2 +django-cacheops==5.0.1 django-cors-headers==3.2.1 django-debug-toolbar==2.2 -django-filter==2.2.0 +django-filter==2.3.0 django-mptt==0.11.0 django-pglocks==1.0.4 django-prometheus==2.0.0