diff mbox

[Branch,~linaro-validation/lava-dashboard-tool/trunk] Rev 144: Be pip friendly

Message ID 20110623111121.568.11979.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki June 23, 2011, 11:11 a.m. UTC 
------------------------------------------------------------
revno: 144
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
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
diff mbox

Patch

=== 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 <http://www.gnu.org/licenses/>.
 
 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 = [
     ],