|
Re: [meta-zephyr][PATCH v3] meta-zephyr-bsp: Add autogenerated machines.
Eilís Ní Fhlannagáin
On Thu, 13 Jan 2022 at 23:17, Jon Mason <jdmason@...> wrote:
Yes. Some numbers on this after my poor laptop thrashed around on this for a bit. 395 boards in zephyr 2.7.1 391 boards autogenerated via this patch 299 (including the original 8 in meta-zephyr) that can build zephyr-helloworld. Compiling is taking forever, given the number of boards (and otherYes. Not a surprise on some of these. This patch tries to find the needed tune and sometimes just can't for various reasons. <snips> meta-zephyr-bsp/conf/machine/v2m-musca-b1.confNo, please. Be difficult, Jon. This is a radical change and needs a bit of review. I think maybe one solution here is (outside of making the search for tunes a bit better which will never be perfect as from an OE context as layers with a specific tune may not exist): - Run this pointing MACHINE_TUNINGS at the meta-arm-bsp layer and a few different layers. Or alternately, remove configs that exist in other layers. - Run a build on each machine generated to see if it passes helloworld - Remove any broken machines that don't pass that smoke test. Again, I'm very open to suggestions here. Outside the additional machines however, the one thing this patch series does give us is getting rid of MACHINEOVERRIDES for ZEPHYR_MODULES and lets west just figure this out. -b
|
|
|
|
Re: [meta-tensorflow][PATCH 3/3] tensorflow-lite: add recipe
Julien STEPHAN
Hi Hongxu Did you have a chance to take a look at it? Best Julien
Le ven. 24 déc. 2021 à 19:48, Randy MacLeod <randy.macleod@...> a écrit : Thanks Stephan.
|
|
|
|
Re: perf compilation fails
Michael Opdenacker
Hi Jose Antonio
On 1/13/22 3:29 PM, Cardenas Jose Antonio (JCARDENA) wrote: Weird, this doesn't happen building core-image-minimal *for x86_64* on the latest Poky, with gcc 11.2. This may not help much, but at least you could compare. Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
|
|
|
|
Re: [OE-core] Question of Yocto dunfell LTS period
Alexander Kanavin
Actually, I think this was some kind of missed PR opportunity. Regular distros, such as RHEL, Debian and everyone else, are constantly trotting out their support windows as the reason to hand them the job of making products, so we could counter that better perhaps. Alex
On Fri, 14 Jan 2022 at 06:28, Michael Opdenacker <michael.opdenacker@...> wrote:
|
|
|
|
Re: Installing specific systemd service file according to selected distro
Konrad Weihmann <kweihmann@...>
Fairly easy, each distro creates an OVERRIDE by default, so you could do
toggle quoted messageShow quoted text
A:poky = "foo.service" A:yourdistro = "bar.service" SYSTEMD_PACKAGES = "${A}" do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/${A} ${D}${systemd_system_unitdir} } you could also try to create distro-specific do_install appends like do_install:append:<yourdistro> if you need to do further step besides installing
On 14.01.22 06:54, davis roman wrote:
Hello,
|
|
|
|
[layerindex][PATCH 19/18] templates/*: staticfiles -> static
Tim Orling
In Django 3.0 the staticfiles tag was changed to static
Signed-off-by: Tim Orling <tim.orling@...> --- templates/layerindex/classicstats.html | 2 +- templates/rrs/base_toplevel.html | 2 +- templates/rrs/maintainers.html | 2 +- templates/rrs/recipedetail.html | 2 +- templates/rrs/recipes.html | 2 +- templates/rrs/rrs_stats.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/layerindex/classicstats.html b/templates/layerindex/classicstats.html index 18fdf70..b677520 100644 --- a/templates/layerindex/classicstats.html +++ b/templates/layerindex/classicstats.html @@ -1,6 +1,6 @@ {% extends "layerindex/classic_base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% comment %} diff --git a/templates/rrs/base_toplevel.html b/templates/rrs/base_toplevel.html index c2f1c21..7ba97ab 100644 --- a/templates/rrs/base_toplevel.html +++ b/templates/rrs/base_toplevel.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% comment %} diff --git a/templates/rrs/maintainers.html b/templates/rrs/maintainers.html index 217a060..c8f2418 100644 --- a/templates/rrs/maintainers.html +++ b/templates/rrs/maintainers.html @@ -1,6 +1,6 @@ {% extends "rrs/base_toplevel.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% comment %} diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html index e2bcfe2..8f90735 100644 --- a/templates/rrs/recipedetail.html +++ b/templates/rrs/recipedetail.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% comment %} diff --git a/templates/rrs/recipes.html b/templates/rrs/recipes.html index b62df87..663f547 100644 --- a/templates/rrs/recipes.html +++ b/templates/rrs/recipes.html @@ -1,6 +1,6 @@ {% extends "rrs/base_toplevel.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% comment %} diff --git a/templates/rrs/rrs_stats.html b/templates/rrs/rrs_stats.html index a13c8f2..52b723f 100644 --- a/templates/rrs/rrs_stats.html +++ b/templates/rrs/rrs_stats.html @@ -1,6 +1,6 @@ {% extends "rrs/base_toplevel.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% comment %} -- 2.30.2
|
|
|
|
Re: Question of Yocto dunfell LTS period
Matthias Klein
Hello together,
I would like to add a question to the topic: Why was the LTS period for dunfell extended? Can we expect the same for kirstone? Many greetings, Matthias -----Ursprüngliche Nachricht----- Von: yocto@... <yocto@...> Im Auftrag von Chanho Park via lists.yoctoproject.org Gesendet: Freitag, 14. Januar 2022 02:14 An: yocto@...; openembedded-core@... Cc: richard.purdie@...; steve@... Betreff: [yocto] Question of Yocto dunfell LTS period Dear folks, I found the lts period of Yocto dunfell has been extended from 2022.04 to 2024.04[1]. AFAIK, a Yocto LTS version has 2 years period. I tried to find any notice regarding this but I just found Richard's e-mail[2] in last year. Can I find any thread or notice regarding this extension? [1]: https://wiki.yoctoproject.org/wiki/Releases [2]: https://lore.kernel.org/yocto/3878e27fb895718b8c5d65f444fea443a56e0587.camel @linuxfoundation.org/ Best Regards, Chanho Park
|
|
|
|
[layerindex][PATCH 18/18] requirements.txt: bump all to latest
Tim Orling
Run pip-upgrade and update all to latest
Signed-off-by: Tim Orling <tim.orling@...> --- requirements.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index 41a0b1e..77b1aa9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,27 @@ -amqp==5.0.6 -beautifulsoup4==4.9.3 +amqp==5.0.9 +beautifulsoup4==4.10.0 billiard==3.6.4.0 -celery==5.1.2 +celery==5.2.3 confusable-homoglyphs==3.2.0 Django>=3.2,<3.3 -django-appconf==1.0.4 -django-axes==5.20.0 +django-appconf==1.0.5 +django-axes==5.31.0 django-bootstrap-pagination==1.7.1 -django-cors-headers==3.7.0 -django-ipware==3.0.2 +django-cors-headers==3.11.0 +django-ipware==4.0.2 django-ranged-response==0.2.0 django-registration==3.2 -django-reversion==4.0.0 -django-reversion-compare==0.14.0 +django-reversion==4.0.1 +django-reversion-compare==0.14.1 django-simple-captcha==0.5.14 -djangorestframework==3.12.4 -gitdb==4.0.7 -GitPython==3.1.18 -kombu==5.1.0 -mysqlclient==2.0.3 -Pillow==8.3.1 -pytz==2021.1 +djangorestframework==3.13.1 +gitdb==4.0.9 +GitPython==3.1.26 +kombu==5.2.3 +mysqlclient==2.1.0 +Pillow==9.0.0 +pytz==2021.3 six==1.16.0 -smmap==4.0.0 -soupsieve==2.2.1 +smmap==5.0.0 +soupsieve==2.3.1 vine==5.0.0 -- 2.30.2
|
|
|
|
[layerindex][PATCH 17/18] Dockerfile: add back python2 dependencies
Tim Orling
We have some layers and especially older releases that still support
python2. Add python2 dependencies back to the container so that the older releases still function. Signed-off-by: Tim Orling <tim.orling@...> --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 25ab5ea..4b2870a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ g++ \ gcc \ make \ + python-pip \ + python-mysqldb \ + python-dev \ + python-pil \ + python-wheel \ python3-pip \ python3-mysqldb \ python3-dev \ -- 2.30.2
|
|
|
|
[layerindex][PATCH 16/18] rrs: add 0030_alter_recipeupgrade_maintainer.py miagration
Tim Orling
Signed-off-by: Tim Orling <tim.orling@...>
--- .../0030_alter_recipeupgrade_maintainer.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 rrs/migrations/0030_alter_recipeupgrade_maintainer.py diff --git a/rrs/migrations/0030_alter_recipeupgrade_maintainer.py b/rrs/mi= grations/0030_alter_recipeupgrade_maintainer.py new file mode 100644 index 0000000..7044739 --- /dev/null +++ b/rrs/migrations/0030_alter_recipeupgrade_maintainer.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*-=0D +# Generated by Django 3.2.11 on 2022-01-13 22:16=0D +=0D +from django.db import migrations, models=0D +import django.db.models.deletion=0D +=0D +=0D +class Migration(migrations.Migration):=0D +=0D + dependencies =3D [=0D + ('rrs', '0029_rrs_license_group'),=0D + ]=0D +=0D + operations =3D [=0D + migrations.AlterField(=0D + model_name=3D'recipeupgrade',=0D + name=3D'maintainer',=0D + field=3Dmodels.ForeignKey(blank=3DTrue, null=3DTrue, on_delete= =3Ddjango.db.models.deletion.SET_NULL, to=3D'rrs.maintainer'),=0D + ),=0D + ]=0D --=20 2.30.2
|
|
|
|
[layerindex][PATCH 15/18] Dockerfile: fix warnings
Tim Orling
* Define LANGUAGE
* Set DEBIAN_FRONTEND=noninteractive before apt call Signed-off-by: Tim Orling <tim.orling@...> --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f6623fa..25ab5ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ FROM debian:buster LABEL maintainer="Michael Halstead <mhalstead@...>" ENV PYTHONUNBUFFERED=1 \ + LANGUAGE=en_US \ LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 \ LC_CTYPE=en_US.UTF-8 @@ -15,7 +16,7 @@ ENV PYTHONUNBUFFERED=1 \ # NOTE: we don't purge gcc below as we have some places in the OE metadata that look for it COPY requirements.txt / -RUN apt-get update \ +RUN DEBIAN_FRONTEND=noninteractive apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ g++ \ -- 2.30.2
|
|
|
|
[layerindex][PATCH 14/18] rrs/admin.py: drop curry import
Tim Orling
Dropped in Django 3.0 [1]
Suggested replacements are functools.partial() or functools.partialmethod() [2] [1] https://docs.djangoproject.com/en/4.0/releases/3.0/ [2] https://github.com/django/django/commit/5b1c389603a353625ae1603ba345147356336afb Signed-off-by: Tim Orling <tim.orling@...> --- rrs/admin.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/rrs/admin.py b/rrs/admin.py index 402279f..25e9125 100644 --- a/rrs/admin.py +++ b/rrs/admin.py @@ -6,8 +6,6 @@ # # SPDX-License-Identifier: MIT -from django.utils.functional import curry - from django.contrib import admin from django.contrib.admin import DateFieldListFilter from django import forms -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 13/18] README.devel: update versions
Tim Orling
This updated code-base should be compatible with
Django 3.1 and obviously 3.2 (but not 3.0 or earlier). Django 3.2 requires Python 3.6+. With the upgrade to Celery 5, it is safer to recommend RabbitMQ 3.8.x, since that is what we are using. Signed-off-by: Tim Orling <tim.orling@...> --- README.devel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.devel b/README.devel index 347dafc..78fbfbb 100644 --- a/README.devel +++ b/README.devel @@ -7,9 +7,9 @@ covered in the main README. In order to run this application standalone, you will need: -* Python 3.5+ -* Django 2.2.x -* RabbitMQ 3.7.x +* Python 3.6+ +* Django 3.2.x (not compatible with 3.0 or older) +* RabbitMQ 3.8.x * For production usage, a web server set up to host Django applications (not needed for local-only testing/development) * A database system supported by Django (SQLite, MariaDB/MySQL, etc.). -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 12/18] docker-compose: fix celery
Tim Orling
In celery 5, the --workdir argument must come
before the 'worker' subcommand. Without this, celery cannot load the layerindex module and this causes the celery container to continually restart. Signed-off-by: Tim Orling <tim.orling@...> --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3e16e95..2dfff41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,7 +80,7 @@ services: #- "EMAIL_USE_TLS=<set this here if needed>" #- "DEBUG=1" restart: unless-stopped - command: /usr/local/bin/celery -A layerindex.tasks worker --loglevel=info --workdir=/opt/layerindex + command: /usr/local/bin/celery --workdir=/opt/layerindex --app layerindex.tasks worker --loglevel=INFO #layerscertbot: # image: certbot/certbot # volumes: -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 11/18] settings: set DEFAULT_AUTO_FIELD
Tim Orling
New in Django 3.2
To quiet warnings, set DEFAULT_AUTO_FIELD to the default value 'django.db.models.AutoField' NOTE: The default value for newly created Django 3.2 projects is django.db.models.BigAutoField, but this causes the need for a migration in 'captcha'. Signed-off-by: Tim Orling <tim.orling@...> --- docker/settings.py | 3 +++ settings.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docker/settings.py b/docker/settings.py index 894974f..a3f007d 100644 --- a/docker/settings.py +++ b/docker/settings.py @@ -140,6 +140,9 @@ TEMPLATES = [ }, ] +# New in Django 3.2 +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/settings.py b/settings.py index d03d15c..a69eb53 100644 --- a/settings.py +++ b/settings.py @@ -140,6 +140,9 @@ TEMPLATES = [ }, ] +# New in Django 3.2 +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 10/18] requirements.txt: bump to Django 3.2 LTS
Tim Orling
Upgrade to the latest Django 3.2.x LTS for
extended support up until April 2024. Signed-off-by: Tim Orling <tim.orling@...> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7704ac0..41a0b1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ beautifulsoup4==4.9.3 billiard==3.6.4.0 celery==5.1.2 confusable-homoglyphs==3.2.0 -Django>=3.1,<3.2 +Django>=3.2,<3.3 django-appconf==1.0.4 django-axes==5.20.0 django-bootstrap-pagination==1.7.1 -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 09/18] requirements.txt: update all to latest
Tim Orling
Since we are on a "modern" version of Python in
Debian buster container (3.7) and a modern version of Django (3.1.x) we should be able to run with the latest of all dependencies. Signed-off-by: Tim Orling <tim.orling@...> --- requirements.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 865960c..7704ac0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,27 @@ -amqp==2.6.1 +amqp==5.0.6 beautifulsoup4==4.9.3 -billiard==3.6.1.0 -celery==4.3.0 +billiard==3.6.4.0 +celery==5.1.2 confusable-homoglyphs==3.2.0 Django>=3.1,<3.2 django-appconf==1.0.4 -django-axes==5.13.1 +django-axes==5.20.0 django-bootstrap-pagination==1.7.1 -django-cors-headers==3.2.1 +django-cors-headers==3.7.0 django-ipware==3.0.2 django-ranged-response==0.2.0 -django-registration==3.1.2 -django-reversion==3.0.9 +django-registration==3.2 +django-reversion==4.0.0 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.6 -Pillow==6.2.1 -pytz==2019.3 -six==1.12.0 -smmap2==2.0.5 -soupsieve==1.9.4 -vine==1.3.0 +gitdb==4.0.7 +GitPython==3.1.18 +kombu==5.1.0 +mysqlclient==2.0.3 +Pillow==8.3.1 +pytz==2021.1 +six==1.16.0 +smmap==4.0.0 +soupsieve==2.2.1 +vine==5.0.0 -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 08/18] docker-compose: bump mariadb to 10.3
Tim Orling
10.2 was based on Ubuntu bionic 18.04,
bumping to 10.3 as it is the first release on Ubuntu focal 20.04 Signed-off-by: Tim Orling <tim.orling@...> --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 44260b6..3e16e95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: layersdb: - image: mariadb:10.2 + image: mariadb:10.3 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --wait_timeout=28800 --max_allowed_packet=128M environment: - "MYSQL_DATABASE=layersdb" -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 07/18] requirements.txt: bump to Django 3.1
Tim Orling
Another incremental upgrade towards 3.2 LTS
Signed-off-by: Tim Orling <tim.orling@...> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 895994b..865960c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ beautifulsoup4==4.9.3 billiard==3.6.1.0 celery==4.3.0 confusable-homoglyphs==3.2.0 -Django>=3.0,<3.1 +Django>=3.1,<3.2 django-appconf==1.0.4 django-axes==5.13.1 django-bootstrap-pagination==1.7.1 -- 2.30.2
|
|
|
|
[layerindex][PATCH v2 06/18] Updates for Django 3.0
Tim Orling
* 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@...> --- 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.30.2
|
|
|