Bug 1306691 - Remove support for easy_install; r?ted draft
authorGregory Szorc <gps@mozilla.com>
Fri, 30 Sep 2016 12:17:08 -0700
changeset 419667 6b8191a1e430be904ee68504fc3270865ae8228e
parent 419666 9eacf0146ef7529d8bb98d26a3d6a447d7756a69
child 419668 5c4ca3ca59ed1593f28015d930d7e99e4b82dd19
push id30991
push userbmo:gps@mozilla.com
push dateFri, 30 Sep 2016 19:22:21 +0000
reviewersted
bugs1306691, 761809
milestone52.0a1
Bug 1306691 - Remove support for easy_install; r?ted Support for easy_install was added in bug 761809 as part of supporting pywin32. We just removed support for pywin32. And there are no in-tree consumers using the "easy_install" install method. Furthermore, easy_install is effectively deprecated as a package install mechanism: pip should always be used. So, we remove support for easy_install from mozharness. MozReview-Commit-ID: CN1meLukqY6
testing/mozharness/configs/talos/windows_config.py
testing/mozharness/mozharness/base/python.py
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@@ -15,18 +15,16 @@ config = {
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "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',
         'tooltool.py': [PYTHON, 'C:/mozilla-build/tooltool.py'],
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "clobber",
--- a/testing/mozharness/mozharness/base/python.py
+++ b/testing/mozharness/mozharness/base/python.py
@@ -235,34 +235,16 @@ class VirtualenvMixin(object):
             # https://bugzilla.mozilla.org/show_bug.cgi?id=1007230#c802
             command += ['--timeout', str(c.get('pip_timeout', 120))]
             for requirement in requirements:
                 command += ["-r", requirement]
             if c.get('find_links') and not c["pip_index"]:
                 command += ['--no-index']
             for opt in global_options:
                 command += ["--global-option", opt]
-        elif install_method == 'easy_install':
-            if not module:
-                self.fatal("module parameter required with install_method='easy_install'")
-            if requirements:
-                # Install pip requirements files separately, since they're
-                # not understood by easy_install.
-                self.install_module(requirements=requirements,
-                                    install_method='pip')
-            # Allow easy_install to be overridden by
-            # self.config['exes']['easy_install']
-            default = 'easy_install'
-            if self._is_windows():
-                # Don't invoke `easy_install` directly on windows since
-                # the 'install' in the executable name hits UAC
-                # - http://answers.microsoft.com/en-us/windows/forum/windows_7-security/uac-message-do-you-want-to-allow-the-following/bea30ad8-9ef8-4897-aab4-841a65f7af71
-                # - https://bugzilla.mozilla.org/show_bug.cgi?id=791840
-                default = [self.query_python_path(), self.query_python_path('easy_install-script.py')]
-            command = self.query_exe('easy_install', default=default, return_type="list")
         else:
             self.fatal("install_module() doesn't understand an install_method of %s!" % install_method)
 
         # Add --find-links pages to look at. Add --trusted-host automatically if
         # the host isn't secure. This allows modern versions of pip to connect
         # without requiring an override.
         proxxy = Proxxy(self.config, self.log_obj)
         trusted_hosts = set()