From d0c84608bede6ca420885284aa9981028281b527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?= Date: Thu, 11 Mar 2021 05:48:56 +0300 Subject: [PATCH] Remove redundant Django 1.11 references --- docs/tutorial-relay.rst | 2 +- graphene_django/converter.py | 5 +---- graphene_django/settings.py | 5 +---- setup.py | 1 - tox.ini | 2 -- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/tutorial-relay.rst b/docs/tutorial-relay.rst index 8494da1..acc4b0d 100644 --- a/docs/tutorial-relay.rst +++ b/docs/tutorial-relay.rst @@ -281,7 +281,7 @@ from the command line. $ python ./manage.py runserver Performing system checks... - Django version 1.11, using settings 'cookbook.settings' + Django version 3.1.7, using settings 'cookbook.settings' Starting development server at http://127.0.0.1:8000/ Quit the server with CONTROL-C. diff --git a/graphene_django/converter.py b/graphene_django/converter.py index 6bbf534..da96161 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -238,10 +238,7 @@ def convert_onetoone_field_to_djangomodel(field, registry=None): if not _type: return - # We do this for a bug in Django 1.8, where null attr - # is not available in the OneToOneRel instance - null = getattr(field, "null", True) - return Field(_type, required=not null) + return Field(_type, required=not field.null) return Dynamic(dynamic_type) diff --git a/graphene_django/settings.py b/graphene_django/settings.py index c487123..467c6a3 100644 --- a/graphene_django/settings.py +++ b/graphene_django/settings.py @@ -16,10 +16,7 @@ from __future__ import unicode_literals from django.conf import settings from django.test.signals import setting_changed -try: - import importlib # Available in Python 3.1+ -except ImportError: - from django.utils import importlib # Will be removed in Django 1.9 +import importlib # Available in Python 3.1+ # Copied shamelessly from Django REST Framework diff --git a/setup.py b/setup.py index 4750671..fbc7d50 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,6 @@ setup( "Programming Language :: Python :: 3.8", "Programming Language :: Python :: Implementation :: PyPy", "Framework :: Django", - "Framework :: Django :: 1.11", "Framework :: Django :: 2.2", "Framework :: Django :: 3.0", ], diff --git a/tox.ini b/tox.ini index d476ba7..7128afe 100644 --- a/tox.ini +++ b/tox.ini @@ -26,8 +26,6 @@ setenv = deps = -e.[test] psycopg2-binary - django111: Django>=1.11,<2.0 - django111: djangorestframework<3.12 django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0