Upgrade to Django 2 (#42)

* Upgrade to Django==2.0.13 * Add missing ON DELETE CASCADE to old migrations * Upgrade to Django==2.2.17 Hoping to solve string type problem, in case related to python 3.9 * Replace auth_views.login/logout with auth_views.LoginView/LogoutView * %s/MIDDLEWARE_CLASSES/MIDDLEWARE * Update to default Django 2.2 middleware * Resolve TypeError by removing byte qualifier in M2M fields in migrations Was getting this error when trying to run migrations, the stack trace pointing at M2M fields: TypeError: attribute name must be string, not 'bytes' * Drop parens from user.is_authenticated * Change Login/LogoutView to Login/LogoutView.as_view() * Nest login.html in registration dir * Upgrade to 2.2.26 * Upgrade to sorl-thumbnail==12.4.1 Note: thumbnail.0001_initial migration was not in my django_migrataion table, so after this upgrade I was prompted to apply the migration, which then errored out because the thumbnail_kvstore table already exists. Probably related to the issue here: jazzband/sorl-thumbnail#458 To fix, I just manually added a row to django_migrations to indicate that this migration was already applied. * Upgrade to sorl-thumbnail==12.5.0 This fixes the bug on the UploadedImage admin (due to sorl thumbnail widget compatibility) * Upgrade all the way to sorl-thumbnail==12.7.0 * Upgrade to django-taggit==2.0.0 * Restore cors middleware (and upgrade package)
katur · Jan 21, 2022 · 0f3c310 · 0f3c310
1 parent e5961aa
commit 0f3c310
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 38 deletions.
diff --git a/birds/migrations/0001_initial.py b/birds/migrations/0001_initial.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -39,7 +40,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='MinnesotaSpecies',
             fields=[
-                ('species', models.OneToOneField(primary_key=True, serialize=False, to='birds.Species')),
+                ('species', models.OneToOneField(primary_key=True, serialize=False, to='birds.Species', on_delete=django.db.models.deletion.CASCADE)),
                 ('include_in_book', models.NullBooleanField(default=None)),
                 ('mou_status', models.CharField(max_length=50, verbose_name=b'MOU status', blank=True)),
                 ('mou_breeding_status', models.NullBooleanField(default=None, verbose_name=b'MOU breeding status')),
@@ -80,19 +81,19 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='taxonomicgroup',
             name='level',
-            field=models.ForeignKey(to='birds.TaxonomicLevel'),
+            field=models.ForeignKey(to='birds.TaxonomicLevel', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='taxonomicgroup',
             name='parent',
-            field=models.ForeignKey(blank=True, to='birds.TaxonomicGroup', null=True),
+            field=models.ForeignKey(blank=True, to='birds.TaxonomicGroup', null=True, on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='species',
             name='parent',
-            field=models.ForeignKey(to='birds.TaxonomicGroup'),
+            field=models.ForeignKey(to='birds.TaxonomicGroup', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
     ]
diff --git a/birds/views.py b/birds/views.py
@@ -32,7 +32,7 @@ def bird(request, slug):
 
         if actual_creation.is_public:
             public_creations.append(actual_creation)
-        elif request.user.is_authenticated():
+        elif request.user.is_authenticated:
             private_creations.append(actual_creation)
         else:
             continue

diff --git a/creations/migrations/0001_initial.py b/creations/migrations/0001_initial.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -25,7 +26,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Book',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('purchase_url', models.CharField(max_length=500, blank=True)),
                 ('photo', models.ImageField(null=True, upload_to=b'books', blank=True)),
                 ('publisher', models.CharField(max_length=100, blank=True)),
@@ -42,7 +43,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='RadioProgram',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('original_air_date', models.DateField(null=True, blank=True)),
                 ('file', models.FileField(null=True, upload_to=b'radio', blank=True)),
                 ('supplemental_content_url', models.CharField(max_length=500, blank=True)),

diff --git a/creations/migrations/0005_article_blogpost.py b/creations/migrations/0005_article_blogpost.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Article',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('published_by', models.CharField(max_length=100, blank=True)),
                 ('date_published', models.DateField(null=True, blank=True)),
                 ('url', models.URLField(blank=True)),
@@ -28,7 +29,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='BlogPost',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('url', models.URLField(blank=True)),
             ],
             options={

diff --git a/creations/migrations/0006_auto_20140912_2327.py b/creations/migrations/0006_auto_20140912_2327.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Research',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('date', models.DateField(null=True, blank=True)),
                 ('url', models.URLField(blank=True)),
                 ('file', models.FileField(null=True, upload_to=b'research', blank=True)),

diff --git a/creations/migrations/0009_research_category.py b/creations/migrations/0009_research_category.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='research',
             name='category',
-            field=models.ForeignKey(default=1, to='creations.ResearchCategory'),
+            field=models.ForeignKey(default=1, to='creations.ResearchCategory', on_delete=django.db.models.deletion.CASCADE),
             preserve_default=False,
         ),
     ]
diff --git a/creations/migrations/0015_webpage.py b/creations/migrations/0015_webpage.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='WebPage',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('slug', models.SlugField(max_length=255, editable=False)),
                 ('content', models.TextField(blank=True)),
             ],

diff --git a/creations/migrations/0017_externalproject.py b/creations/migrations/0017_externalproject.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ExternalProject',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('url', models.URLField(blank=True)),
             ],
             options={

diff --git a/creations/migrations/0018_researchcategory_parent.py b/creations/migrations/0018_researchcategory_parent.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='researchcategory',
             name='parent',
-            field=models.ForeignKey(blank=True, to='creations.ResearchCategory', null=True),
+            field=models.ForeignKey(blank=True, to='creations.ResearchCategory', null=True, on_delete=django.db.models.deletion.CASCADE),
             preserve_default=True,
         ),
     ]
diff --git a/creations/migrations/0020_abafieldguideimage.py b/creations/migrations/0020_abafieldguideimage.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='ABAFieldGuideImage',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
                 ('filepath', models.CharField(max_length=500, blank=True)),
             ],
             options={

diff --git a/creations/migrations/0024_auto_20150726_1324.py b/creations/migrations/0024_auto_20150726_1324.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,7 +15,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='SpeakingProgram',
             fields=[
-                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation')),
+                ('creation_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='creations.Creation', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ['-title'],

diff --git a/creations/migrations/0027_speakingpresentationfile.py b/creations/migrations/0027_speakingpresentationfile.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField(null=True, blank=True)),
                 ('description', models.TextField(help_text=b'Use Markdown syntax for italics, bullets, etc. See <a href="http://www.darkcoding.net/software/markdown-quick-reference">a quick reference</a>, <a href="http://www.markdowntutorial.com/">a tutorial</a>, or practice <a href="http://dillinger.io/">here</a>. ', blank=True)),
                 ('file', models.FileField(null=True, upload_to=b'presentations', blank=True)),
-                ('program', models.ForeignKey(to='creations.SpeakingProgram')),
+                ('program', models.ForeignKey(to='creations.SpeakingProgram', on_delete=django.db.models.deletion.CASCADE)),
             ],
         ),
     ]
diff --git a/creations/migrations/0028_auto_20151017_1636.py b/creations/migrations/0028_auto_20151017_1636.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField(null=True, blank=True)),
                 ('description', models.TextField(help_text=b'Use Markdown syntax for italics, bullets, etc. See <a href="http://www.darkcoding.net/software/markdown-quick-reference">a quick reference</a>, <a href="http://www.markdowntutorial.com/">a tutorial</a>, or practice <a href="http://dillinger.io/">here</a>. ', blank=True)),
                 ('file', models.FileField(null=True, upload_to=b'presentations', blank=True)),
-                ('program', models.ForeignKey(to='creations.SpeakingProgram')),
+                ('program', models.ForeignKey(to='creations.SpeakingProgram', on_delete=django.db.models.deletion.CASCADE)),
             ],
         ),
         migrations.RemoveField(

diff --git a/creations/migrations/0030_auto_20151017_1819.py b/creations/migrations/0030_auto_20151017_1819.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField(null=True, blank=True)),
                 ('description', models.TextField(help_text=b'Use Markdown syntax for italics, bullets, etc. See <a href="http://www.darkcoding.net/software/markdown-quick-reference">a quick reference</a>, <a href="http://www.markdowntutorial.com/">a tutorial</a>, or practice <a href="http://dillinger.io/">here</a>. ', blank=True)),
                 ('file', models.FileField(null=True, upload_to=b'speaking', blank=True)),
