Bug 1238733 - Bump version for firefox-puppeteer and update dependencies; r?whimboo;sydpolk
firefox-puppeteer = 4.0.0
firefox-ui-harness = 1.3.0
external-media-tests = 2.0
MozReview-Commit-ID: BfiL39umlrA
--- a/dom/media/test/external/requirements.txt
+++ b/dom/media/test/external/requirements.txt
@@ -10,14 +10,11 @@ mozInstall==1.12
mozlog==3.1
moznetwork==0.27
mozprocess==0.22
mozprofile==0.28
mozrunner==6.11
moztest==0.7
mozversion==1.4
wptserve==1.3.0
-marionette-client == 2.2.0
-marionette-driver == 1.3.0
-firefox-puppeteer==3.2.0
-
-# Install the firefox media tests package
-./
+marionette-client==2.2.0
+marionette-driver==1.3.0
+firefox-puppeteer==4.0.0
--- a/dom/media/test/external/setup.py
+++ b/dom/media/test/external/setup.py
@@ -1,23 +1,23 @@
# 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
from setuptools import setup, find_packages
-PACKAGE_VERSION = '1.0'
+PACKAGE_VERSION = '2.0'
+
+THIS_DIR = os.path.dirname(os.path.realpath(__name__))
-deps = [
- 'marionette-client == 2.2.0',
- 'marionette-driver == 1.3.0',
- 'mozlog == 3.1',
- 'manifestparser == 1.1',
- 'firefox-puppeteer >= 3.2.0, <4.0.0',
-]
+
+def read(*parts):
+ with open(os.path.join(THIS_DIR, *parts)) as f:
+ return f.read()
setup(name='external-media-tests',
version=PACKAGE_VERSION,
description=('A collection of Mozilla Firefox media playback tests run '
'with Marionette'),
classifiers=[
'Environment :: Console',
'Intended Audience :: Developers',
@@ -29,14 +29,14 @@ setup(name='external-media-tests',
],
keywords='mozilla',
author='Mozilla Automation and Tools Team',
author_email='tools@lists.mozilla.org',
url='https://hg.mozilla.org/mozilla-central/dom/media/test/external/',
license='MPL 2.0',
packages=find_packages(),
zip_safe=False,
- install_requires=deps,
+ install_requires=read('requirements.txt').splitlines(),
include_package_data=True,
entry_points="""
[console_scripts]
external-media-tests = external_media_harness:cli
""")
--- a/testing/firefox-ui/harness/firefox_ui_harness/__init__.py
+++ b/testing/firefox-ui/harness/firefox_ui_harness/__init__.py
@@ -1,8 +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__ = '1.2.0'
+__version__ = '1.3.0'
import cli_functional
import cli_update
--- a/testing/firefox-ui/harness/requirements.txt
+++ b/testing/firefox-ui/harness/requirements.txt
@@ -1,11 +1,5 @@
+firefox-puppeteer >= 3.0.0, <5.0.0
marionette-client >= 2.2.0
mozfile >= 1.2
mozinfo >= 0.8
mozinstall >= 1.12
-
-# We make use of code of other packages, which should not be required by this package.
-# Make sure that we can kill those dependencies soon. We have to comment them all out
-# to avoid installations of those packages from pypi.
-
-# Necessary because of the testcase classes
-# firefox-puppeteer == 3.2.0
--- a/testing/puppeteer/firefox/firefox_puppeteer/__init__.py
+++ b/testing/puppeteer/firefox/firefox_puppeteer/__init__.py
@@ -4,17 +4,17 @@
import os
from marionette_driver.marionette import HTMLElement
from decorators import use_class_as_property
-__version__ = '3.2.0'
+__version__ = '4.0.0'
class Puppeteer(object):
"""The puppeteer class is used to expose libraries to test cases.
example:
`class MyTestCase(MarionetteTestCase, Puppeteer)`