From patchwork Mon Oct 3 12:26:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 4495 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 4EC6223DEC for ; Mon, 3 Oct 2011 12:26:17 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 46E72A186C8 for ; Mon, 3 Oct 2011 12:26:17 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id 6so3637007eyb.11 for ; Mon, 03 Oct 2011 05:26:17 -0700 (PDT) Received: by 10.223.45.140 with SMTP id e12mr16477864faf.27.1317644777140; Mon, 03 Oct 2011 05:26:17 -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 n10cs12938laf; Mon, 3 Oct 2011 05:26:16 -0700 (PDT) Received: by 10.216.134.1 with SMTP id r1mr2527738wei.109.1317644775007; Mon, 03 Oct 2011 05:26:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fl15si10348383wbb.139.2011.10.03.05.26.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Oct 2011 05:26:15 -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 1RAhb4-00088v-Eu for ; Mon, 03 Oct 2011 12:26:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 66ED1E208B for ; Mon, 3 Oct 2011 12:26:14 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 246 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 246: Use hint when reporting version with versiontools. Message-Id: <20111003122614.15457.61219.launchpad@ackee.canonical.com> Date: Mon, 03 Oct 2011 12:26:14 -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: 3aba6f87a7cf1168058c1cd938aec731b1dd2f9d ------------------------------------------------------------ revno: 246 committer: Zygmunt Krynicki branch nick: trunk timestamp: Fri 2011-09-30 15:45:00 +0200 message: Use hint when reporting version with versiontools. This allows versiontools to track down the place the code is stored and thus initialize vcs helpers correctly. modified: lava_projects/extension.py lava_server/context_processors.py setup.py --- lp:lava-server https://code.launchpad.net/~linaro-validation/lava-server/trunk You are subscribed to branch lp:lava-server. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription === modified file 'lava_projects/extension.py' --- lava_projects/extension.py 2011-09-23 08:29:48 +0000 +++ lava_projects/extension.py 2011-09-30 13:45:00 +0000 @@ -42,6 +42,6 @@ @property def version(self): - from lava_projects import __version__ + import lava_projects import versiontools - return versiontools.format_version(__version__) + return versiontools.format_version(lava_projects.__version__, hint=lava_projects) === modified file 'lava_server/context_processors.py' --- lava_server/context_processors.py 2011-08-18 15:00:07 +0000 +++ lava_server/context_processors.py 2011-09-30 13:45:00 +0000 @@ -18,13 +18,13 @@ import versiontools +import lava_server from lava_server.extension import loader -from lava_server import __version__ def lava(request): return { 'lava': { 'extension_list': loader.extensions, - 'version': versiontools.format_version(__version__) + 'version': versiontools.format_version(lava_server.__version__, hint=lava_server) } } === modified file 'setup.py' --- setup.py 2011-09-23 08:35:26 +0000 +++ setup.py 2011-09-30 13:45:00 +0000 @@ -63,11 +63,11 @@ 'linaro-django-xmlrpc >= 0.4', 'python-openid >= 2.2.4', # this should be a part of django-openid-auth deps 'south >= 0.7.3', - 'versiontools >= 1.3.1', + 'versiontools >= 1.8', 'markdown >= 2.0.3', ], setup_requires=[ - 'versiontools >= 1.3.1', + 'versiontools >= 1.8', ], tests_require=[ 'django-testscenarios >= 0.7.1',