Received: from mail5.wrs.com (mail5.wrs.com [192.103.53.11]) by mx.groups.io with SMTP id smtpd.web11.11198.1595299792410453664 for ; Mon, 20 Jul 2020 19:49:52 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: windriver.com, ip: 192.103.53.11, mailfrom: david.reyna@windriver.com) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id 06L2nAEi020134 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Mon, 20 Jul 2020 19:49:41 -0700 Received: from honig-Precision-T5600.corp.ad.wrs.com (147.11.209.184) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.487.0; Mon, 20 Jul 2020 19:49:24 -0700 From: "Reyna, David" To: Subject: [PATCH] toaster: Update to support Django-3 Date: Mon, 20 Jul 2020 19:45:02 -0700 Message-ID: <20200721024502.32579-1-david.reyna@windriver.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Update the Toaster code to support both Django-2 and Django-3. - The module 'six' was for Python 2/3 compatibility. That package is both no longer needed and is deprecated on recent hosts, so explicitly replace 'reraise' with the Python-3 version. - The 'autocommits_when_autocommit_is_off' attribute is deprecated in Django-3. It was used for 'sqlite3 in Python < 3.6 which doesn't handle transactions and savepoints properly when autocommit is off' - Toaster requirements file updated to include Django 3.0*. [YOCTO #13888] Signed-off-by: David Reyna --- bitbake/lib/bb/ui/buildinfohelper.py | 6 ++++-- bitbake/lib/toaster/orm/models.py | 15 +++++++++++++-- bitbake/toaster-requirements.txt | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 82c62e3324..b20774d895 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -894,8 +894,10 @@ class BuildInfoHelper(object): self.autocommit_step = 1 self.server = server # we use manual transactions if the database doesn't autocommit on us - if not connection.features.autocommits_when_autocommit_is_off: - transaction.set_autocommit(False) + # deprecated with Django 3 + if 2 == django.VERSION[0]: + if not connection.features.autocommits_when_autocommit_is_off: + transaction.set_autocommit(False) self.orm_wrapper = ORMWrapper() self.has_build_history = has_build_history self.tmp_dir = self.server.runCommand(["getVariable", "TMPDIR"])[0] diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 7f7e922ade..abd657b9e3 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -58,7 +58,18 @@ if 'sqlite' in settings.DATABASES['default']['ENGINE']: return _base_insert(self, *args, **kwargs) QuerySet._insert = _insert - from django.utils import six + #from django.utils import six (deprecate with Python-3/latest 'six') + def six_reraise(tp, value, tb=None): + try: + if value is None: + value = tp() + if value.__traceback__ is not tb: + raise value.with_traceback(tb) + raise value + finally: + value = None + tb = None + def _create_object_from_params(self, lookup, params): """ Tries to create an object using passed params. @@ -73,7 +84,7 @@ if 'sqlite' in settings.DATABASES['default']['ENGINE']: return self.get(**lookup), False except self.model.DoesNotExist: pass - six.reraise(*exc_info) + six_reraise(*exc_info) QuerySet._create_object_from_params = _create_object_from_params diff --git a/bitbake/toaster-requirements.txt b/bitbake/toaster-requirements.txt index 735b614546..56a51fc667 100644 --- a/bitbake/toaster-requirements.txt +++ b/bitbake/toaster-requirements.txt @@ -1,3 +1,3 @@ -Django>2.2,<2.3 +Django>2.2,<3.1 beautifulsoup4>=4.4.0 pytz -- 2.20.1