Skip to content

Fix running mypy from editable install directory #5318

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 1 commit into from
Jul 5, 2018
Merged

Fix running mypy from editable install directory #5318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions mypy/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,12 @@ def default_flush_errors(new_messages: List[str], is_serious: bool) -> None:

@functools.lru_cache(maxsize=None)
def _get_site_packages_dirs(python_executable: Optional[str],
fscache: FileSystemCache) -> List[str]:
fscache: FileSystemCache) -> Tuple[List[str], List[str]]:
"""Find package directories for given python.

This runs a subprocess call, which generates a list of the site package directories.
To avoid repeatedly calling a subprocess (which can be slow!) we lru_cache the results."""
This runs a subprocess call, which generates a list of the egg directories, and the site
package directories. To avoid repeatedly calling a subprocess (which can be slow!) we
lru_cache the results."""
def make_abspath(path: str, root: str) -> str:
"""Take a path and make it absolute relative to root if not already absolute."""
if os.path.isabs(path):
Expand All @@ -213,7 +214,7 @@ def make_abspath(path: str, root: str) -> str:
return os.path.join(root, os.path.normpath(path))

if python_executable is None:
return []
return [], []
if python_executable == sys.executable:
# Use running Python's package dirs
site_packages = sitepkgs.getsitepackages()
Expand All @@ -229,7 +230,7 @@ def make_abspath(path: str, root: str) -> str:
if fscache.isfile(pth):
with open(pth) as f:
egg_dirs.extend([make_abspath(d.rstrip(), dir) for d in f.readlines()])
return egg_dirs + site_packages
return egg_dirs, site_packages


def compute_search_paths(sources: List[BuildSource],
Expand Down Expand Up @@ -292,8 +293,8 @@ def compute_search_paths(sources: List[BuildSource],
if alt_lib_path:
mypypath.insert(0, alt_lib_path)

package_path = tuple(_get_site_packages_dirs(options.python_executable, fscache))
for site_dir in package_path:
egg_dirs, site_packages = _get_site_packages_dirs(options.python_executable, fscache)
for site_dir in site_packages:
assert site_dir not in lib_path
if site_dir in mypypath:
print("{} is in the MYPYPATH. Please remove it.".format(site_dir), file=sys.stderr)
Expand All @@ -306,7 +307,7 @@ def compute_search_paths(sources: List[BuildSource],

return SearchPaths(tuple(reversed(python_path)),
tuple(mypypath),
package_path,
tuple(egg_dirs + site_packages),
tuple(lib_path))


Expand Down