Backed out changeset 4376d47f325b (bug 1639624) for bustage. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Thu, 21 May 2020 03:58:54 +0300
changeset 531363 e1d2e169db4ee4b25ecef6862411736e671cf76d
parent 531362 3978210495447999e98a443aa838a934270cda2b
child 531364 ec14e039b76a043d34c813d364b26e051d4a269d
push id37438
push userabutkovits@mozilla.com
push dateThu, 21 May 2020 09:36:57 +0000
treeherdermozilla-central@2d00a1a6495c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1639624
milestone78.0a1
backs out4376d47f325bd95a3e09e16bcb194a13f5e2e98c
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 4376d47f325b (bug 1639624) for bustage. CLOSED TREE
python/mach_commands.py
--- a/python/mach_commands.py
+++ b/python/mach_commands.py
@@ -20,16 +20,17 @@ from concurrent.futures import (
 import mozinfo
 from mozfile import which
 from manifestparser import TestManifest
 from manifestparser import filters as mpf
 
 from mozbuild.base import (
     MachCommandBase,
 )
+from mozbuild.virtualenv import VirtualenvManager
 
 from mach.decorators import (
     CommandArgument,
     CommandProvider,
     Command,
 )
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -234,17 +235,16 @@ class MachCommands(MachCommandBase):
     def _activate_test_virtualenvs(self, python):
         """Make sure the test suite virtualenvs are set up and activated.
 
         Args:
             python: Optional python version string we want to run the suite with.
                 See the `--python` argument to the `mach python-test` command.
         """
         from mozbuild.pythonutil import find_python3_executable
-        from mozbuild.virtualenv import VirtualenvManager
 
         default_manager = self.virtualenv_manager
 
         # Grab the default virtualenv properties before we activate other virtualenvs.
         python = python or default_manager.python_path
         py3_root = default_manager.virtualenv_root + '_py3'
 
         self.activate_pipenv(pipfile=None, populate=True, python=python)