From 42083c7956f405cb675b183531b63eb7713a3d8f Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Fri, 25 Nov 2016 10:07:45 +0100 Subject: [PATCH] Bug 1320073 - Release marionette-driver 2.2.0 and marionette-client 3.3.0. r=maja_zf MozReview-Commit-ID: JgdkguPKOoA --HG-- extra : rebase_source : d7659acc46ef3c56128726926139ca1e3ee48b73 --- .../client/marionette_driver/__init__.py | 2 +- testing/marionette/client/setup.py | 15 ++++++++++- testing/marionette/harness/README.rst | 8 ++++++ .../marionette/harness/marionette/__init__.py | 2 +- testing/marionette/harness/requirements.txt | 2 +- testing/marionette/harness/setup.py | 26 ++++++++++++++----- 6 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 testing/marionette/harness/README.rst diff --git a/testing/marionette/client/marionette_driver/__init__.py b/testing/marionette/client/marionette_driver/__init__.py index bdce8d6d91ad..d947d9c27cd9 100644 --- a/testing/marionette/client/marionette_driver/__init__.py +++ b/testing/marionette/client/marionette_driver/__init__.py @@ -2,7 +2,7 @@ # 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__ = '2.1.0' +__version__ = '2.2.0' from marionette_driver import ( addons, diff --git a/testing/marionette/client/setup.py b/testing/marionette/client/setup.py index 9a1d99919113..b73b17d08a38 100644 --- a/testing/marionette/client/setup.py +++ b/testing/marionette/client/setup.py @@ -23,7 +23,20 @@ setup(name='marionette_driver', version=get_version(), description="Marionette Driver", long_description='See http://marionette-client.readthedocs.org/en/latest/', - classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)', + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX', + 'Topic :: Software Development :: Quality Assurance', + 'Topic :: Software Development :: Testing', + 'Topic :: Utilities', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + ], keywords='mozilla', author='Auto-tools', author_email='tools-marionette@lists.mozilla.org', diff --git a/testing/marionette/harness/README.rst b/testing/marionette/harness/README.rst new file mode 100644 index 000000000000..495ec06e9435 --- /dev/null +++ b/testing/marionette/harness/README.rst @@ -0,0 +1,8 @@ +marionette-client +================= + +marionette_client has been renamed and is now available as marionette-harness: + +* marionette-harness `_ + +Please consider migrating to this new package. diff --git a/testing/marionette/harness/marionette/__init__.py b/testing/marionette/harness/marionette/__init__.py index e9e70a57c9d5..2d19db6cf08e 100644 --- a/testing/marionette/harness/marionette/__init__.py +++ b/testing/marionette/harness/marionette/__init__.py @@ -2,7 +2,7 @@ # 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__ = '3.2.0' +__version__ = '3.3.0' from .marionette_test import ( CommonTestCase, diff --git a/testing/marionette/harness/requirements.txt b/testing/marionette/harness/requirements.txt index 95da7a201e72..3fab7c2d1bda 100644 --- a/testing/marionette/harness/requirements.txt +++ b/testing/marionette/harness/requirements.txt @@ -1,6 +1,6 @@ browsermob-proxy >= 0.6.0 manifestparser >= 1.1 -marionette-driver >= 2.1.0 +marionette-driver >= 2.2.0 mozcrash >= 0.5 mozdevice >= 0.44 mozinfo >= 0.8 diff --git a/testing/marionette/harness/setup.py b/testing/marionette/harness/setup.py index c768cd1d7947..14c743a22728 100644 --- a/testing/marionette/harness/setup.py +++ b/testing/marionette/harness/setup.py @@ -1,5 +1,6 @@ import os import re + from setuptools import setup, find_packages @@ -19,14 +20,27 @@ def get_version(): setup(name='marionette_client', version=get_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 + long_description=open('README.rst').read(), + # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[ + 'Development Status :: 7 - Inactive', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)', + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'Operating System :: POSIX', + 'Topic :: Software Development :: Quality Assurance', + 'Topic :: Software Development :: Testing', + 'Topic :: Utilities', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + ], keywords='mozilla', - author='Jonathan Griffin', - author_email='jgriffin@mozilla.com', + author='Auto-tools', + author_email='tools-marionette@lists.mozilla.org', url='https://wiki.mozilla.org/Auto-tools/Projects/Marionette', - license='MPL', - packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), + license='Mozilla Public License 2.0 (MPL 2.0)', + packages=['marionette_client'], package_data={'marionette': ['touch/*.js']}, include_package_data=True, zip_safe=False,