diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index e78135aa3..615ee8bed 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -14,6 +14,13 @@ from django.core.validators import URLValidator from netbox.config import PARAMS +# Monkey patch to fix Django 4.0 support for graphene-django (see +# https://github.com/graphql-python/graphene-django/issues/1284) +# TODO: Remove this when graphene-django 2.16 becomes available +import django +from django.utils.encoding import force_str +django.utils.encoding.force_text = force_str + # # Environment setup diff --git a/requirements.txt b/requirements.txt index ee24e0a6c..39e3630ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,8 +13,7 @@ django-taggit==2.1.0 django-timezone-field==5.0 djangorestframework==3.13.1 drf-yasg[validation]==1.20.0 -# Installing from branch pending v2.16 release -git+https://github.com/graphql-python/graphene-django.git@v2 +graphene-django==2.15.0 gunicorn==20.1.0 Jinja2==3.0.3 Markdown==3.3.6