Bug 1239987 - Merge marionette-transport into marionette-driver; r=automatedtester

testing/marionette/driver/marionette_driver/marionette.py

@@ -15,12 +15,12 @@ from contextlib import contextmanager
 
 from decorators import do_crash_check
 from keys import Keys
-import marionette_transport as transport
 
 from mozrunner import B2GEmulatorRunner
 
 import geckoinstance
 import errors
+import transport
 
 WEBELEMENT_KEY = "ELEMENT"
 W3C_WEBELEMENT_KEY = "element-6066-11e4-a52e-4f735466cecf"

testing/marionette/driver/requirements.txt

@@ -1,2 +1 @@
-marionette-transport == 1.2.0
 mozrunner >= 6.9

testing/marionette/transport/marionette_transport/__init__.py

@@ -1,7 +0,0 @@
-# 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__ = '1.2.0'
-
-from transport import *

testing/marionette/transport/setup.py

@@ -1,53 +0,0 @@
-# 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
-
-
-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
-projects, including desktop Firefox, mobile Firefox, and Firefox OS. It is
-inspired by `Selenium Webdriver`_.
-
-This package defines the transport layer used by a Marionette client to
-communicate with the Marionette server embedded in Gecko.  It has no entry
-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/"""
-
-
-setup(name='marionette-transport',
-      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
-      keywords='mozilla',
-      author='Mozilla Automation and Tools Team',
-      author_email='tools@lists.mozilla.org',
-      url='https://developer.mozilla.org/en-US/docs/Marionette',
-      license='MPL',
-      packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-      package_data={},
-      include_package_data=False,
-      zip_safe=False,
-      entry_points="""
-      """,
-      install_requires=[],
-      )