toaster:django_2_2_13207
cover toaster:django_2_2_13207
From: David Reyna <[email protected]>
Toaster: Patch to move from deprecated Django-1.x to Django-2.2
* The primary changes are API updated limited to:
1) Move to "django.urls"
2) Explicit "on_delete=models.CASCADE", even in migration files
3) Move from "MIDDLEWARE_CLASSES" to "MIDDLEWARE"
4) And other minor API paperwork
* This patch set has been extensively tested at Wind River.
The following changes since commit 1bf1e1539fb72f0bc594b4b2367482dd13c8c633:
linux-yocto/5.4: configuration tweaks (2020-03-25 10:02:50 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib dreyna/toaster/django_2_2_13207
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/toaster/django_2_2_13207
David Reyna (1):
toaster: migrate to Django-2.2
lib/toaster/bldcollector/views.py | 2 +- lib/toaster/bldcontrol/migrations/0001_initial.py | 18 ++-- lib/toaster/bldcontrol/models.py | 18 ++-- lib/toaster/orm/migrations/0001_initial.py | 100 ++++++++++----------- .../orm/migrations/0002_customimagerecipe.py | 6 +- .../orm/migrations/0003_customimagepackage.py | 2 +- lib/toaster/orm/migrations/0004_provides.py | 4 +- .../migrations/0008_refactor_artifact_models.py | 4 +- .../0012_use_release_instead_of_up_branch.py | 2 +- lib/toaster/orm/migrations/0017_distro_clone.py | 2 +- lib/toaster/orm/migrations/0019_django_2_2.py | 23 +++++ lib/toaster/orm/models.py | 98 ++++++++++---------- lib/toaster/tests/browser/test_all_builds_page.py | 2 +- .../tests/browser/test_all_projects_page.py | 2 +- .../tests/browser/test_builddashboard_page.py | 2 +- .../browser/test_builddashboard_page_artifacts.py | 2 +- .../browser/test_builddashboard_page_recipes.py | 2 +- .../browser/test_builddashboard_page_tasks.py | 2 +- lib/toaster/tests/browser/test_js_unit_tests.py | 2 +- lib/toaster/tests/browser/test_landing_page.py | 2 +- .../tests/browser/test_layerdetails_page.py | 2 +- .../browser/test_most_recent_builds_states.py | 2 +- .../tests/browser/test_new_custom_image_page.py | 2 +- lib/toaster/tests/browser/test_new_project_page.py | 2 +- .../tests/browser/test_project_builds_page.py | 2 +- .../tests/browser/test_project_config_page.py | 5 +- lib/toaster/tests/browser/test_project_page.py | 2 +- lib/toaster/tests/browser/test_sample.py | 2 +- lib/toaster/tests/browser/test_task_page.py | 2 +- lib/toaster/tests/browser/test_toastertable_ui.py | 2 +- lib/toaster/tests/views/test_views.py | 2 +- lib/toaster/toastergui/api.py | 2 +- .../toastergui/templatetags/project_url_tag.py | 2 +- lib/toaster/toastergui/templatetags/projecttags.py | 4 +- lib/toaster/toastergui/typeaheads.py | 2 +- lib/toaster/toastergui/views.py | 16 ++-- lib/toaster/toastergui/widgets.py | 2 +- .../toastermain/management/commands/buildimport.py | 2 +- lib/toaster/toastermain/settings.py | 17 ++-- lib/toaster/toastermain/urls.py | 4 +- 40 files changed, 197 insertions(+), 174 deletions(-) create mode 100644 bitbake/lib/toaster/orm/migrations/0019_django_2_2.py
Signature · 1 line
1.9.1
PATCH 1/1 toaster: migrate to Django-2.2
From: David Reyna <[email protected]>
Toaster migration to Django-2.2. Django-1.x has been deprecated.
[YOCTO #13207]
--- lib/toaster/bldcollector/views.py | 2 +- lib/toaster/bldcontrol/migrations/0001_initial.py | 18 ++-- lib/toaster/bldcontrol/models.py | 18 ++-- lib/toaster/orm/migrations/0001_initial.py | 100 ++++++++++----------- .../orm/migrations/0002_customimagerecipe.py | 6 +- .../orm/migrations/0003_customimagepackage.py | 2 +- lib/toaster/orm/migrations/0004_provides.py | 4 +- .../migrations/0008_refactor_artifact_models.py | 4 +- .../0012_use_release_instead_of_up_branch.py | 2 +- lib/toaster/orm/migrations/0017_distro_clone.py | 2 +- lib/toaster/orm/migrations/0019_django_2_2.py | 23 +++++ lib/toaster/orm/models.py | 98 ++++++++++---------- lib/toaster/tests/browser/test_all_builds_page.py | 2 +- .../tests/browser/test_all_projects_page.py | 2 +- .../tests/browser/test_builddashboard_page.py | 2 +- .../browser/test_builddashboard_page_artifacts.py | 2 +- .../browser/test_builddashboard_page_recipes.py | 2 +- .../browser/test_builddashboard_page_tasks.py | 2 +- lib/toaster/tests/browser/test_js_unit_tests.py | 2 +- lib/toaster/tests/browser/test_landing_page.py | 2 +- .../tests/browser/test_layerdetails_page.py | 2 +- .../browser/test_most_recent_builds_states.py | 2 +- .../tests/browser/test_new_custom_image_page.py | 2 +- lib/toaster/tests/browser/test_new_project_page.py | 2 +- .../tests/browser/test_project_builds_page.py | 2 +- .../tests/browser/test_project_config_page.py | 5 +- lib/toaster/tests/browser/test_project_page.py | 2 +- lib/toaster/tests/browser/test_sample.py | 2 +- lib/toaster/tests/browser/test_task_page.py | 2 +- lib/toaster/tests/browser/test_toastertable_ui.py | 2 +- lib/toaster/tests/views/test_views.py | 2 +- lib/toaster/toastergui/api.py | 2 +- .../toastergui/templatetags/project_url_tag.py | 2 +- lib/toaster/toastergui/templatetags/projecttags.py | 4 +- lib/toaster/toastergui/typeaheads.py | 2 +- lib/toaster/toastergui/views.py | 16 ++-- lib/toaster/toastergui/widgets.py | 2 +- .../toastermain/management/commands/buildimport.py | 2 +- lib/toaster/toastermain/settings.py | 17 ++-- lib/toaster/toastermain/urls.py | 4 +- 40 files changed, 197 insertions(+), 174 deletions(-) create mode 100644 bitbake/lib/toaster/orm/migrations/0019_django_2_2.py
lib/toaster/bldcollector/views.py +1 -1
@@ -6,7 +6,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.http import HttpResponseBadRequest, HttpResponse import os import tempfile
lib/toaster/bldcontrol/migrations/0001_initial.py +9 -9
@@ -37,7 +37,7 @@ class Migration(migrations.Migration): ('giturl', models.CharField(max_length=254)), ('commit', models.CharField(max_length=254)), ('dirpath', models.CharField(max_length=254)), - ('layer_version', models.ForeignKey(to='orm.Layer_Version', null=True)), + ('layer_version', models.ForeignKey(to='orm.Layer_Version', null=True, on_delete=models.CASCADE)), ], ), migrations.CreateModel(
@@ -80,34 +80,34 @@ class Migration(migrations.Migration): ('state', models.IntegerField(default=0, choices=[(0, b'created'), (1, b'queued'), (2, b'in progress'), (3, b'completed'), (4, b'failed'), (5, b'deleted'), (6, b'archive')])), ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), - ('build', models.OneToOneField(null=True, to='orm.Build')), - ('environment', models.ForeignKey(to='bldcontrol.BuildEnvironment', null=True)), - ('project', models.ForeignKey(to='orm.Project')), + ('build', models.OneToOneField(null=True, to='orm.Build', on_delete=models.CASCADE)), + ('environment', models.ForeignKey(to='bldcontrol.BuildEnvironment', null=True, on_delete=models.CASCADE)), + ('project', models.ForeignKey(to='orm.Project', on_delete=models.CASCADE)), ], ), migrations.AddField( model_name='brvariable', name='req', - field=models.ForeignKey(to='bldcontrol.BuildRequest'), + field=models.ForeignKey(to='bldcontrol.BuildRequest', on_delete=models.CASCADE), ), migrations.AddField( model_name='brtarget', name='req', - field=models.ForeignKey(to='bldcontrol.BuildRequest'), + field=models.ForeignKey(to='bldcontrol.BuildRequest', on_delete=models.CASCADE), ), migrations.AddField( model_name='brlayer', name='req', - field=models.ForeignKey(to='bldcontrol.BuildRequest'), + field=models.ForeignKey(to='bldcontrol.BuildRequest', on_delete=models.CASCADE), ), migrations.AddField( model_name='brerror', name='req', - field=models.ForeignKey(to='bldcontrol.BuildRequest'), + field=models.ForeignKey(to='bldcontrol.BuildRequest', on_delete=models.CASCADE), ), migrations.AddField( model_name='brbitbake', name='req', - field=models.OneToOneField(to='bldcontrol.BuildRequest'), + field=models.OneToOneField(to='bldcontrol.BuildRequest', on_delete=models.CASCADE), ), ]
lib/toaster/bldcontrol/models.py +9 -9
@@ -85,9 +85,9 @@ class BuildRequest(models.Model): search_allowed_fields = ("brtarget__target", "build__project__name") - project = models.ForeignKey(Project) - build = models.OneToOneField(Build, null = True) # TODO: toasterui should set this when Build is created - environment = models.ForeignKey(BuildEnvironment, null = True) + project = models.ForeignKey(Project, on_delete=models.CASCADE) + build = models.OneToOneField(Build, on_delete=models.CASCADE, null = True) # TODO: toasterui should set this when Build is created + environment = models.ForeignKey(BuildEnvironment, on_delete=models.CASCADE, null = True) state = models.IntegerField(choices = REQUEST_STATE, default = REQ_CREATED) created = models.DateTimeField(auto_now_add = True) updated = models.DateTimeField(auto_now = True)
@@ -131,32 +131,32 @@ class BuildRequest(models.Model): class BRLayer(models.Model): - req = models.ForeignKey(BuildRequest) + req = models.ForeignKey(BuildRequest, on_delete=models.CASCADE) name = models.CharField(max_length=100) giturl = models.CharField(max_length=254, null=True) local_source_dir = models.CharField(max_length=254, null=True) commit = models.CharField(max_length=254, null=True) dirpath = models.CharField(max_length=254, null=True) - layer_version = models.ForeignKey(Layer_Version, null=True) + layer_version = models.ForeignKey(Layer_Version, on_delete=models.CASCADE, null=True) class BRBitbake(models.Model): - req = models.OneToOneField(BuildRequest) # only one bitbake for a request + req = models.OneToOneField(BuildRequest, on_delete=models.CASCADE) # only one bitbake for a request giturl = models.CharField(max_length =254) commit = models.CharField(max_length = 254) dirpath = models.CharField(max_length = 254) class BRVariable(models.Model): - req = models.ForeignKey(BuildRequest) + req = models.ForeignKey(BuildRequest, on_delete=models.CASCADE) name = models.CharField(max_length=100) value = models.TextField(blank = True) class BRTarget(models.Model): - req = models.ForeignKey(BuildRequest) + req = models.ForeignKey(BuildRequest, on_delete=models.CASCADE) target = models.CharField(max_length=100) task = models.CharField(max_length=100, null=True) class BRError(models.Model): - req = models.ForeignKey(BuildRequest) + req = models.ForeignKey(BuildRequest, on_delete=models.CASCADE) errtype = models.CharField(max_length=100) errmsg = models.TextField() traceback = models.TextField()
lib/toaster/orm/migrations/0001_initial.py +50 -50
299 lines not on this page · raw message
lib/toaster/orm/migrations/0002_customimagerecipe.py +3 -3
@@ -14,10 +14,10 @@ class Migration(migrations.Migration): migrations.CreateModel( name='CustomImageRecipe', fields=[ - ('recipe_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orm.Recipe')), + ('recipe_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orm.Recipe', on_delete=models.CASCADE)), ('last_updated', models.DateTimeField(default=None, null=True)), - ('base_recipe', models.ForeignKey(related_name='based_on_recipe', to='orm.Recipe')), - ('project', models.ForeignKey(to='orm.Project')), + ('base_recipe', models.ForeignKey(related_name='based_on_recipe', to='orm.Recipe', on_delete=models.CASCADE)), + ('project', models.ForeignKey(to='orm.Project', on_delete=models.CASCADE)), ], bases=('orm.recipe',), ),
lib/toaster/orm/migrations/0003_customimagepackage.py +1 -1
@@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='CustomImagePackage', fields=[ - ('package_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orm.Package')), + ('package_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orm.Package', on_delete=models.CASCADE)), ('recipe_appends', models.ManyToManyField(related_name='appends_set', to='orm.CustomImageRecipe')), ('recipe_excludes', models.ManyToManyField(related_name='excludes_set', to='orm.CustomImageRecipe')), ('recipe_includes', models.ManyToManyField(related_name='includes_set', to='orm.CustomImageRecipe')),
lib/toaster/orm/migrations/0004_provides.py +2 -2
@@ -16,12 +16,12 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(max_length=100)), - ('recipe', models.ForeignKey(to='orm.Recipe')), + ('recipe', models.ForeignKey(to='orm.Recipe', on_delete=models.CASCADE)), ], ), migrations.AddField( model_name='recipe_dependency', name='via', - field=models.ForeignKey(null=True, default=None, to='orm.Provides'), + field=models.ForeignKey(null=True, default=None, to='orm.Provides', on_delete=models.CASCADE), ), ]
lib/toaster/orm/migrations/0008_refactor_artifact_models.py +2 -2
@@ -17,7 +17,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)), ('file_name', models.FilePathField()), ('file_size', models.IntegerField()), - ('target', models.ForeignKey(to='orm.Target')), + ('target', models.ForeignKey(to='orm.Target', on_delete=models.CASCADE)), ], ), migrations.CreateModel(
@@ -26,7 +26,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)), ('file_name', models.FilePathField()), ('file_size', models.IntegerField()), - ('target', models.ForeignKey(to='orm.Target')), + ('target', models.ForeignKey(to='orm.Target', on_delete=models.CASCADE)), ], ), migrations.RemoveField(
lib/toaster/orm/migrations/0012_use_release_instead_of_up_branch.py +1 -1
@@ -46,7 +46,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='layer_version', name='release', - field=models.ForeignKey(to='orm.Release', default=None, null=True), + field=models.ForeignKey(to='orm.Release', default=None, null=True, on_delete=models.CASCADE), ), migrations.RunPython(branch_to_release, reverse_code=migrations.RunPython.noop),
lib/toaster/orm/migrations/0017_distro_clone.py +1 -1
@@ -18,7 +18,7 @@ class Migration(migrations.Migration): ('up_date', models.DateTimeField(default=None, null=True)), ('name', models.CharField(max_length=255)), ('description', models.CharField(max_length=255)), - ('layer_version', models.ForeignKey(to='orm.Layer_Version')), + ('layer_version', models.ForeignKey(to='orm.Layer_Version', on_delete=models.CASCADE)), ], ), ]
lib/toaster/orm/migrations/0019_django_2_2.py new file +23 -0
@@ -0,0 +1,23 @@ +# Generated by Django 2.2.7 on 2019-11-19 03:38 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('orm', '0018_project_specific'), + ] + + operations = [ + migrations.RemoveField( + model_name='distro', + name='up_id', + ), + migrations.AlterField( + model_name='build', + name='recipes_parsed', + field=models.IntegerField(default=1), + ), + ]
lib/toaster/orm/models.py +49 -49
298 lines not on this page · raw message
lib/toaster/tests/browser/test_all_builds_page.py +1 -1
@@ -9,7 +9,7 @@ import re -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_all_projects_page.py +1 -1
@@ -9,7 +9,7 @@ import re -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_builddashboard_page.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_builddashboard_page_artifacts.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_builddashboard_page_recipes.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import Project, Build, Recipe, Task, Layer, Layer_Version
lib/toaster/tests/browser/test_builddashboard_page_tasks.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import Project, Build, Recipe, Task, Layer, Layer_Version
lib/toaster/tests/browser/test_js_unit_tests.py +1 -1
@@ -11,7 +11,7 @@ Run the js unit tests """ -from django.core.urlresolvers import reverse +from django.urls import reverse from tests.browser.selenium_helpers import SeleniumTestCase import logging
lib/toaster/tests/browser/test_landing_page.py +1 -1
@@ -7,7 +7,7 @@ # Copyright (C) 2013-2016 Intel Corporation # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_layerdetails_page.py +1 -1
@@ -7,7 +7,7 @@ # Copyright (C) 2013-2016 Intel Corporation # -from django.core.urlresolvers import reverse +from django.urls import reverse from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import Layer, Layer_Version, Project, LayerSource, Release
lib/toaster/tests/browser/test_most_recent_builds_states.py +1 -1
@@ -7,7 +7,7 @@ # Copyright (C) 2013-2016 Intel Corporation # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase from tests.browser.selenium_helpers_base import Wait
lib/toaster/tests/browser/test_new_custom_image_page.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import BitbakeVersion, Release, Project, ProjectLayer, Layer
lib/toaster/tests/browser/test_new_project_page.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from tests.browser.selenium_helpers import SeleniumTestCase from selenium.webdriver.support.ui import Select from selenium.common.exceptions import InvalidElementStateException
lib/toaster/tests/browser/test_project_builds_page.py +1 -1
@@ -9,7 +9,7 @@ import re -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_project_config_page.py +3 -2
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import BitbakeVersion, Release, Project, ProjectVariable
@@ -213,4 +213,5 @@ class TestProjectConfigsPage(SeleniumTestCase): hidden_element = self.driver.find_element_by_id('hintError-sstate_dir') self.assertEqual(hidden_element.is_displayed(), False, - 'sstate directory path valid but treated as invalid') + 'sstate directory path valid but treated as invalid') +
lib/toaster/tests/browser/test_project_page.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase
lib/toaster/tests/browser/test_sample.py +1 -1
@@ -16,7 +16,7 @@ New test files should follow this structure, should be named "test_*.py", and should be in the same directory as this sample. """ -from django.core.urlresolvers import reverse +from django.urls import reverse from tests.browser.selenium_helpers import SeleniumTestCase class TestSample(SeleniumTestCase):
lib/toaster/tests/browser/test_task_page.py +1 -1
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0-only # -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import Project, Build, Layer, Layer_Version, Recipe, Target
lib/toaster/tests/browser/test_toastertable_ui.py +1 -1
@@ -9,7 +9,7 @@ from datetime import datetime -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils import timezone from tests.browser.selenium_helpers import SeleniumTestCase from orm.models import BitbakeVersion, Release, Project, Build
lib/toaster/tests/views/test_views.py +1 -1
@@ -11,7 +11,7 @@ from django.test import TestCase from django.test.client import RequestFactory -from django.core.urlresolvers import reverse +from django.urls import reverse from django.db.models import Q from orm.models import Project, Package
lib/toaster/toastergui/api.py +1 -1
@@ -24,7 +24,7 @@ from bldcontrol import bbcontroller from django.http import HttpResponse, JsonResponse from django.views.generic import View -from django.core.urlresolvers import reverse +from django.urls import reverse from django.db.models import Q, F from django.db import Error from toastergui.templatetags.projecttags import filtered_filesizeformat
lib/toaster/toastergui/templatetags/project_url_tag.py +1 -1
@@ -3,7 +3,7 @@ # from django import template -from django.core.urlresolvers import reverse +from django.urls import reverse register = template.Library()
lib/toaster/toastergui/templatetags/projecttags.py +2 -2
@@ -44,7 +44,7 @@ def json(value, default = None): # it manually here return mark_safe(JsonLib.dumps(value, indent=2, default = default, ensure_ascii=False).replace('</', '<\\/')) [email protected]_tag [email protected]_tag def query(qs, **kwargs): """ template tag which allows queryset filtering. Usage: {% query books author=author as mybooks %}
@@ -83,7 +83,7 @@ def divide(value, arg): def multiply(value, arg): return int(value) * int(arg) [email protected]_tag [email protected]_tag def datecompute(delta, start = timezone.now()): return start + timedelta(delta)
lib/toaster/toastergui/typeaheads.py +1 -1
@@ -10,7 +10,7 @@ import subprocess from toastergui.widgets import ToasterTypeAhead from orm.models import Project -from django.core.urlresolvers import reverse +from django.urls import reverse from django.core.cache import cache
lib/toaster/toastergui/views.py +8 -8
@@ -19,7 +19,7 @@ from orm.models import Target_Installed_Package, Target_File from orm.models import TargetKernelFile, TargetSDKFile, Target_Image_File from orm.models import BitbakeVersion, CustomImageRecipe -from django.core.urlresolvers import reverse, resolve +from django.urls import reverse, resolve from django.core.exceptions import ObjectDoesNotExist from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.http import HttpResponseNotFound, JsonResponse
@@ -352,7 +352,7 @@ def _get_parameters_values(request, default_count, default_order): # set cookies for parameters. this is usefull in case parameters are set # manually from the GET values of the link def _set_parameters_values(pagesize, orderby, request): - from django.core.urlresolvers import resolve + from django.urls import resolve current_url = resolve(request.path_info).url_name request.session['%s_count' % current_url] = pagesize request.session['%s_orderby' % current_url] =orderby
@@ -1364,8 +1364,8 @@ if True: template = "newproject.html" context = { - 'email': request.user.email if request.user.is_authenticated() else '', - 'username': request.user.username if request.user.is_authenticated() else '', + 'email': request.user.email if request.user.is_authenticated else '', + 'username': request.user.username if request.user.is_authenticated else '', 'releases': Release.objects.order_by("description"), }
@@ -1391,7 +1391,7 @@ if True: # set alert for missing fields raise BadParameterException("Fields missing: %s" % ", ".join(missing)) - if not request.user.is_authenticated(): + if not request.user.is_authenticated: user = authenticate(username = request.POST.get('username', '_anonuser'), password = 'nopass') if user is None: user = User.objects.create_user(username = request.POST.get('username', '_anonuser'), email = request.POST.get('email', ''), password = "nopass")
@@ -1438,8 +1438,8 @@ if True: project = Project.objects.get(pk=pid) template = "newproject_specific.html" context = { - 'email': request.user.email if request.user.is_authenticated() else '', - 'username': request.user.username if request.user.is_authenticated() else '', + 'email': request.user.email if request.user.is_authenticated else '', + 'username': request.user.username if request.user.is_authenticated else '', 'releases': Release.objects.order_by("description"), 'projectname': project.name, 'project_pk': project.pk,
@@ -1469,7 +1469,7 @@ if True: # set alert for missing fields raise BadParameterException("Fields missing: %s" % ", ".join(missing)) - if not request.user.is_authenticated(): + if not request.user.is_authenticated: user = authenticate(username = request.POST.get('username', '_anonuser'), password = 'nopass') if user is None: user = User.objects.create_user(username = request.POST.get('username', '_anonuser'), email = request.POST.get('email', ''), password = "nopass")
lib/toaster/toastergui/widgets.py +1 -1
@@ -22,7 +22,7 @@ from django.utils import timezone from toastergui.templatetags.projecttags import sectohms, get_tasks from toastergui.templatetags.projecttags import json as template_json from django.http import JsonResponse -from django.core.urlresolvers import reverse +from django.urls import reverse import types import json
lib/toaster/toastermain/management/commands/buildimport.py +1 -1
@@ -466,7 +466,6 @@ class Command(BaseCommand): release_name = 'None' if not pl.layercommit.release else pl.layercommit.release.name print(" AFTER :ProjectLayer=%s,%s,%s,%s" % (pl.layercommit.layer.name,release_name,pl.layercommit.branch,pl.layercommit.commit)) - def handle(self, *args, **options): project_name = options['name'] project_path = options['path']
@@ -551,6 +550,7 @@ class Command(BaseCommand): # preset the mode and default image recipe project.set_variable(Project.PROJECT_SPECIFIC_ISNEW,Project.PROJECT_SPECIFIC_NEW) project.set_variable(Project.PROJECT_SPECIFIC_DEFAULTIMAGE,"core-image-minimal") + # Assert any extended/custom actions or variables for new non-Toaster projects if not len(self.toaster_vars): pass
lib/toaster/toastermain/settings.py +8 -9
@@ -189,15 +189,16 @@ TEMPLATES = [ }, ] -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - # Uncomment the next line for simple clickjacking protection: - # 'django.middleware.clickjacking.XFrameOptionsMiddleware', -) + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', +] CACHES = { # 'default': {
@@ -248,7 +249,7 @@ FRESH_ENABLED = False if os.environ.get('TOASTER_DEVEL', None) is not None: try: import fresh - MIDDLEWARE_CLASSES = ("fresh.middleware.FreshMiddleware",) + MIDDLEWARE_CLASSES + MIDDLEWARE = ["fresh.middleware.FreshMiddleware",] + MIDDLEWARE INSTALLED_APPS = INSTALLED_APPS + ('fresh',) FRESH_ENABLED = True except:
@@ -258,8 +259,8 @@ DEBUG_PANEL_ENABLED = False if os.environ.get('TOASTER_DEVEL', None) is not None: try: import debug_toolbar, debug_panel - MIDDLEWARE_CLASSES = ('debug_panel.middleware.DebugPanelMiddleware',) + MIDDLEWARE_CLASSES - #MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + ('debug_toolbar.middleware.DebugToolbarMiddleware',) + MIDDLEWARE = ['debug_panel.middleware.DebugPanelMiddleware',] + MIDDLEWARE + #MIDDLEWARE = MIDDLEWARE + ['debug_toolbar.middleware.DebugToolbarMiddleware',] INSTALLED_APPS = INSTALLED_APPS + ('debug_toolbar','debug_panel',) DEBUG_PANEL_ENABLED = True
@@ -352,5 +353,3 @@ def activate_synchronous_off(sender, connection, **kwargs): connection_created.connect(activate_synchronous_off) # - -
lib/toaster/toastermain/urls.py +2 -2
@@ -51,7 +51,7 @@ if toastermain.settings.DEBUG_PANEL_ENABLED: urlpatterns = [ # Uncomment the next line to enable the admin: - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), ] + urlpatterns # Automatically discover urls.py in various apps, beside our own
@@ -69,7 +69,7 @@ for t in os.walk(os.path.dirname(currentdir)): # make sure we don't have this module name in conflict = False for p in urlpatterns: - if p.regex.pattern == '^' + modulename + '/': + if p.pattern.regex.pattern == '^' + modulename + '/': conflict = True if not conflict: urlpatterns.insert(0, url(r'^' + modulename + '/', include ( modulename + '.urls')))
Signature · 1 line
1.9.1