Bug 1306691 - Remove references to pywin32 package; r?ted
pywin32 was removed as a requirement to run Talos in
bug 726700,
~3 years ago. The references in mozharness were never updated,
apparently.
MozReview-Commit-ID: FMYxLCNa63H
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@@ -11,17 +11,17 @@ config = {
"installer_path": "installer.exe",
"virtualenv_path": VENV_PATH,
"virtualenv_python_dll": PYTHON_DLL,
"pip_index": False,
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
- "virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
+ "virtualenv_modules": ['talos', 'mozinstall'],
"exes": {
'python': PYTHON,
'virtualenv': [PYTHON, 'c:/mozilla-build/buildbotve/virtualenv.py'],
'easy_install': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': 'c:/mozilla-build/hg/hg',
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -21,17 +21,16 @@ config = {
'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
},
###
"installer_path": INSTALLER_PATH,
"binary_path": BINARY_PATH,
"xpcshell_name": XPCSHELL_NAME,
"virtualenv_path": 'venv',
"virtualenv_python_dll": os.path.join(os.path.dirname(sys.executable), "python27.dll"),
- "virtualenv_modules": ['pywin32'],
"find_links": [
"http://pypi.pvt.build.mozilla.org/pub",
"http://pypi.pub.build.mozilla.org/pub",
],
"pip_index": False,
"exe_suffix": EXE_SUFFIX,
"run_file_names": {
--- a/testing/mozharness/mozharness/base/python.py
+++ b/testing/mozharness/mozharness/base/python.py
@@ -456,18 +456,16 @@ class VirtualenvMixin(object):
self.fatal("Can't install module without module name: %s" %
str(module))
module_url = module.get('url', None)
global_options = module.get('global_options', [])
else:
module_url = self.config.get('%s_url' % module, module_url)
module_name = module
install_method = 'pip'
- if module_name in ('pywin32',):
- install_method = 'easy_install'
self.install_module(module=module_name,
module_url=module_url,
install_method=install_method,
requirements=requirements,
global_options=global_options)
for module, url, method, requirements, optional, two_pass, editable in \
self._virtualenv_modules: