Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1855716 - Move jsonschema, pyrsistent, and pkgutil_resolve_name dependencies back into mach.txt instead of specifying them in individual sites r=mach-reviewers,ahal

Browse Source 
D180501 made the original change that this patch undoes. An earlier
change in that stack inadvertently silently disabled Telemetry, which
hid this issue.

The problem is that `glean` (which we optionally install in the `mach`
site also needs `jsonschema` (and `jsonschema` depends on `pyrsistent`
and `pkgutil_resolve_name`). Since our vendored version was no longer
specified in the `mach.txt` site, it pulled a different version
(`4.19.1`) from the vendored version (`4.17.3`) which causes issues in
the `wpt` site.

Since glean explicitly needs `jsonschema` it never should have been
taken out of the `mach` site, so this patch corrects that mistake.

Differential Revision: https://phabricator.services.mozilla.com/D189553
This commit is contained in:
ahochheiden 2023-09-28 20:42:50 +00:00
parent eeab50e920
commit 869025981e
7 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/sites/build.txt
View File

@ -31,17 +31,14 @@ vendored:third_party/python/glean_parser
vendored:third_party/python/gyp/pylib vendored:third_party/python/gyp/pylib
vendored:third_party/python/jinja2_time vendored:third_party/python/jinja2_time
vendored:third_party/python/json-e vendored:third_party/python/json-e
vendored:third_party/python/jsonschema
vendored:third_party/python/mohawk 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/pkgutil_resolve_name
vendored:third_party/python/ply 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/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
vendored:third_party/python/redo vendored:third_party/python/redo

3
python/sites/common.txt
View File

@ -34,17 +34,14 @@ vendored:third_party/python/glean_parser
vendored:third_party/python/gyp/pylib vendored:third_party/python/gyp/pylib
vendored:third_party/python/jinja2_time vendored:third_party/python/jinja2_time
vendored:third_party/python/json-e vendored:third_party/python/json-e
vendored:third_party/python/jsonschema
vendored:third_party/python/mohawk 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/pkgutil_resolve_name
vendored:third_party/python/ply 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/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
vendored:third_party/python/redo vendored:third_party/python/redo

2
python/sites/docs.txt
View File

@ -64,11 +64,9 @@ vendored:third_party/python/frozenlist
vendored:third_party/python/giturlparse vendored:third_party/python/giturlparse
vendored:third_party/python/jinja2_time vendored:third_party/python/jinja2_time
vendored:third_party/python/json-e vendored:third_party/python/json-e
vendored:third_party/python/jsonschema
vendored:third_party/python/mohawk 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/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

2
python/sites/lint.txt
View File

@ -16,12 +16,10 @@ vendored:third_party/python/frozenlist
vendored:third_party/python/giturlparse vendored:third_party/python/giturlparse
vendored:third_party/python/jinja2_time vendored:third_party/python/jinja2_time
vendored:third_party/python/json-e vendored:third_party/python/json-e
vendored:third_party/python/jsonschema
vendored:third_party/python/mohawk 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/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
vendored:third_party/python/redo vendored:third_party/python/redo

3
python/sites/mach.txt
View File

@ -70,11 +70,14 @@ vendored:third_party/python/importlib_metadata
vendored:third_party/python/importlib_resources vendored:third_party/python/importlib_resources
vendored:third_party/python/jinxed vendored:third_party/python/jinxed
vendored:third_party/python/jsmin vendored:third_party/python/jsmin
vendored:third_party/python/jsonschema
vendored:third_party/python/looseversion vendored:third_party/python/looseversion
vendored:third_party/python/mozilla_version 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/pkgutil_resolve_name
vendored:third_party/python/pyrsistent
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

2
python/sites/perftest-test.txt
View File

@ -3,7 +3,5 @@ pypi:coverage==5.1
vendored:third_party/python/PyYAML/lib/ vendored:third_party/python/PyYAML/lib/
vendored:third_party/python/dlmanager vendored:third_party/python/dlmanager
vendored:third_party/python/esprima vendored:third_party/python/esprima
vendored:third_party/python/jsonschema
vendored:third_party/python/pyrsistent
vendored:third_party/python/redo vendored:third_party/python/redo
vendored:third_party/python/responses vendored:third_party/python/responses

3
python/sites/python-test.txt
View File

@ -35,17 +35,14 @@ vendored:third_party/python/glean_parser
vendored:third_party/python/gyp/pylib vendored:third_party/python/gyp/pylib
vendored:third_party/python/jinja2_time vendored:third_party/python/jinja2_time
vendored:third_party/python/json-e vendored:third_party/python/json-e
vendored:third_party/python/jsonschema
vendored:third_party/python/mohawk 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/pkgutil_resolve_name
vendored:third_party/python/ply 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/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
vendored:third_party/python/redo vendored:third_party/python/redo