From patchwork Thu Jan 31 02:53:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 14375 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 A116623E1A for ; Thu, 31 Jan 2013 02:53:17 +0000 (UTC) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3C722A18209 for ; Thu, 31 Jan 2013 02:53:17 +0000 (UTC) Received: by mail-vc0-f180.google.com with SMTP id fo13so1446646vcb.25 for ; Wed, 30 Jan 2013 18:53:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:content-type:mime-version:x-launchpad-project :x-launchpad-branch:x-launchpad-message-rationale :x-launchpad-branch-revision-number:x-launchpad-notification-type:to :from:subject:message-id:date:reply-to:sender:errors-to:precedence :x-generated-by:x-launchpad-hash:x-gm-message-state; bh=I/YuB57QkMqY1+Q089G2B5jgBJdqKYSZ6SMe6TrvYtc=; b=jWkVqDkF/pE/lhylk7cfCq9de2mtD+AnfYS8Z+pDeAgoaMBrRzNJ1Sm0KjYAqyycan 4NXWMhCOznz27vqSyct6xfRwpbjO+r9NQE0VQHfl8t32BScMO3mrpG4ytNLsmxqV3C+e E/FI9syK7pTvOmDiKtpQAs/NeUdHUk+sxt/0uIqqsC5GjI91KxDL9bjl89c90GU6FJLJ eetgwt7ElqLPiCsCyNrenOIUzeSvDcZrkGjgpVGtH8Je7xb5GwhDR6wPXGwDuxYtOX65 pu+WSARj+ON/peJFs3YRX3KFVvePB+CcepzlAlLjvmSDLDmoWBwNdwzTLiCQ7YwbrTer spjA== X-Received: by 10.58.231.196 with SMTP id ti4mr2539409vec.25.1359600796719; Wed, 30 Jan 2013 18:53:16 -0800 (PST) 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.58.252.8 with SMTP id zo8csp41183vec; Wed, 30 Jan 2013 18:53:16 -0800 (PST) X-Received: by 10.180.72.148 with SMTP id d20mr1738503wiv.31.1359600795790; Wed, 30 Jan 2013 18:53:15 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ko7si922141wjb.242.2013.01.30.18.53.15 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 30 Jan 2013 18:53:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1U0kH5-0007Z7-8L for ; Thu, 31 Jan 2013 02:53:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 29F2CE049D for ; Thu, 31 Jan 2013 02:53:15 +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: 393 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 393: prepare dashboard for using django.contrib.staticfiles Message-Id: <20130131025315.11794.13465.launchpad@ackee.canonical.com> Date: Thu, 31 Jan 2013 02:53:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16455"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c2fe2102963f04d009be721af008f5dbb6744991 X-Gm-Message-State: ALoCoQkp60+IjA/835bYpbh45JqSsdzSXAmfycrmVFUuOAoQa/CFrV7FOR29xJVtOvRt3hvas4M6 ------------------------------------------------------------ revno: 393 committer: Michael Hudson-Doyle branch nick: trunk timestamp: Thu 2013-01-31 15:52:51 +1300 message: prepare dashboard for using django.contrib.staticfiles added: dashboard_app/static/dashboard_app/ renamed: dashboard_app/static/css/ => dashboard_app/static/dashboard_app/css/ dashboard_app/static/images/ => dashboard_app/static/dashboard_app/images/ dashboard_app/static/js/ => dashboard_app/static/dashboard_app/js/ modified: dashboard_app/extension.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 2013-01-11 17:08:32 +0000 +++ dashboard_app/extension.py 2013-01-31 02:52:51 +0000 @@ -79,6 +79,9 @@ settings_module['DATAREPORT_DIRS'] = [ os.path.join(root_dir, 'examples', 'reports'), os.path.join(root_dir, 'production', 'reports')] + prepend_label_apps = settings_module.get('STATICFILES_PREPEND_LABEL_APPS', []) + if self.app_name in prepend_label_apps: + prepend_label_apps.remove(self.app_name) def contribute_to_settings_ex(self, settings_module, settings_object): settings_module['DATAVIEW_DIRS'] = settings_object._settings.get( === added directory 'dashboard_app/static/dashboard_app' === renamed directory 'dashboard_app/static/css' => 'dashboard_app/static/dashboard_app/css' === renamed directory 'dashboard_app/static/images' => 'dashboard_app/static/dashboard_app/images' === renamed directory 'dashboard_app/static/js' => 'dashboard_app/static/dashboard_app/js' === modified file 'setup.py' --- setup.py 2012-11-07 20:26:14 +0000 +++ setup.py 2013-01-31 02:52:51 +0000 @@ -49,7 +49,6 @@ install_requires=[ 'Django >= 1.2', 'django-restricted-resource >= 0.2.6', - 'django-staticfiles == 0.3.4', 'docutils >= 0.6', 'lava-server >= 0.8', 'linaro-dashboard-bundle >= 1.8',