MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 12:49:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates for Django 3.0

Browse Source 
* 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 <tim.orling@konsulko.com>
This commit is contained in:
Tim Orling 2022-01-13 20:58:52 -08:00
parent 094c89bc70
commit a027959343
5 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/settings.py
View File

@ -102,6 +102,7 @@ MIDDLEWARE = (
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'axes.middleware.AxesMiddleware',
'layerindex.middleware.NonAtomicRevisionMiddleware', 'layerindex.middleware.NonAtomicRevisionMiddleware',
) )
@ -161,7 +162,7 @@ INSTALLED_APPS = (
) )
AUTHENTICATION_BACKENDS = [ AUTHENTICATION_BACKENDS = [
'axes.backends.AxesModelBackend', 'axes.backends.AxesBackend',
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',
] ]

19
layerindex/migrations/0045_layerbranch_classicrecipe.py Normal file
View File

@ -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'),
),
]

24
requirements.txt
View File

@ -1,24 +1,24 @@
amqp==2.5.2 amqp==2.6.1
beautifulsoup4==4.8.1 beautifulsoup4==4.9.3
billiard==3.6.1.0 billiard==3.6.1.0
celery==4.3.0 celery==4.3.0
confusable-homoglyphs==3.2.0 confusable-homoglyphs==3.2.0
Django>=3.0,<3.1 Django>=3.0,<3.1
django-appconf==1.0.3 django-appconf==1.0.4
django-axes==4.5.4 django-axes==5.13.1
django-bootstrap-pagination==1.7.1 django-bootstrap-pagination==1.7.1
django-cors-headers==3.0.2 django-cors-headers==3.2.1
django-ipware==2.1.0 django-ipware==3.0.2
django-ranged-response==0.2.0 django-ranged-response==0.2.0
django-registration==3.0.1 django-registration==3.1.2
django-reversion==2.0.13 django-reversion==3.0.9
django-reversion-compare==0.8.6 django-reversion-compare==0.14.0
django-simple-captcha==0.5.12 django-simple-captcha==0.5.14
djangorestframework==3.9.4 djangorestframework==3.12.4
gitdb2==2.0.6 gitdb2==2.0.6
GitPython==2.1.13 GitPython==2.1.13
kombu==4.6.3 kombu==4.6.3
mysqlclient==1.4.4 mysqlclient==1.4.6
Pillow==6.2.1 Pillow==6.2.1
pytz==2019.3 pytz==2019.3
six==1.12.0 six==1.12.0

3
settings.py
View File

@ -102,6 +102,7 @@ MIDDLEWARE = (
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'axes.middleware.AxesMiddleware',
'layerindex.middleware.NonAtomicRevisionMiddleware', 'layerindex.middleware.NonAtomicRevisionMiddleware',
) )
@ -161,7 +162,7 @@ INSTALLED_APPS = (
) )
AUTHENTICATION_BACKENDS = [ AUTHENTICATION_BACKENDS = [
'axes.backends.AxesModelBackend', 'axes.backends.AxesBackend',
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',
] ]

2
templates/base.html
View File

@ -9,7 +9,7 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load static %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">