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
This commit is contained in:
Henrik Skupin 2016-11-25 10:07:45 +01:00
parent 64aabf2af2
commit 42083c7956
6 changed files with 45 additions and 10 deletions

View File

@ -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,

View File

@ -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',

View File

@ -0,0 +1,8 @@
marionette-client
=================
marionette_client has been renamed and is now available as marionette-harness:
* marionette-harness <https://pypi.python.org/pypi/marionette-harness/>`_
Please consider migrating to this new package.

View File

@ -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,

View File

@ -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

View File

@ -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,