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
This commit is contained in:
Geoff Brown 2020-10-01 20:30:26 +00:00
Родитель e649e00f33
Коммит 1ad79e5d65
2 изменённых файлов: 16 добавлений и 1 удалений

Просмотреть файл

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

Просмотреть файл

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