-                ('program', models.ForeignKey(to='creations.SpeakingProgram')),
+                ('program', models.ForeignKey(to='creations.SpeakingProgram', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ['date'],

diff --git a/creations/migrations/0032_book_cover_photo.py b/creations/migrations/0032_book_cover_photo.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -15,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='book',
             name='cover_photo',
-            field=models.ForeignKey(blank=True, to='website.UploadedImage', null=True),
+            field=models.ForeignKey(blank=True, to='website.UploadedImage', null=True, on_delete=django.db.models.deletion.CASCADE),
         ),
     ]
diff --git a/creations/migrations/0034_radioprogramairdate.py b/creations/migrations/0034_radioprogramairdate.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -16,7 +17,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('date', models.DateField()),
-                ('program', models.ForeignKey(to='creations.RadioProgram')),
+                ('program', models.ForeignKey(to='creations.RadioProgram', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ['date'],

diff --git a/creations/migrations/0036_radioprogram_original_air_date.py b/creations/migrations/0036_radioprogram_original_air_date.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='radioprogram',
             name='original_air_date',
-            field=models.OneToOneField(null=True, blank=True, to='creations.RadioProgramAirDate'),
+            field=models.OneToOneField(null=True, blank=True, to='creations.RadioProgramAirDate', on_delete=django.db.models.deletion.CASCADE),
         ),
     ]
diff --git a/creations/migrations/0045_auto_20151101_1411.py b/creations/migrations/0045_auto_20151101_1411.py
@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -16,7 +17,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('date', models.DateField()),
-                ('program', models.ForeignKey(to='creations.RadioProgram')),
+                ('program', models.ForeignKey(to='creations.RadioProgram', on_delete=django.db.models.deletion.CASCADE)),
             ],
             options={
                 'ordering': ['-date'],

diff --git a/creations/views.py b/creations/views.py
@@ -44,7 +44,7 @@ def miscellany(request):
     """
     Render the landing page for miscellaneous projects.
     """
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         webpages = WebPage.objects.all()
     else:
         webpages = WebPage.objects.filter(is_public=True)
@@ -234,7 +234,7 @@ def research_category(request, id):
 def research_item(request, id):
     research_item = get_object_or_404(Research, id=id)
 
-    if not research_item.is_public and not request.user.is_authenticated():
+    if not research_item.is_public and not request.user.is_authenticated:
         raise Http404
 
     context = {

diff --git a/forthebirds/settings.py b/forthebirds/settings.py
@@ -63,7 +63,8 @@
     'waystohelp',
 ]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',

diff --git a/forthebirds/urls.py b/forthebirds/urls.py
@@ -19,9 +19,9 @@
 
 urlpatterns += [
     url(r'^admin/', admin.site.urls),
-    url(r'^login/$', auth_views.login, {'template_name': 'login.html'},
-        name='login_url'),
-    url(r'^logout/$', auth_views.logout, name='logout_url'),
+    url(r'^login/$', auth_views.LoginView.as_view(),
+        {'template_name': 'login.html'}, name='login_url'),
+    url(r'^logout/$', auth_views.LogoutView.as_view(), name='logout_url'),
 
     url(r'^', include('website.urls')),
     url(r'^(?P<path>bird\/Species\/.+)$', try_old_website),

diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
 certifi==2019.3.9
 chardet==3.0.4
 charset-normalizer==2.0.10
-Django==1.11.29
-django-cors-headers==1.1.0
+Django==2.2.26
+django-cors-headers==3.10.1
 django-jquery==1.9.1
-django-taggit==1.1.0
+django-taggit==2.0.0
 flickrapi==2.4.0
 idna==2.8
 Markdown==3.3.3
@@ -18,5 +18,5 @@ requests==2.27.1
 requests-oauthlib==1.2.0
 requests-toolbelt==0.9.1
 six==1.12.0
-sorl-thumbnail==12.3
+sorl-thumbnail==12.7.0
 urllib3==1.26.5