[layerindex-web][PATCH 07/15] Updates for Django 3.0
|
* Update requirements.txt versions
- Mostly update to latest pre-Django 3.1 versions * Fix deprecated axes.backends.AxesModelBackend - settings.py - docker/settings.py * Fix template syntax 'staticfiles' -> 'static' - base.html * Add migrations for layerbranch classicrecipe Signed-off-by: Tim Orling <timothy.t.orling@...> --- docker/settings.py | 3 ++- .../0045_layerbranch_classicrecipe.py | 19 +++++++++++++++ requirements.txt | 24 +++++++++---------- settings.py | 3 ++- templates/base.html | 2 +- 5 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 layerindex/migrations/0045_layerbranch_classicrecipe.py diff --git a/docker/settings.py b/docker/settings.py index 7330ab9..894974f 100644 --- a/docker/settings.py +++ b/docker/settings.py @@ -102,6 +102,7 @@ MIDDLEWARE = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'axes.middleware.AxesMiddleware', 'layerindex.middleware.NonAtomicRevisionMiddleware', ) @@ -161,7 +162,7 @@ INSTALLED_APPS = ( ) AUTHENTICATION_BACKENDS = [ - 'axes.backends.AxesModelBackend', + 'axes.backends.AxesBackend', 'django.contrib.auth.backends.ModelBackend', ] diff --git a/layerindex/migrations/0045_layerbranch_classicrecipe.py b/layerindex/migrations/0045_layerbranch_classicrecipe.py new file mode 100644 index 0000000..cb805c9 --- /dev/null +++ b/layerindex/migrations/0045_layerbranch_classicrecipe.py @@ -0,0 +1,19 @@ +# Generated by Django 3.0.14 on 2021-07-18 00:03 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('layerindex', '0044_extendedprovides'), + ] + + operations = [ + migrations.AlterField( + model_name='classicrecipe', + name='cover_layerbranch', + field=models.ForeignKey(blank=True, limit_choices_to={'branch__name': 'master'}, null=True, on_delete=django.db.models.deletion.SET_NULL, to='layerindex.LayerBranch', verbose_name='Covering layer'), + ), + ] diff --git a/requirements.txt b/requirements.txt index ac69589..895994b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,24 @@ -amqp==2.5.2 -beautifulsoup4==4.8.1 +amqp==2.6.1 +beautifulsoup4==4.9.3 billiard==3.6.1.0 celery==4.3.0 confusable-homoglyphs==3.2.0 Django>=3.0,<3.1 -django-appconf==1.0.3 -django-axes==4.5.4 +django-appconf==1.0.4 +django-axes==5.13.1 django-bootstrap-pagination==1.7.1 -django-cors-headers==3.0.2 -django-ipware==2.1.0 +django-cors-headers==3.2.1 +django-ipware==3.0.2 django-ranged-response==0.2.0 -django-registration==3.0.1 -django-reversion==2.0.13 -django-reversion-compare==0.8.6 -django-simple-captcha==0.5.12 -djangorestframework==3.9.4 +django-registration==3.1.2 +django-reversion==3.0.9 +django-reversion-compare==0.14.0 +django-simple-captcha==0.5.14 +djangorestframework==3.12.4 gitdb2==2.0.6 GitPython==2.1.13 kombu==4.6.3 -mysqlclient==1.4.4 +mysqlclient==1.4.6 Pillow==6.2.1 pytz==2019.3 six==1.12.0 diff --git a/settings.py b/settings.py index 1dd6ebc..d03d15c 100644 --- a/settings.py +++ b/settings.py @@ -102,6 +102,7 @@ MIDDLEWARE = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'axes.middleware.AxesMiddleware', 'layerindex.middleware.NonAtomicRevisionMiddleware', ) @@ -161,7 +162,7 @@ INSTALLED_APPS = ( ) AUTHENTICATION_BACKENDS = [ - 'axes.backends.AxesModelBackend', + 'axes.backends.AxesBackend', 'django.contrib.auth.backends.ModelBackend', ] diff --git a/templates/base.html b/templates/base.html index a465a68..f00c976 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,7 +9,7 @@ {% load i18n %} -{% load staticfiles %} +{% load static %} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -- 2.32.0 |
|
|