From patchwork Fri Jun 17 01:36:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 2020 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AECFA23F3D for ; Fri, 17 Jun 2011 01:36:22 +0000 (UTC) Received: from mail-vx0-f180.google.com (mail-vx0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 6678BA189D3 for ; Fri, 17 Jun 2011 01:36:22 +0000 (UTC) Received: by vxk12 with SMTP id 12so2319109vxk.11 for ; Thu, 16 Jun 2011 18:36:21 -0700 (PDT) Received: by 10.52.98.97 with SMTP id eh1mr2313575vdb.7.1308274581785; Thu, 16 Jun 2011 18:36:21 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.52.183.130 with SMTP id em2cs221116vdc; Thu, 16 Jun 2011 18:36:21 -0700 (PDT) Received: by 10.227.12.15 with SMTP id v15mr1509636wbv.77.1308274580807; Thu, 16 Jun 2011 18:36:20 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id e7si1766060wbh.28.2011.06.16.18.36.20; Thu, 16 Jun 2011 18:36:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QXNyu-0003M4-4w for ; Fri, 17 Jun 2011 01:36:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 1ED8A2E89B3 for ; Fri, 17 Jun 2011 01:36:20 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dashboard X-Launchpad-Branch: ~linaro-validation/lava-dashboard/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 225 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 225: Fix broken imports and use linaro-django-pagination Message-Id: <20110617013620.13260.82157.launchpad@loganberry.canonical.com> Date: Fri, 17 Jun 2011 01:36:20 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13216"; Instance="initZopeless config overlay" X-Launchpad-Hash: 3488f29cb89c3d4a0132829ff0b9c3b9978aaea3 ------------------------------------------------------------ revno: 225 committer: Zygmunt Krynicki branch nick: trunk timestamp: Fri 2011-06-17 03:33:55 +0200 message: Fix broken imports and use linaro-django-pagination modified: dashboard_app/extension.py dashboard_app/helpers.py dashboard_app/tests/models/bundle.py dashboard_app/tests/models/data_report.py dashboard_app/tests/models/hw_device.py dashboard_app/tests/models/sw_package.py dashboard_app/tests/other/dataview.py dashboard_app/tests/other/deserialization.py setup.py --- lp:lava-dashboard https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk You are subscribed to branch lp:lava-dashboard. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription === modified file 'dashboard_app/extension.py' --- dashboard_app/extension.py 2011-05-25 13:22:26 +0000 +++ dashboard_app/extension.py 2011-06-17 01:33:55 +0000 @@ -28,11 +28,11 @@ def contribute_to_settings(self, settings): super(DashboardExtension, self).contribute_to_settings(settings) settings['INSTALLED_APPS'].extend([ - "pagination", + "linaro_django_pagination", "south", ]) settings['MIDDLEWARE_CLASSES'].append( - 'pagination.middleware.PaginationMiddleware') + 'linaro_django_pagination.middleware.PaginationMiddleware') settings['RESTRUCTUREDTEXT_FILTER_SETTINGS'] = { "initial_header_level": 4} # TODO: Add dataview database support === modified file 'dashboard_app/helpers.py' --- dashboard_app/helpers.py 2011-05-07 23:30:43 +0000 +++ dashboard_app/helpers.py 2011-06-17 01:33:55 +0000 @@ -8,11 +8,9 @@ from django.core.files.base import ContentFile from django.db import transaction, IntegrityError -from linaro_dashboard_bundle import ( - DocumentIO, - DocumentEvolution, - DocumentFormatError -) +from linaro_dashboard_bundle.errors import DocumentFormatError +from linaro_dashboard_bundle.evolution import DocumentEvolution +from linaro_dashboard_bundle.io import DocumentIO from linaro_json.extensions import datetime_extension, timedelta_extension === modified file 'dashboard_app/tests/models/bundle.py' --- dashboard_app/tests/models/bundle.py 2011-05-23 17:02:43 +0000 +++ dashboard_app/tests/models/bundle.py 2011-06-17 01:33:55 +0000 @@ -13,8 +13,8 @@ BundleDeserializationError, BundleStream, ) -from launch_control.thirdparty.mocker import Mocker, expect -from launch_control.utils.call_helper import ObjectFactoryMixIn +from dashboard_app.tests.mocker import Mocker, expect +from dashboard_app.tests.call_helper import ObjectFactoryMixIn class BundleTests(TestCase, ObjectFactoryMixIn): === modified file 'dashboard_app/tests/models/data_report.py' --- dashboard_app/tests/models/data_report.py 2011-05-30 16:58:20 +0000 +++ dashboard_app/tests/models/data_report.py 2011-06-17 01:33:55 +0000 @@ -23,8 +23,8 @@ from django.core.urlresolvers import reverse from django_testscenarios.ubertest import TestCase -from launch_control.thirdparty.mocker import Mocker, expect from dashboard_app.models import DataReport +from dashboard_app.tests.mocker import Mocker, expect class DataReportTests(TestCase): === modified file 'dashboard_app/tests/models/hw_device.py' --- dashboard_app/tests/models/hw_device.py 2010-10-08 15:29:23 +0000 +++ dashboard_app/tests/models/hw_device.py 2011-06-17 01:33:55 +0000 @@ -6,7 +6,7 @@ from django.test import TestCase from dashboard_app.models import HardwareDevice -from launch_control.utils.call_helper import ObjectFactoryMixIn +from dashboard_app.tests.call_helper import ObjectFactoryMixIn class HardwareDeviceTestCase(TestCase, ObjectFactoryMixIn): === modified file 'dashboard_app/tests/models/sw_package.py' --- dashboard_app/tests/models/sw_package.py 2011-04-01 10:59:16 +0000 +++ dashboard_app/tests/models/sw_package.py 2011-06-17 01:33:55 +0000 @@ -6,7 +6,7 @@ from django.test import TestCase from dashboard_app.models import SoftwarePackage -from launch_control.utils.call_helper import ObjectFactoryMixIn +from dashboard_app.tests.call_helper import ObjectFactoryMixIn class SoftwarePackageTestCase(TestCase, ObjectFactoryMixIn): === modified file 'dashboard_app/tests/other/dataview.py' --- dashboard_app/tests/other/dataview.py 2011-05-18 21:42:17 +0000 +++ dashboard_app/tests/other/dataview.py 2011-06-17 01:33:55 +0000 @@ -20,6 +20,8 @@ from dashboard_app.dataview import DataView +from dashboard_app.tests.mocker import Mocker, expect + class DataViewHandlerTests(unittest.TestCase): @@ -76,7 +78,6 @@ def test_get_connection_without_sandbox(self): # Mock connections['dataview'] to raise ConnectionDoesNotExist - from launch_control.thirdparty.mocker import Mocker, expect from django.db.utils import ConnectionDoesNotExist mocker = Mocker() connections = mocker.replace("django.db.connections") @@ -94,7 +95,6 @@ Test for DataView.get_connection() """ # Mock connections['dataview'] to return special connection - from launch_control.thirdparty.mocker import Mocker, expect from django.db.utils import ConnectionDoesNotExist mocker = Mocker() connections = mocker.replace("django.db.connections") === modified file 'dashboard_app/tests/other/deserialization.py' --- dashboard_app/tests/other/deserialization.py 2011-05-23 17:02:43 +0000 +++ dashboard_app/tests/other/deserialization.py 2011-06-17 01:33:55 +0000 @@ -28,7 +28,7 @@ TransactionTestCase, ) from django.contrib.auth.models import User -from linaro_dashboard_bundle import DocumentFormatError +from linaro_dashboard_bundle.errors import DocumentFormatError from linaro_json.schema import ValidationError from linaro_json.extensions import datetime_extension === modified file 'setup.py' --- setup.py 2011-05-25 11:04:28 +0000 +++ setup.py 2011-06-17 01:33:55 +0000 @@ -52,7 +52,7 @@ ], install_requires = [ 'Django >= 1.2', - 'django-pagination >= 1.0.7.1', + 'linaro-django-pagination >= 2.0', 'django-restricted-resource >= 0.2.5', 'docutils >= 0.6', 'lava-server',