8000 Add --exclude by hauntsaninja · Pull Request #9992 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Add --exclude #9992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Feb 10, 2021
Merged

Add --exclude #9992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f184666
Add --ignore-path
Jan 29, 2021
75f09c2
fix flake8
Jan 29, 2021
ede5ac8
fix logic
Jan 29, 2021
f3ff83f
fix windows, add another test
Jan 29, 2021
f942ff7
add a check and another test
Jan 29, 2021
188b10f
hopefully actually fix windows
Jan 30, 2021
18bdd3b
more test!
Jan 30, 2021
ea04b25
rearrange tests
Jan 30, 2021
32c7f7c
rename --ignore-path to --exclude
Feb 1, 2021
7e92e9b
use regexes for exclude
Feb 2, 2021
da26d92
add trace logs for excluded dirs
Feb 2, 2021
d470d5c
simplify exclude rule
Feb 2, 2021
1c0b5c3
flake8
Feb 2, 2021
6254323
don't override defaults
Feb 3, 2021
a4ae3ae
docs and tests
Feb 3, 2021
59af709
refactor tests, add some cases
Feb 3, 2021
f5be793
fix verbose
Feb 3, 2021
cb0917d
add node_modules back to default exclusion
Feb 3, 2021
43d8827
fix a small lie
Feb 3, 2021
bdf3f9a
fix flake8, try and fix windows
Feb 3, 2021
962153d
improve help text
Feb 3, 2021
2abe732
nits
Feb 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add trace logs for excluded dirs
  • Loading branch information
hauntsaninja committed Feb 2, 2021
commit da26d923110ce867dc8fbd9684b6b0992c83f9ca
6 changes: 5 additions & 1 deletion mypy/find_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import functools
import os
import re
import sys

from typing import List, Sequence, Set, Tuple, Optional
from typing_extensions import Final
Expand Down Expand Up @@ -93,6 +94,7 @@ def __init__(self, fscache: FileSystemCache, options: Options) -> None:
self.explicit_package_bases = get_explicit_package_bases(options)
self.namespace_packages = options.namespace_packages
self.exclude = options.exclude
self.verbose = options.verbosity >= 2

def is_explicit_package_base(self, path: str) -> bool:
assert self.explicit_package_bases
Expand All @@ -107,10 +109,12 @@ def find_sources_in_dir(self, path: str) -> List[BuildSource]:
subpath = os.path.join(path, name)

if self.exclude:
subpath_str = "/" + os.path.abspath(subpath).replace(os.sep, "/")
subpath_str = os.path.abspath(subpath).replace(os.sep, "/")
if self.fscache.isdir(subpath):
subpath_str += "/"
if re.search(self.exclude, subpath_str):
if self.verbose:
print("TRACE: Excluding {}".format(subpath_str), file=sys.stderr)
continue

if self.fscache.isdir(subpath):
Expand Down
4 changes: 3 additions & 1 deletion mypy/modulefinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,12 @@ def find_modules_recursive(self, module: str) -> List[BuildSource]:
subpath = os.path.join(package_path, name)

if self.options and self.options.exclude:
subpath_str = "/" + os.path.abspath(subpath).replace(os.sep, "/")
subpath_str = os.path.abspath(subpath).replace(os.sep, "/")
if self.fscache.isdir(subpath):
subpath_str += "/"
if re.search(self.options.exclude, subpath_str):
if self.options.verbosity >= 2:
print("TRACE: Excluding {}".format(subpath_str), file=sys.stderr)
continue

if self.fscache.isdir(subpath):
Expand Down
0