Bug 1786490 - remove references to vendored pyparsing r=sylvestre,mach-reviewers,ahal,ahochheiden

loganrosen · loganrosen · commit 51f5fcdd757c · 2023-09-06T16:14:30.000Z
Not necessary because pyparsing is no longer a dependency of packaging, so it is no longer vendored. Differential Revision: https://phabricator.services.mozilla.com/D186411
diff --git a/build/mach_initialize.py b/build/mach_initialize.py
@@ -146,14 +146,12 @@ def initialize(topsrcdir, args=()):
         shutil.rmtree(deleted_dir, ignore_errors=True)
 
     # We need the "mach" module to access the logic to parse virtualenv
-    # requirements. Since that depends on "packaging" (and, transitively,
-    # "pyparsing"), we add those to the path too.
+    # requirements. Since that depends on "packaging", we add it to the path too.
     sys.path[0:0] = [
         os.path.join(topsrcdir, module)
         for module in (
             os.path.join("python", "mach"),
             os.path.join("third_party", "python", "packaging"),
-            os.path.join("third_party", "python", "pyparsing"),
         )
     ]
 
diff --git a/configure.py b/configure.py
@@ -18,7 +18,6 @@
 sys.path.insert(0, os.path.join(base_dir, "python", "mozboot"))
 sys.path.insert(0, os.path.join(base_dir, "python", "mozbuild"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "packaging"))
-sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "pyparsing"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "six"))
 sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "looseversion"))
 import mozpack.path as mozpath
diff --git a/python/mach/mach/test/test_site_activation.py b/python/mach/mach/test/test_site_activation.py
@@ -314,7 +314,6 @@ def _activation_context():
     required_mach_sys_paths = [
         topsrcdir / "python" / "mach",
         topsrcdir / "third_party" / "python" / "packaging",
-        topsrcdir / "third_party" / "python" / "pyparsing",
         topsrcdir / "third_party" / "python" / "pip",
     ]
 
diff --git a/python/mozperftest/mozperftest/runner.py b/python/mozperftest/mozperftest/runner.py
@@ -49,14 +49,12 @@ def _activate_virtualenvs():
     """
 
     # We need the "mach" module to access the logic to parse virtualenv
-    # requirements. Since that depends on "packaging" (and, transitively,
-    # "pyparsing"), we add those to the path too.
+    # requirements. Since that depends on "packaging", we add that to the path too.
     sys.path[0:0] = [
         os.path.join(SRC_ROOT, module)
         for module in (
             os.path.join("python", "mach"),
             os.path.join("third_party", "python", "packaging"),
-            os.path.join("third_party", "python", "pyparsing"),
         )
     ]
 
diff --git a/python/sites/common.txt b/python/sites/common.txt
@@ -40,7 +40,6 @@ vendored:third_party/python/ply
 vendored:third_party/python/pyasn1
 vendored:third_party/python/pyasn1_modules
 vendored:third_party/python/pylru
-vendored:third_party/python/pyparsing
 vendored:third_party/python/pyrsistent
 vendored:third_party/python/python_dateutil
 vendored:third_party/python/python_slugify
diff --git a/python/sites/docs.txt b/python/sites/docs.txt
@@ -65,7 +65,6 @@ vendored:third_party/python/mohawk
 vendored:third_party/python/mozilla_repo_urls
 vendored:third_party/python/packaging
 vendored:third_party/python/pkgutil_resolve_name
-vendored:third_party/python/pyparsing
 vendored:third_party/python/python_dateutil
 vendored:third_party/python/python_slugify
 vendored:third_party/python/redo
diff --git a/python/sites/lint.txt b/python/sites/lint.txt
@@ -17,7 +17,6 @@ vendored:third_party/python/mohawk
 vendored:third_party/python/mozilla_repo_urls
 vendored:third_party/python/multidict
 vendored:third_party/python/pathspec
-vendored:third_party/python/pyparsing
 vendored:third_party/python/pyrsistent
 vendored:third_party/python/python_dateutil
 vendored:third_party/python/python_slugify
diff --git a/python/sites/mach.txt b/python/sites/mach.txt
@@ -74,7 +74,6 @@ vendored:third_party/python/mozilla_version
 vendored:third_party/python/packaging
 vendored:third_party/python/pip
 vendored:third_party/python/pip_tools
-vendored:third_party/python/pyparsing
 vendored:third_party/python/python-hglib
 vendored:third_party/python/requests
 vendored:third_party/python/sentry_sdk
diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt
@@ -41,7 +41,6 @@ vendored:third_party/python/ply
 vendored:third_party/python/pyasn1
 vendored:third_party/python/pyasn1_modules
 vendored:third_party/python/pylru
-vendored:third_party/python/pyparsing
 vendored:third_party/python/pyrsistent
 vendored:third_party/python/python_dateutil
 vendored:third_party/python/python_slugify

Original file line number	Diff line number	Diff line change
`@@ -146,14 +146,12 @@ def initialize(topsrcdir, args=()):`
`146`	`146`	`shutil.rmtree(deleted_dir, ignore_errors=True)`
`147`	`147`
`148`	`148`	`# We need the "mach" module to access the logic to parse virtualenv`
`149`		`- # requirements. Since that depends on "packaging" (and, transitively,`
`150`		`- # "pyparsing"), we add those to the path too.`
	`149`	`+ # requirements. Since that depends on "packaging", we add it to the path too.`
`151`	`150`	`sys.path[0:0] = [`
`152`	`151`	`os.path.join(topsrcdir, module)`
`153`	`152`	`for module in (`
`154`	`153`	`os.path.join("python", "mach"),`
`155`	`154`	`os.path.join("third_party", "python", "packaging"),`
`156`		`- os.path.join("third_party", "python", "pyparsing"),`
`157`	`155`	`)`
`158`	`156`	`]`
`159`	`157`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,6 @@ def _activation_context():`
`314`	`314`	`required_mach_sys_paths = [`
`315`	`315`	`topsrcdir / "python" / "mach",`
`316`	`316`	`topsrcdir / "third_party" / "python" / "packaging",`
`317`		`- topsrcdir / "third_party" / "python" / "pyparsing",`
`318`	`317`	`topsrcdir / "third_party" / "python" / "pip",`
`319`	`318`	`]`
`320`	`319`
Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,12 @@ def _activate_virtualenvs():`
`49`	`49`	`"""`
`50`	`50`
`51`	`51`	`# We need the "mach" module to access the logic to parse virtualenv`
`52`		`- # requirements. Since that depends on "packaging" (and, transitively,`
`53`		`- # "pyparsing"), we add those to the path too.`
	`52`	`+ # requirements. Since that depends on "packaging", we add that to the path too.`
`54`	`53`	`sys.path[0:0] = [`
`55`	`54`	`os.path.join(SRC_ROOT, module)`
`56`	`55`	`for module in (`
`57`	`56`	`os.path.join("python", "mach"),`
`58`	`57`	`os.path.join("third_party", "python", "packaging"),`
`59`		`- os.path.join("third_party", "python", "pyparsing"),`
`60`	`58`	`)`
`61`	`59`	`]`
`62`	`60`