From d74bcbeaf241a67871d62b7e2c17900ae900642e Mon Sep 17 00:00:00 2001 From: David Reyna Date: Tue, 27 Jun 2017 13:44:28 -0700 Subject: bitbake: toaster: address Django-1.10 API deprecations There are four main API deprecations in Django-1.10: (a) String view arguments to url() must be replaced by the explicit class reference (b) New TEMPLATES stucture in settings.py consolidates TEMPLATE_DIRS, TEMPLATE_CONTEXT_PROCESSORS, TEMPLATE_LOADERS, TEMPLATE_STRING_IF_INVALID, and TEMPLATE_DEBUG (c) patterns() wrapper in url() is removed, with urlpatterns now a simple list (d) NoArgsCommand in commands() must be replace by BaseCommand, and handle_noargs() changed to handle() Also, the Django version checker must be updated to accept two digit sub-version numbers (e.g. "1.8" < "1.10") [YOCTO #11684] (Bitbake rev: e4c7a94fac7a53fc146387a57e5a09b9ec3caca0) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 6 +++--- bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/toaster/bldcontrol/management') diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 2ed994f61f..d11166ef53 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -1,4 +1,4 @@ -from django.core.management.base import NoArgsCommand, CommandError +from django.core.management.base import BaseCommand, CommandError from django.db import transaction from django.core.management import call_command @@ -18,7 +18,7 @@ def DN(path): return os.path.dirname(path) -class Command(NoArgsCommand): +class Command(BaseCommand): args = "" help = "Verifies that the configured settings are valid and usable, or prompts the user to fix the settings." @@ -152,7 +152,7 @@ class Command(NoArgsCommand): - def handle_noargs(self, **options): + def handle(self, **options): retval = 0 retval += self._verify_build_environment() retval += self._verify_default_settings() diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py index df11f9d162..8eacb5e896 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py @@ -1,4 +1,4 @@ -from django.core.management.base import NoArgsCommand +from django.core.management.base import BaseCommand from django.db import transaction from django.db.models import Q @@ -16,7 +16,7 @@ import os logger = logging.getLogger("toaster") -class Command(NoArgsCommand): +class Command(BaseCommand): args = "" help = "Schedules and executes build requests as possible. "\ "Does not return (interrupt with Ctrl-C)" @@ -168,7 +168,7 @@ class Command(NoArgsCommand): except Exception as e: logger.warn("runbuilds: schedule exception %s" % str(e)) - def handle_noargs(self, **options): + def handle(self, **options): pidfile_path = os.path.join(os.environ.get("BUILDDIR", "."), ".runbuilds.pid") -- cgit v1.2.3-54-g00ecf