Bug 1183157 - make marionette --version flag also show the transport and driver package versions. r=dburns

--HG--
extra : commitid : 9r6zCILoeE4
extra : rebase_source : 6d0475dec01fe9b97ac318ad0948bfe8e9e15e56

testing/marionette/client/marionette/runtests.py

@@ -5,6 +5,8 @@
 import sys
 
 from marionette import __version__
+from marionette_driver import __version__ as driver_version
+from marionette_transport import __version__ as transport_version
 from marionette.marionette_test import MarionetteTestCase, MarionetteJSTestCase
 from marionette.runner import (
     BaseMarionetteTestRunner,
@@ -36,8 +38,14 @@ def startTestRunner(runner_class, options, tests):
     return runner
 
 def cli(runner_class=MarionetteTestRunner, parser_class=MarionetteOptions):
-    parser = parser_class(usage='%prog [options] test_file_or_dir <test_file_or_dir> ...',
-                          version='%prog ' + __version__)
+    parser = parser_class(
+        usage='%prog [options] test_file_or_dir <test_file_or_dir> ...',
+        version="%prog {version} (using marionette-driver: {driver_version}"
+                ", marionette-transport: {transport_version})".format(
+                    version=__version__,
+                    driver_version=driver_version,
+                    transport_version=transport_version)
+    )
     mozlog.commandline.add_logging_group(parser)
     options, tests = parser.parse_args()
     parser.verify_usage(options, tests)

testing/marionette/driver/marionette_driver/__init__.py

@@ -1,3 +1,11 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+__version__ = '0.10'
+
+
 from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
                                 gestures, keys, marionette, selection, wait,
                                 application_cache, date_time_value )

testing/marionette/driver/setup.py

@@ -1,13 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import re
 from setuptools import setup, find_packages
 
-version = '0.10'
+THIS_DIR = os.path.dirname(os.path.realpath(__name__))
+
+
+def read(*parts):
+    with open(os.path.join(THIS_DIR, *parts)) as f:
+        return f.read()
+
+
+def get_version():
+    return re.findall("__version__ = '([\d\.]+)'",
+                      read('marionette_driver', '__init__.py'), re.M)[0]
 
-# dependencies
-with open('requirements.txt') as f:
-    deps = f.read().splitlines()
 
 setup(name='marionette_driver',
-      version=version,
+      version=get_version(),
       description="Marionette Driver",
       long_description='See http://marionette-driver.readthedocs.org/',
       classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -19,5 +32,5 @@ setup(name='marionette_driver',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires=deps,
+      install_requires=read('requirements.txt').splitlines(),
       )

testing/marionette/transport/marionette_transport/__init__.py

@@ -1 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+__version__ = '0.5'
+
+
 from transport import MarionetteTransport

testing/marionette/transport/setup.py

@@ -1,6 +1,24 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import re
 from setuptools import setup, find_packages
 
-version = '0.5'
+
+THIS_DIR = os.path.dirname(os.path.realpath(__name__))
+
+
+def read(*parts):
+    with open(os.path.join(THIS_DIR, *parts)) as f:
+        return f.read()
+
+
+def get_version():
+    return re.findall("__version__ = '([\d\.]+)'",
+                      read('marionette_transport', '__init__.py'), re.M)[0]
+
 
 long_description = \
 """Marionette_ is a Mozilla project to enable remote automation in Gecko-based
@@ -14,11 +32,9 @@ points; rather it's designed to be used by a Marionette client implementation.
 .. _Marionette: https://developer.mozilla.org/en/Marionette
 .. _`Selenium Webdriver`: http://www.seleniumhq.org/projects/webdriver/"""
 
-# dependencies
-deps = []
 
 setup(name='marionette-transport',
-      version=version,
+      version=get_version(),
       description="Transport layer for Marionette client",
       long_description=long_description,
       classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
@@ -33,6 +49,5 @@ setup(name='marionette-transport',
       zip_safe=False,
       entry_points="""
       """,
-      install_requires=deps,
+      install_requires=[],
       )
-