diff --git a/build/mach_initialize.py b/build/mach_initialize.py index 4a93d0199f02..d05c2c170bfd 100644 --- 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 index ee01e34f86f1..a3910dfe254b 100644 --- a/configure.py +++ b/configure.py @@ -18,7 +18,6 @@ sys.path.insert(0, os.path.join(base_dir, "python", "mach")) 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 index e034a27b7666..3683338409eb 100644 --- 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 index 30789bfdca7f..b29f61257fef 100644 --- 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 index 51c5e21af1ed..b1f8417521a5 100644 --- 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 index bc079f54275a..55ac66a8644b 100644 --- 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 index e9f0740ee7a1..8a710f47ad7e 100644 --- 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 index 52904b5bef49..0b566364ae39 100644 --- 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 index 3ab11a448176..b7068a1a5da7 100644 --- 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