From 42322dc43ee333daa5b3dc844adbc0c6c13ace1a Mon Sep 17 00:00:00 2001 From: David Slusser Date: Sat, 8 May 2021 14:38:14 -0700 Subject: [PATCH] updates to support django 3.2 --- requirements.txt | 7 ++- userextensions/__init__.py | 2 +- .../migrations/0006_auto_20210507_1831.py | 43 +++++++++++++++++++ .../custom/manage_service_accounts.html | 2 +- .../userextensions/detail/detail_user.html | 2 +- .../userextensions/userextensions_base.htm | 2 +- 6 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 userextensions/migrations/0006_auto_20210507_1831.py diff --git a/requirements.txt b/requirements.txt index c6835cf..dc425ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -Django>=2.2.9,<3.0.0 -django-braces==1.13.0 -django-handyhelpers>=0.0.25,<1.0.0 -djangorestframework==3.11.0 +Django==3.2 +django-braces==1.14.0 +django-handyhelpers>=0.1.0 Sphinx==1.8.5 diff --git a/userextensions/__init__.py b/userextensions/__init__.py index 6014a69..f2f2658 100644 --- a/userextensions/__init__.py +++ b/userextensions/__init__.py @@ -7,7 +7,7 @@ """ __title__ = 'django-userextensions' -__version__ = '0.0.15' +__version__ = '0.1.0' __author__ = 'David Slusser' __email__ = 'dbslusser@gmail.com' __license__ = 'GPL-3.0' diff --git a/userextensions/migrations/0006_auto_20210507_1831.py b/userextensions/migrations/0006_auto_20210507_1831.py new file mode 100644 index 0000000..1f67133 --- /dev/null +++ b/userextensions/migrations/0006_auto_20210507_1831.py @@ -0,0 +1,43 @@ +# Generated by Django 3.2 on 2021-05-07 18:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('userextensions', '0005_auto_20201114_0548'), + ] + + operations = [ + migrations.AlterField( + model_name='serviceaccount', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='serviceaccounttokenhistory', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='theme', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='userfavorite', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='userpreference', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='userrecent', + name='id', + field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] diff --git a/userextensions/templates/userextensions/custom/manage_service_accounts.html b/userextensions/templates/userextensions/custom/manage_service_accounts.html index aaaa922..81583a0 100644 --- a/userextensions/templates/userextensions/custom/manage_service_accounts.html +++ b/userextensions/templates/userextensions/custom/manage_service_accounts.html @@ -1,5 +1,5 @@ {% extends base_template|default:"userextensions/userextensions_base.htm" %} -{% load staticfiles %} +{% load static %} {% block local_head %} {% include 'handyhelpers/component/clipboard.htm' %} diff --git a/userextensions/templates/userextensions/detail/detail_user.html b/userextensions/templates/userextensions/detail/detail_user.html index c337f59..0733520 100644 --- a/userextensions/templates/userextensions/detail/detail_user.html +++ b/userextensions/templates/userextensions/detail/detail_user.html @@ -1,5 +1,5 @@ {% extends base_template|default:"userextensions/userextensions_base.htm" %} -{% load staticfiles %} +{% load static %} {% block local_head %} {% include 'handyhelpers/component/clipboard.htm' %} diff --git a/userextensions/templates/userextensions/userextensions_base.htm b/userextensions/templates/userextensions/userextensions_base.htm index 8023a13..ff7e754 100644 --- a/userextensions/templates/userextensions/userextensions_base.htm +++ b/userextensions/templates/userextensions/userextensions_base.htm @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} {% load userextension_tags %}