Bug 1790137 - Remove python 2 support for websocketprocessbridge; r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D156994

testing/mochitest/moz.build

@@ -200,7 +200,6 @@ TEST_HARNESS_FILES.testing.mochitest.iceserver += [
 
 TEST_HARNESS_FILES.testing.mochitest.websocketprocessbridge += [
     "/testing/tools/websocketprocessbridge/websocketprocessbridge.py",
-    "/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt",
     "/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt",
 ]
 

testing/mozharness/scripts/android_emulator_unittest.py

@@ -28,7 +28,6 @@ from mozharness.mozilla.testing.codecoverage import (
     code_coverage_config_options,
 )
 
-PY2 = sys.version_info.major == 2
 SUITE_DEFAULT_E10S = ["geckoview-junit", "mochitest", "reftest"]
 SUITE_NO_E10S = ["cppunittest", "gtest", "jittest", "xpcshell"]
 SUITE_REPEATABLE = ["mochitest", "reftest"]
@@ -428,16 +427,12 @@ class AndroidEmulatorTest(
         dirs = self.query_abs_dirs()
         requirements = None
         suites = self._query_suites()
-        if PY2:
-            wspb_requirements = "websocketprocessbridge_requirements.txt"
-        else:
-            wspb_requirements = "websocketprocessbridge_requirements_3.txt"
         if ("mochitest-media", "mochitest-media") in suites:
             # mochitest-media is the only thing that needs this
             requirements = os.path.join(
                 dirs["abs_mochitest_dir"],
                 "websocketprocessbridge",
-                wspb_requirements,
+                "websocketprocessbridge_requirements_3.txt",
             )
         if requirements:
             self.register_virtualenv_module(requirements=[requirements], two_pass=True)

testing/mozharness/scripts/android_hardware_unittest.py

@@ -24,7 +24,6 @@ from mozharness.mozilla.testing.android import AndroidMixin
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 from mozharness.mozilla.testing.codecoverage import CodeCoverageMixin
 
-PY2 = sys.version_info.major == 2
 SUITE_DEFAULT_E10S = ["geckoview-junit", "mochitest", "reftest"]
 SUITE_NO_E10S = ["cppunittest", "gtest", "jittest"]
 SUITE_REPEATABLE = ["mochitest", "reftest"]
@@ -356,17 +355,12 @@ class AndroidHardwareTest(
         dirs = self.query_abs_dirs()
         requirements = None
         suites = self._query_suites()
-        # mochitest is the only thing that needs this
-        if PY2:
-            wspb_requirements = "websocketprocessbridge_requirements.txt"
-        else:
-            wspb_requirements = "websocketprocessbridge_requirements_3.txt"
         if ("mochitest-media", "mochitest-media") in suites:
             # mochitest-media is the only thing that needs this
             requirements = os.path.join(
                 dirs["abs_mochitest_dir"],
                 "websocketprocessbridge",
-                wspb_requirements,
+                "websocketprocessbridge_requirements_3.txt",
             )
         if requirements:
             self.register_virtualenv_module(requirements=[requirements], two_pass=True)

testing/mozharness/scripts/desktop_unittest.py

@@ -41,7 +41,6 @@ from mozharness.mozilla.testing.codecoverage import (
 )
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 
-PY2 = sys.version_info.major == 2
 SUITE_CATEGORIES = [
     "gtest",
     "cppunittest",
@@ -492,15 +491,11 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
 
         if self._query_specified_suites("mochitest") is not None:
             # mochitest is the only thing that needs this
-            if PY2:
-                wspb_requirements = "websocketprocessbridge_requirements.txt"
-            else:
-                wspb_requirements = "websocketprocessbridge_requirements_3.txt"
             requirements_files.append(
                 os.path.join(
                     dirs["abs_mochitest_dir"],
                     "websocketprocessbridge",
-                    wspb_requirements,
+                    "websocketprocessbridge_requirements_3.txt",
                 )
             )
 

testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt

@@ -1,15 +0,0 @@
-six
-vcversioner==2.16.0.0
-twisted==10.2.0
-
-# websocket adapter for twisted, might be built into twisted someday
-autobahn==21.2.1
-
-psutil>=5.6.3
-
-# Needed by iceserver
-ipaddr==2.1.11
-passlib==1.7.4
-
-pyOpenSSL
-service_identity