This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11249

check-module-imports: ignore non-stdlib module installed by distribution
ClosedPublic

Authored by marmoute on Aug 3 2021, 1:49 PM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHG42e2cdb50db0: check-module-imports: ignore non-stdlib module installed by distribution
Summary

Previously, the check script would detect breezy as part of the stdlib if
installed using the debian package manager.

This silence the following complains:

tests/test-convert-bzr.t:117: imports not lexically sorted: breezy.bzr.bzrdir < sys
tests/test-convert-bzr.t:117: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
tests/test-convert-bzr-ghosts.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
tests/test-convert-bzr-ghosts.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy
tests/test-convert-bzr-treeroot.t:7: imports not lexically sorted: breezy.bzr.bzrdir < sys
tests/test-convert-bzr-treeroot.t:7: stdlib import "breezy.bzr.bzrdir" follows local import: breezy

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Aug 3 2021, 1:49 PM
pulkit accepted this revision.Aug 4 2021, 4:40 AM
This revision is now accepted and ready to land.Aug 4 2021, 4:40 AM
Alphare accepted this revision.Aug 4 2021, 9:11 AM

Revision Contents
Changeset List

PathPackages
Mcontrib/import-checker.py (2 lines)

Diff 29798

contrib/import-checker.py

for libpath in sys.path: for libpath in sys.path:
# We want to walk everything in sys.path that starts with something in # We want to walk everything in sys.path that starts with something in
# stdlib_prefixes, but not directories from the hg sources. # stdlib_prefixes, but not directories from the hg sources.
if os.path.abspath(libpath).startswith(sourceroot) or not any( if os.path.abspath(libpath).startswith(sourceroot) or not any(
libpath.startswith(p) for p in stdlib_prefixes libpath.startswith(p) for p in stdlib_prefixes
): ):
continue continue
for top, dirs, files in os.walk(libpath): for top, dirs, files in os.walk(libpath):
if 'dist-packages' in top.split(os.path.sep):
continue
for i, d in reversed(list(enumerate(dirs))): for i, d in reversed(list(enumerate(dirs))):
if ( if (
not os.path.exists(os.path.join(top, d, '__init__.py')) not os.path.exists(os.path.join(top, d, '__init__.py'))
or top == libpath or top == libpath
and d in ('hgdemandimport', 'hgext', 'mercurial') and d in ('hgdemandimport', 'hgext', 'mercurial')
): ):
del dirs[i] del dirs[i]
for name in files: for name in files: