Skip to content

Support user install on Windows. #4005

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 3 commits into from
Sep 26, 2017
Merged

Support user install on Windows. #4005

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
753c614
Support user install on Windows.
emmatyping Sep 25, 2017
62635b7
remove map call, make mypy clean
emmatyping Sep 25, 2017
65df983
make prefixes a list
emmatyping Sep 25, 2017
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
12 changes: 8 additions & 4 deletions mypy/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import json
import os.path
import re
import site
import sys
import time
from os.path import dirname, basename
Expand Down Expand Up @@ -213,6 +214,12 @@ def default_data_dir(bin_dir: Optional[str]) -> str:
bin_dir: directory containing the mypy script
"""
if not bin_dir:
if os.name == 'nt':
prefixes = [os.path.join(sys.prefix, 'Lib'), os.path.join(site.getuserbase(), 'lib')]
for parent in prefixes:
data_dir = os.path.join(parent, 'mypy')
if os.path.exists(data_dir):
return data_dir
mypy_package = os.path.dirname(__file__)
parent = os.path.dirname(mypy_package)
if (os.path.basename(parent) == 'site-packages' or
Expand All @@ -223,13 +230,10 @@ def default_data_dir(bin_dir: Optional[str]) -> str:
# or .../blah/lib64/python3.N/dist-packages/mypy/build.py (Gentoo)
# or .../blah/lib/site-packages/mypy/build.py (Windows)
# blah may be a virtualenv or /usr/local. We want .../blah/lib/mypy.
# On Windows, if the install is .../python/PythonXY/site-packages, we want
# .../python/lib/mypy
lib = parent
for i in range(2):
lib = os.path.dirname(lib)
if os.path.basename(lib) in ('lib', 'lib32', 'lib64') \
or os.path.basename(lib).startswith('python'):
if os.path.basename(lib) in ('lib', 'lib32', 'lib64'):
return os.path.join(os.path.dirname(lib), 'lib/mypy')
subdir = os.path.join(parent, 'lib', 'mypy')
if os.path.isdir(subdir):
Expand Down