Bug 1341215 - Remove the dependency on the mozregression module for mach artifact. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 21 Feb 2017 16:10:54 +0900
changeset 374130 4f108fc57f7cb11c46bc30ba27ed3c70b088e32a
parent 374129 7d817a123f53088c543ae09fafa386c4f4105fc4
child 374131 f967d32a9efb6cc566985c6bdfde466c67ad8a17
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1341215
milestone54.0a1
Bug 1341215 - Remove the dependency on the mozregression module for mach artifact. r=chmanchester This imports two modules from mozregression in the tree to do so. They are imported from current trunk on github, rather than the version we were getting from pypi. Note we take six from testing/web-platform/tests/tools/six) instead of moving it to python/six because it's there by coming from a copy of https://github.com/w3c/wpt-tools, which contains it as a submodule, and moving it would make updates there harder.
build/mach_bootstrap.py
python/mozbuild/mozbuild/artifacts.py
python/mozbuild/mozbuild/mach_commands.py
--- a/build/mach_bootstrap.py
+++ b/build/mach_bootstrap.py
@@ -37,16 +37,17 @@ SEARCH_PATHS = [
     'python/mach',
     'python/mozboot',
     'python/mozbuild',
     'python/mozlint',
     'python/mozversioncontrol',
     'python/blessings',
     'python/compare-locales',
     'python/configobj',
+    'python/dlmanager',
     'python/futures',
     'python/jsmin',
     'python/psutil',
     'python/pylru',
     'python/which',
     'python/pystache',
     'python/pyyaml/lib',
     'python/requests',
@@ -89,16 +90,17 @@ SEARCH_PATHS = [
     'testing/mozbase/moztest',
     'testing/mozbase/mozversion',
     'testing/mozbase/manifestparser',
     'testing/taskcluster',
     'testing/tools/autotry',
     'testing/web-platform',
     'testing/web-platform/harness',
     'testing/web-platform/tests/tools/wptserve',
+    'testing/web-platform/tests/tools/six',
     'testing/xpcshell',
     'xpcom/idl-parser',
 ]
 
 # Individual files providing mach commands.
 MACH_MODULES = [
     'addon-sdk/mach_commands.py',
     'build/valgrind/mach_commands.py',
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -74,20 +74,18 @@ from mozpack.files import (
     TarFinder,
 )
 from mozpack.mozjar import (
     JarReader,
     JarWriter,
 )
 from mozpack.packager.unpack import UnpackFinder
 import mozpack.path as mozpath
-from mozregression.download_manager import (
+from dlmanager import (
     DownloadManager,
-)
-from mozregression.persist_limit import (
     PersistLimit,
 )
 
 NUM_PUSHHEADS_TO_QUERY_PER_PARENT = 50  # Number of candidate pushheads to cache per parent changeset.
 
 # Number of parent changesets to consider as possible pushheads.
 # There isn't really such a thing as a reasonable default here, because we don't
 # know how many pushheads we'll need to look at to find a build with our artifacts,
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1494,18 +1494,17 @@ class PackageFrontend(MachCommandBase):
     def _make_artifacts(self, tree=None, job=None, skip_cache=False):
         # Undo PATH munging that will be done by activating the virtualenv,
         # so that invoked subprocesses expecting to find system python
         # (git cinnabar, in particular), will not find virtualenv python.
         original_path = os.environ.get('PATH', '')
         self._activate_virtualenv()
         os.environ['PATH'] = original_path
 
-        for package in ('taskcluster==0.0.32',
-                        'mozregression==1.0.2'):
+        for package in ('taskcluster==0.0.32',):
             self._install_pip_package(package)
 
         state_dir = self._mach_context.state_dir
         cache_dir = os.path.join(state_dir, 'package-frontend')
 
         try:
             os.makedirs(cache_dir)
         except OSError as e: