From 66ed61ee6abf6a93f9fde2dc59a7b2e6f328e1db Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Fri, 17 Sep 2021 10:09:20 -0400 Subject: [PATCH] Set default autofield to be compatible for django 3.2 --- demo/demodesk/config/settings.py | 4 ++++ demo/{demodesk => }/manage.py | 0 demo/setup.py | 5 +++-- helpdesk/apps.py | 3 +++ setup.py | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) rename demo/{demodesk => }/manage.py (100%) diff --git a/demo/demodesk/config/settings.py b/demo/demodesk/config/settings.py index 2a11d213..5c65d03a 100644 --- a/demo/demodesk/config/settings.py +++ b/demo/demodesk/config/settings.py @@ -214,6 +214,10 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media') # your own projects unless you make your own fixtures FIXTURE_DIRS = [os.path.join(BASE_DIR, 'fixtures')] + +# for Django 3.2+, set default for autofields: +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + try: from .local_settings import * except ImportError: diff --git a/demo/demodesk/manage.py b/demo/manage.py similarity index 100% rename from demo/demodesk/manage.py rename to demo/manage.py diff --git a/demo/setup.py b/demo/setup.py index 5361d9ed..21308cc4 100644 --- a/demo/setup.py +++ b/demo/setup.py @@ -13,7 +13,7 @@ project_root = os.path.dirname(here) NAME = 'django-helpdesk-demodesk' DESCRIPTION = 'A demo Django project using django-helpdesk' README = open(os.path.join(here, 'README.rst')).read() -VERSION = '0.3.0b3' +VERSION = '0.3.0b4' #VERSION = open(os.path.join(project_root, 'VERSION')).read().strip() AUTHOR = 'django-helpdesk team' URL = 'https://github.com/django-helpdesk/django-helpdesk' @@ -24,7 +24,8 @@ CLASSIFIERS = ['Development Status :: 4 - Beta', 'Programming Language :: Python :: 3.8', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.0', - 'Framework :: Django :: 3.1'] + 'Framework :: Django :: 3.1', + 'Framework :: Django :: 3.2'] KEYWORDS = [] PACKAGES = ['demodesk'] REQUIREMENTS = [ diff --git a/helpdesk/apps.py b/helpdesk/apps.py index a573b4ca..fff4c8f2 100644 --- a/helpdesk/apps.py +++ b/helpdesk/apps.py @@ -4,3 +4,6 @@ from django.apps import AppConfig class HelpdeskConfig(AppConfig): name = 'helpdesk' verbose_name = "Helpdesk" + # for Django 3.2 support: + # see: https://docs.djangoproject.com/en/3.2/ref/applications/#django.apps.AppConfig.default_auto_field + default_auto_field = 'django.db.models.AutoField' diff --git a/setup.py b/setup.py index b4d818db..5db5ad4b 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.3.0b3' +version = '0.3.0b4' # Provided as an attribute, so you can append to these instead # of replicating them: @@ -133,6 +133,7 @@ setup( 'Framework :: Django :: 2.2', "Framework :: Django :: 3.0", "Framework :: Django :: 3.1", + "Framework :: Django :: 3.2", "Environment :: Web Environment", "Operating System :: OS Independent", "Intended Audience :: Customer Service",