From patchwork Mon Oct 3 12:26:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 4498 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 3FEF223DEC for ; Mon, 3 Oct 2011 12:26:19 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gy0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0FBF9A186F8 for ; Mon, 3 Oct 2011 12:26:18 +0000 (UTC) Received: by gyd8 with SMTP id 8so5257157gyd.11 for ; Mon, 03 Oct 2011 05:26:18 -0700 (PDT) Received: by 10.223.5.76 with SMTP id 12mr131356fau.103.1317644778286; Mon, 03 Oct 2011 05:26:18 -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.152.23.170 with SMTP id n10cs12944laf; Mon, 3 Oct 2011 05:26:18 -0700 (PDT) Received: by 10.227.11.149 with SMTP id t21mr2987184wbt.39.1317644776044; Mon, 03 Oct 2011 05:26:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fs2si10365169wbb.68.2011.10.03.05.26.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Oct 2011 05:26:16 -0700 (PDT) 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 1RAhb5-00089b-FJ for ; Mon, 03 Oct 2011 12:26:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 6CED7E209C for ; Mon, 3 Oct 2011 12:26: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: 271 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard/trunk] Rev 271: Use hint when reporting version using versiontools Message-Id: <20111003122615.15457.88743.launchpad@ackee.canonical.com> Date: Mon, 03 Oct 2011 12:26: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="14071"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: f7201f91382b1ae2d40db865178a64d8e0615749 ------------------------------------------------------------ revno: 271 committer: Zygmunt Krynicki branch nick: trunk timestamp: Fri 2011-09-30 15:43:50 +0200 message: Use hint when reporting version using versiontools This allows versiontools to track down the place the code is stored and thus initialize vcs helpers correctly. 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 2011-08-18 15:04:13 +0000 +++ dashboard_app/extension.py 2011-09-30 13:43:50 +0000 @@ -45,9 +45,9 @@ @property def version(self): - from dashboard_app import __version__ + import dashboard_app import versiontools - return versiontools.format_version(__version__) + return versiontools.format_version(dashboard_app.__version__, hint=dashboard_app) @property def api_class(self): === modified file 'setup.py' --- setup.py 2011-09-30 13:36:45 +0000 +++ setup.py 2011-09-30 13:43:50 +0000 @@ -58,10 +58,10 @@ 'linaro-json >= 2.0.1', # TODO: use json-schema-validator 'pygments >= 1.2', 'south >= 0.7.3', - 'versiontools >= 1.3.1', + 'versiontools >= 1.8', ], setup_requires=[ - 'versiontools >= 1.3.1', + 'versiontools >= 1.8', ], tests_require=[ 'django-testscenarios >= 0.7.1',