Allow user to specify custom typeshed directory

Author: ddfisher

mypy/build.py

@@ -133,6 +133,7 @@ def build(sources: List[BuildSource],
           bin_dir: str = None,
           pyversion: Tuple[int, int] = defaults.PYTHON3_VERSION,
           custom_typing_module: str = None,
+          custom_typeshed_module: str = None,
           report_dirs: Dict[str, str] = None,
           flags: List[str] = None,
           python_path: bool = False) -> BuildResult:
@@ -158,12 +159,20 @@ def build(sources: List[BuildSource],
     report_dirs = report_dirs or {}
     flags = flags or []
 
-    data_dir = default_data_dir(bin_dir)
+    custom_typeshed_name = None
+    if custom_typeshed_module:
+        custom_data_dir, custom_typeshed_name = os.path.split(custom_typeshed_module.rstrip(os.sep))
+        data_dir = custom_data_dir
+    else:
+        data_dir = default_data_dir(bin_dir)
 
     find_module_clear_caches()
 
     # Determine the default module search path.
-    lib_path = default_lib_path(data_dir, pyversion, python_path)
+    lib_path = default_lib_path(data_dir,
+                                pyversion,
+                                python_path,
+                                custom_typeshed_name=custom_typeshed_name)
 
     if TEST_BUILTINS in flags:
         # Use stub builtins (to speed up test cases and to make them easier to
@@ -276,11 +285,14 @@ def mypy_path() -> List[str]:
     return path_env.split(os.pathsep)
 
 
-def default_lib_path(data_dir: str, pyversion: Tuple[int, int],
-        python_path: bool) -> List[str]:
+def default_lib_path(data_dir: str,
+                     pyversion: Tuple[int, int],
+                     python_path: bool,
+                     custom_typeshed_name: str = None) -> List[str]:
     """Return default standard library search paths."""
     # IDEA: Make this more portable.
     path = []  # type: List[str]
+    typeshed_name = custom_typeshed_name or 'typeshed'
 
     auto = os.path.join(data_dir, 'stubs-auto')
     if os.path.isdir(auto):
@@ -294,7 +306,7 @@ def default_lib_path(data_dir: str, pyversion: Tuple[int, int],
     # (Note that 3.1 and 3.0 aren't really supported, but we don't care.)
     for v in versions + [str(pyversion[0]), '2and3']:
         for lib_type in ['stdlib', 'third_party']:
-            stubdir = os.path.join(data_dir, 'typeshed', lib_type, v)
+            stubdir = os.path.join(data_dir, typeshed_name, lib_type, v)
             if os.path.isdir(stubdir):
                 path.append(stubdir)
 

mypy/main.py

@@ -27,6 +27,7 @@ def __init__(self) -> None:
         self.build_flags = []  # type: List[str]
         self.pyversion = defaults.PYTHON3_VERSION
         self.custom_typing_module = None  # type: str
+        self.custom_typeshed_module = None  # type: str
         self.report_dirs = {}  # type: Dict[str, str]
         self.python_path = False
         self.dirty_stubs = False
@@ -97,6 +98,7 @@ def type_check_only(sources: List[BuildSource],
                        bin_dir=bin_dir,
                        pyversion=options.pyversion,
                        custom_typing_module=options.custom_typing_module,
+                       custom_typeshed_module=options.custom_typeshed_module,
                        report_dirs=options.report_dirs,
                        flags=options.build_flags,
                        python_path=options.python_path)
@@ -160,6 +162,8 @@ def parse_version(v):
                         help="an anti-pattern")
     parser.add_argument('--stats', action='store_true', help="dump stats")
     parser.add_argument('--inferstats', action='store_true', help="dump type inference stats")
+    parser.add_argument('--custom-typeshed', metavar='PATH',
+                        help="use the custom typeshed module at PATH")
     parser.add_argument('--custom-typing', metavar='MODULE', help="use a custom typing module")
 
     report_group = parser.add_argument_group(
@@ -214,6 +218,10 @@ def parse_version(v):
     options.python_path = args.use_python_path
     options.pdb = args.pdb
     options.custom_typing_module = args.custom_typing
+    options.custom_typeshed_module = args.custom_typeshed
+    if args.custom_typeshed:
+        # Don't check if the standard stubs are clean if we're using custom ones anyway.
+        options.dirty_stubs = True
 
     # Set build flags.
     if args.python_version is not None: