From 1ad79e5d65549beb214f0cd18d3ce60e7c319750 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Thu, 1 Oct 2020 20:30:26 +0000 Subject: [PATCH] Bug 1668097 - Update websocketprocessbridge dependencies for py3; r=bc Under python 3, use a separate requirements file to install newer versions of twisted and ipaddr; keep the original requirements under python 2 as the latest versions are problematic in our Windows CI environment. Differential Revision: https://phabricator.services.mozilla.com/D91942 --- testing/mochitest/mach_commands.py | 2 +- .../websocketprocessbridge_requirements_3.txt | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt diff --git a/testing/mochitest/mach_commands.py b/testing/mochitest/mach_commands.py index b21f23b58ce3..3fb1d951fdf3 100644 --- a/testing/mochitest/mach_commands.py +++ b/testing/mochitest/mach_commands.py @@ -372,7 +372,7 @@ class MachCommands(MachCommandBase): if ('mochitest', 'media') in suites: req = os.path.join('testing', 'tools', 'websocketprocessbridge', - 'websocketprocessbridge_requirements.txt') + 'websocketprocessbridge_requirements_3.txt') self.virtualenv_manager.activate() self.virtualenv_manager.install_pip_requirements(req, require_hashes=False) diff --git a/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt b/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt new file mode 100644 index 000000000000..5a3d9e24e7a9 --- /dev/null +++ b/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt @@ -0,0 +1,15 @@ +# This file is the websocketprocess requirements.txt used with python 3. + +# needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi +six +vcversioner==2.16.0.0 +twisted>=18.7.0 + +# websocket adapter for twisted, might be built into twisted someday +txws==0.9.1 + +psutil>=5.6.3 + +# Needed by iceserver +ipaddr>=2.2.0 +passlib==1.6.5