Merge pull request #35 from schemen/django3

Django3

dndtools/settings.py

@@ -10,12 +10,9 @@
 https://docs.djangoproject.com/en/2.0/ref/settings/
 """
 
-import os
-
 # import secret settings
 from .settings_secret import *
 
-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -32,7 +29,7 @@
 else:
     DEBUG = True
 
-ALLOWED_HOSTS =  ['*']
+ALLOWED_HOSTS = ['*']
 
 # Email
 
@@ -52,12 +49,11 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'django.contrib.sites',    
+    'django.contrib.sites',
     'paperminis.apps.PaperminisConfig',
     'widget_tweaks',
 ]
 
-
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -73,8 +69,8 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'templates/paperminis'), os.path.join(BASE_DIR, 'templates/registration')]
-        ,
+        'DIRS': [os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'templates/paperminis'),
+                 os.path.join(BASE_DIR, 'templates/registration')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -89,7 +85,6 @@
 
 WSGI_APPLICATION = 'dndtools.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
 if os.getenv('PRODUCTION', False) == "True":
@@ -111,7 +106,6 @@
         }
     }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
 
@@ -130,7 +124,6 @@
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
@@ -144,7 +137,6 @@
 
 USE_TZ = True
 
-
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
@@ -178,3 +170,6 @@
 
 # Due to BestiaryLink we need to set this value higher
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 2500
+
+# Set the AUTO_FIELD globally for Django 3.2
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

paperminis/migrations/0019_auto_20210831_0857.py

@@ -0,0 +1,43 @@
+# Generated by Django 3.2.6 on 2021-08-31 08:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('paperminis', '0018_auto_20210318_2032'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bestiary',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='creature',
+            name='id',
+            field=models.BigAutoField(primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='creaturequantity',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='printsettings',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

paperminis/models.py

@@ -152,7 +152,7 @@ class Creature(models.Model):
     )
 
     # fields
-    id = models.AutoField(primary_key=True)
+    id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=100)
     img_url = models.TextField(max_length=500)
     size = models.CharField(max_length=1, choices=CREATURE_SIZE_CHOICES, default=MEDIUM)
@@ -182,7 +182,7 @@ class Bestiary(models.Model):
     """Bestiary Model"""
 
     # fields
-    id = models.AutoField(primary_key=True)
+    id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=150)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
     from_ddb = models.BooleanField(default=False)

requirements.txt

@@ -1,4 +1,4 @@
-Django==2.2.24
+Django==3.2.6
 django-constrainedfilefield==4.0.0
 django-widget-tweaks==1.4.8
 fake-useragent==0.1.11

templates/index.html

@@ -1,7 +1,7 @@
 {% extends "base_generic.html" %}
 
 {% block content %}
-    {% load staticfiles %}
+    {% load static %}
     <div class="row">
         <div class="col-md-6">
             <div class="card">

templates/patreon.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 
-    {% load staticfiles %}
+    {% load static %}
     <div class="row">
         <div class="col-md-6">
             <div class="card">