forked from mirrors/gecko-dev
Bug 1786490 - remove references to vendored pyparsing r=sylvestre,mach-reviewers,ahal,ahochheiden
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
This commit is contained in:
parent
983bcd711b
commit
51f5fcdd75
9 changed files with 2 additions and 13 deletions
|
|
@ -146,14 +146,12 @@ def initialize(topsrcdir, args=()):
|
||||||
shutil.rmtree(deleted_dir, ignore_errors=True)
|
shutil.rmtree(deleted_dir, ignore_errors=True)
|
||||||
|
|
||||||
# We need the "mach" module to access the logic to parse virtualenv
|
# We need the "mach" module to access the logic to parse virtualenv
|
||||||
# requirements. Since that depends on "packaging" (and, transitively,
|
# requirements. Since that depends on "packaging", we add it to the path too.
|
||||||
# "pyparsing"), we add those to the path too.
|
|
||||||
sys.path[0:0] = [
|
sys.path[0:0] = [
|
||||||
os.path.join(topsrcdir, module)
|
os.path.join(topsrcdir, module)
|
||||||
for module in (
|
for module in (
|
||||||
os.path.join("python", "mach"),
|
os.path.join("python", "mach"),
|
||||||
os.path.join("third_party", "python", "packaging"),
|
os.path.join("third_party", "python", "packaging"),
|
||||||
os.path.join("third_party", "python", "pyparsing"),
|
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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", "mozboot"))
|
||||||
sys.path.insert(0, os.path.join(base_dir, "python", "mozbuild"))
|
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", "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", "six"))
|
||||||
sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "looseversion"))
|
sys.path.insert(0, os.path.join(base_dir, "third_party", "python", "looseversion"))
|
||||||
import mozpack.path as mozpath
|
import mozpack.path as mozpath
|
||||||
|
|
|
||||||
|
|
@ -314,7 +314,6 @@ def _activation_context():
|
||||||
required_mach_sys_paths = [
|
required_mach_sys_paths = [
|
||||||
topsrcdir / "python" / "mach",
|
topsrcdir / "python" / "mach",
|
||||||
topsrcdir / "third_party" / "python" / "packaging",
|
topsrcdir / "third_party" / "python" / "packaging",
|
||||||
topsrcdir / "third_party" / "python" / "pyparsing",
|
|
||||||
topsrcdir / "third_party" / "python" / "pip",
|
topsrcdir / "third_party" / "python" / "pip",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,14 +49,12 @@ def _activate_virtualenvs():
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# We need the "mach" module to access the logic to parse virtualenv
|
# We need the "mach" module to access the logic to parse virtualenv
|
||||||
# requirements. Since that depends on "packaging" (and, transitively,
|
# requirements. Since that depends on "packaging", we add that to the path too.
|
||||||
# "pyparsing"), we add those to the path too.
|
|
||||||
sys.path[0:0] = [
|
sys.path[0:0] = [
|
||||||
os.path.join(SRC_ROOT, module)
|
os.path.join(SRC_ROOT, module)
|
||||||
for module in (
|
for module in (
|
||||||
os.path.join("python", "mach"),
|
os.path.join("python", "mach"),
|
||||||
os.path.join("third_party", "python", "packaging"),
|
os.path.join("third_party", "python", "packaging"),
|
||||||
os.path.join("third_party", "python", "pyparsing"),
|
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,6 @@ vendored:third_party/python/ply
|
||||||
vendored:third_party/python/pyasn1
|
vendored:third_party/python/pyasn1
|
||||||
vendored:third_party/python/pyasn1_modules
|
vendored:third_party/python/pyasn1_modules
|
||||||
vendored:third_party/python/pylru
|
vendored:third_party/python/pylru
|
||||||
vendored:third_party/python/pyparsing
|
|
||||||
vendored:third_party/python/pyrsistent
|
vendored:third_party/python/pyrsistent
|
||||||
vendored:third_party/python/python_dateutil
|
vendored:third_party/python/python_dateutil
|
||||||
vendored:third_party/python/python_slugify
|
vendored:third_party/python/python_slugify
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,6 @@ vendored:third_party/python/mohawk
|
||||||
vendored:third_party/python/mozilla_repo_urls
|
vendored:third_party/python/mozilla_repo_urls
|
||||||
vendored:third_party/python/packaging
|
vendored:third_party/python/packaging
|
||||||
vendored:third_party/python/pkgutil_resolve_name
|
vendored:third_party/python/pkgutil_resolve_name
|
||||||
vendored:third_party/python/pyparsing
|
|
||||||
vendored:third_party/python/python_dateutil
|
vendored:third_party/python/python_dateutil
|
||||||
vendored:third_party/python/python_slugify
|
vendored:third_party/python/python_slugify
|
||||||
vendored:third_party/python/redo
|
vendored:third_party/python/redo
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ vendored:third_party/python/mohawk
|
||||||
vendored:third_party/python/mozilla_repo_urls
|
vendored:third_party/python/mozilla_repo_urls
|
||||||
vendored:third_party/python/multidict
|
vendored:third_party/python/multidict
|
||||||
vendored:third_party/python/pathspec
|
vendored:third_party/python/pathspec
|
||||||
vendored:third_party/python/pyparsing
|
|
||||||
vendored:third_party/python/pyrsistent
|
vendored:third_party/python/pyrsistent
|
||||||
vendored:third_party/python/python_dateutil
|
vendored:third_party/python/python_dateutil
|
||||||
vendored:third_party/python/python_slugify
|
vendored:third_party/python/python_slugify
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,6 @@ vendored:third_party/python/mozilla_version
|
||||||
vendored:third_party/python/packaging
|
vendored:third_party/python/packaging
|
||||||
vendored:third_party/python/pip
|
vendored:third_party/python/pip
|
||||||
vendored:third_party/python/pip_tools
|
vendored:third_party/python/pip_tools
|
||||||
vendored:third_party/python/pyparsing
|
|
||||||
vendored:third_party/python/python-hglib
|
vendored:third_party/python/python-hglib
|
||||||
vendored:third_party/python/requests
|
vendored:third_party/python/requests
|
||||||
vendored:third_party/python/sentry_sdk
|
vendored:third_party/python/sentry_sdk
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@ vendored:third_party/python/ply
|
||||||
vendored:third_party/python/pyasn1
|
vendored:third_party/python/pyasn1
|
||||||
vendored:third_party/python/pyasn1_modules
|
vendored:third_party/python/pyasn1_modules
|
||||||
vendored:third_party/python/pylru
|
vendored:third_party/python/pylru
|
||||||
vendored:third_party/python/pyparsing
|
|
||||||
vendored:third_party/python/pyrsistent
|
vendored:third_party/python/pyrsistent
|
||||||
vendored:third_party/python/python_dateutil
|
vendored:third_party/python/python_dateutil
|
||||||
vendored:third_party/python/python_slugify
|
vendored:third_party/python/python_slugify
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue