raptorpy3.diff

raptorpy3.diff

diff --git a/mach b/mach
--- a/mach
+++ b/mach
@@ -17,9 +17,6 @@ py2commands="
     jsshell-bench
     marionette-test
     jstests
-    mozharness
-    raptor
-    raptor-test
     telemetry-tests-client
     test
     wpt-metadata-merge
diff --git a/testing/mozharness/mozharness/base/python.py b/testing/mozharness/mozharness/base/python.py
--- a/testing/mozharness/mozharness/base/python.py
+++ b/testing/mozharness/mozharness/base/python.py
@@ -70,15 +70,15 @@ virtualenv_config_options = [
             "help": "Specify the path to the virtualenv top level directory",
         },
     ],
-    [
-        ["--find-links"],
-        {
-            "action": "extend",
-            "dest": "find_links",
-            "default": ["https://pypi.pub.build.mozilla.org/pub/"],
-            "help": "URL to look for packages at",
-        },
-    ],
+    # [
+    #     ["--find-links"],
+    #     {
+    #         "action": "extend",
+    #         "dest": "find_links",
+    #         "default": ["https://pypi.pub.build.mozilla.org/pub/"],
+    #         "help": "URL to look for packages at",
+    #     },
+    # ],
     [
         ["--pip-index"],
         {
diff --git a/testing/mozharness/mozharness/mozilla/testing/raptor.py b/testing/mozharness/mozharness/mozilla/testing/raptor.py
--- a/testing/mozharness/mozharness/mozilla/testing/raptor.py
+++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py
@@ -994,7 +994,7 @@ class Raptor(
         if self.run_local:
             # Add modules required for visual metrics
             modules.extend(
-                ["numpy==1.16.1", "Pillow==6.1.0", "scipy==1.2.3", "pyssim==0.4"]
+                ["numpy==1.19.5", "Pillow==8.1.0", "scipy==1.6.0", "pyssim==0.4"]
             )

         # Require pip >= 1.5 so pip will prefer .whl files to install
diff --git a/testing/raptor/raptor/browsertime/base.py b/testing/raptor/raptor/browsertime/base.py
--- a/testing/raptor/raptor/browsertime/base.py
+++ b/testing/raptor/raptor/browsertime/base.py
@@ -406,7 +406,7 @@ class Browsertime(Perftest):
                 if self.browsertime_failure, and raise an Exception if necessary
                 to stop Raptor execution (preventing the results processing).
                 """
-                match = line_matcher.match(line)
+                match = line_matcher.match(str(line))
                 if not match:
                     LOG.info(line)
                     return
diff --git a/testing/raptor/requirements.txt b/testing/raptor/requirements.txt
--- a/testing/raptor/requirements.txt
+++ b/testing/raptor/requirements.txt
@@ -2,7 +2,7 @@ mozcrash ~= 2.0
 mozrunner ~= 7.0
 mozprofile ~= 2.1
 manifestparser >= 1.1
-wptserve ~= 2.0
+wptserve ~= 3.0
 mozdevice >= 4.0.0
 pyyaml ~= 3.1
 mozpower >= 1.0.0
diff --git a/tools/browsertime/mach_commands.py b/tools/browsertime/mach_commands.py
--- a/tools/browsertime/mach_commands.py
+++ b/tools/browsertime/mach_commands.py
@@ -49,7 +49,7 @@ import mozpack.path as mozpath

 AUTOMATION = "MOZ_AUTOMATION" in os.environ
 BROWSERTIME_ROOT = os.path.dirname(__file__)
-PILLOW_VERSION = "6.0.0"
+PILLOW_VERSION = "8.1.0"
 PYSSIM_VERSION = "0.4"