зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1596590 - remove unnecessary psutil 5.4.3 specification from desktop_unittest.py r=gbrown
Changes: Remove the unnecessary psutil == 5.4.3 specifier in `desktop_unittest.py`. This should be a safe change. Prior to this patch, in a given test task the virtrualenv initialization will first install `psutil==5.6.3`, then proceed to invoke `desktop_unittest.py` where the `psutil==5.4.3` version forces the uninstallation of the newer version to install the older version. Differential Revision: https://phabricator.services.mozilla.com/D53302 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
8c43d6096b
Коммит
8b53684fdc
|
@ -490,7 +490,7 @@ class ResourceMonitoringMixin(PerfherderResourceOptionsMixin):
|
|||
def __init__(self, *args, **kwargs):
|
||||
super(ResourceMonitoringMixin, self).__init__(*args, **kwargs)
|
||||
|
||||
self.register_virtualenv_module('psutil>=3.1.1', method='pip',
|
||||
self.register_virtualenv_module('psutil>=5.6.3', method='pip',
|
||||
optional=True)
|
||||
self.register_virtualenv_module('mozsystemmonitor==0.4',
|
||||
method='pip', optional=True)
|
||||
|
|
|
@ -331,7 +331,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin,
|
|||
def _pre_create_virtualenv(self, action):
|
||||
dirs = self.query_abs_dirs()
|
||||
|
||||
self.register_virtualenv_module('psutil==5.4.3')
|
||||
self.register_virtualenv_module(name='mock')
|
||||
self.register_virtualenv_module(name='simplejson')
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ twisted==10.2.0
|
|||
# websocket adapter for twisted, might be built into twisted someday
|
||||
txws==0.9.1
|
||||
|
||||
psutil==5.4.3
|
||||
psutil>=5.6.3
|
||||
|
||||
# Needed by iceserver
|
||||
ipaddr==2.1.11
|
||||
|
|
Загрузка…
Ссылка в новой задаче