From patchwork Thu Jun 23 11:11:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 2198 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 BCD4423F08 for ; Thu, 23 Jun 2011 11:12:12 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 7AA90A181F1 for ; Thu, 23 Jun 2011 11:12:12 +0000 (UTC) Received: by qyk10 with SMTP id 10so3715887qyk.11 for ; Thu, 23 Jun 2011 04:12:12 -0700 (PDT) Received: by 10.229.117.95 with SMTP id p31mr1431109qcq.97.1308827531993; Thu, 23 Jun 2011 04:12:11 -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.229.230.139 with SMTP id jm11cs14957qcb; Thu, 23 Jun 2011 04:12:11 -0700 (PDT) Received: by 10.216.36.142 with SMTP id w14mr3163592wea.31.1308827529723; Thu, 23 Jun 2011 04:12:09 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id x58si3523863wec.61.2011.06.23.04.12.09; Thu, 23 Jun 2011 04:12:09 -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 1QZhpO-0003Hv-4O for ; Thu, 23 Jun 2011 11:12:06 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 773162E8A1D for ; Thu, 23 Jun 2011 11:11:21 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dashboard-tool X-Launchpad-Branch: ~linaro-validation/lava-dashboard-tool/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 144 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dashboard-tool/trunk] Rev 144: Be pip friendly Message-Id: <20110623111121.568.11979.launchpad@loganberry.canonical.com> Date: Thu, 23 Jun 2011 11:11:21 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13265"; Instance="initZopeless config overlay" X-Launchpad-Hash: be8b4474734896a2d1cd20a0be6ca340dc118812 ------------------------------------------------------------ revno: 144 committer: Zygmunt Krynicki branch nick: trunk timestamp: Thu 2011-06-23 13:06:21 +0200 message: Be pip friendly modified: launch_control_tool/__init__.py launch_control_tool/commands.py setup.py --- lp:lava-dashboard-tool https://code.launchpad.net/~linaro-validation/lava-dashboard-tool/trunk You are subscribed to branch lp:lava-dashboard-tool. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard-tool/trunk/+edit-subscription === modified file 'launch_control_tool/__init__.py' --- launch_control_tool/__init__.py 2011-05-18 14:25:28 +0000 +++ launch_control_tool/__init__.py 2011-06-23 11:06:21 +0000 @@ -20,17 +20,4 @@ Launch Control Tool package """ -# Chicken-and-egg problem -__version__ = (0, 5, 0, "final", 0) -try: - import versiontools - __version__ = versiontools.Version.from_tuple(__version__) -except ImportError: - pass - - -def get_version(): - """ - Return a string representing the version of this package - """ - return str(__version__) +__version__ = (0, 5, 1, "final", 0) === modified file 'launch_control_tool/commands.py' --- launch_control_tool/commands.py 2011-05-18 14:24:01 +0000 +++ launch_control_tool/commands.py 2011-06-23 11:06:21 +0000 @@ -33,7 +33,6 @@ import urlparse import xmlrpclib -from launch_control_tool import get_version from lava_tool.interface import Command @@ -951,4 +950,4 @@ """ def invoke(self): print "Dashboard client version: {version}".format( - version=get_version()) + versiontools.format_version(launch_control_tool.__version__)) === modified file 'setup.py' --- setup.py 2011-05-04 02:39:33 +0000 +++ setup.py 2011-06-23 11:06:21 +0000 @@ -19,13 +19,11 @@ # along with launch-control-tool. If not, see . from setuptools import setup, find_packages -import versiontools -import launch_control_tool setup( name = 'launch-control-tool', - version = versiontools.format_version(launch_control_tool.__version__), + version = ":versiontools:launch_control_tool:__version__", author = "Zygmunt Krynicki", author_email = "zygmunt.krynicki@linaro.org", packages = find_packages(), @@ -59,11 +57,11 @@ "Topic :: Software Development :: Testing", ], install_requires = [ - 'versiontools >= 1.1', - 'lava-tool' + 'versiontools >= 1.3.1', + 'lava-tool >= 0.1' ], setup_requires = [ - 'versiontools >= 1.1', + 'versiontools >= 1.3.1', ], tests_require = [ ],