diff --git a/testing/marionette/client/requirements.txt b/testing/marionette/client/requirements.txt index fa552232a473..c435757808ee 100644 --- a/testing/marionette/client/requirements.txt +++ b/testing/marionette/client/requirements.txt @@ -1,5 +1,5 @@ marionette-transport == 0.4 -marionette-driver == 0.1 +marionette-driver == 0.2 manifestparser mozhttpd >= 0.5 mozinfo >= 0.7 diff --git a/testing/marionette/client/setup.py b/testing/marionette/client/setup.py index f9eb442690ed..0c21724b6f72 100644 --- a/testing/marionette/client/setup.py +++ b/testing/marionette/client/setup.py @@ -1,8 +1,6 @@ -import os from setuptools import setup, find_packages -import sys -version = '0.8.7' +version = '0.9' # dependencies with open('requirements.txt') as f: @@ -12,7 +10,7 @@ setup(name='marionette_client', version=version, description="Marionette test automation client", long_description='See http://marionette-client.readthedocs.org/', - classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers keywords='mozilla', author='Jonathan Griffin', author_email='jgriffin@mozilla.com', @@ -29,4 +27,3 @@ setup(name='marionette_client', """, install_requires=deps, ) - diff --git a/testing/marionette/driver/MANIFEST.in b/testing/marionette/driver/MANIFEST.in new file mode 100644 index 000000000000..cf628b039c52 --- /dev/null +++ b/testing/marionette/driver/MANIFEST.in @@ -0,0 +1,2 @@ +exclude MANIFEST.in +include requirements.txt diff --git a/testing/marionette/driver/setup.py b/testing/marionette/driver/setup.py index bd544e676658..75acd2092ef3 100644 --- a/testing/marionette/driver/setup.py +++ b/testing/marionette/driver/setup.py @@ -1,8 +1,6 @@ -import os from setuptools import setup, find_packages -import sys -version = '0.1.0' +version = '0.2' # dependencies with open('requirements.txt') as f: @@ -12,16 +10,14 @@ setup(name='marionette_driver', version=version, description="Marionette Driver", long_description='See http://marionette-driver.readthedocs.org/', - classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers keywords='mozilla', author='Auto-tools', author_email='tools-marionette@lists.mozilla.org', url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette', license='MPL', packages=find_packages(), - #package_data={'marionette_driver': ['touch/*.js']}, include_package_data=True, zip_safe=False, install_requires=deps, ) -