Make the run_mypy.py script find Uranium via the PYTHONPATH env var.

This commit is contained in:
Simon Edwards 2017-02-15 08:53:18 +01:00
parent 42982b7a86
commit 60d4e6e4fd

View file

@ -4,8 +4,7 @@ import sys
import subprocess import subprocess
# A quick Python implementation of unix 'where' command. # A quick Python implementation of unix 'where' command.
def where(exeName): def where(exeName, searchPath=os.getenv("PATH")):
searchPath = os.getenv("PATH")
paths = searchPath.split(";" if sys.platform == "win32" else ":") paths = searchPath.split(";" if sys.platform == "win32" else ":")
for path in paths: for path in paths:
candidatePath = os.path.join(path, exeName) candidatePath = os.path.join(path, exeName)
@ -21,10 +20,18 @@ def findModules(path):
return result return result
def main(): def main():
# Find Uranium via the PYTHONPATH var
uraniumUMPath = where("UM", os.getenv("PYTHONPATH"))
if uraniumUMPath is None:
uraniumUMPath = os.path.join("..", "Uranium")
uraniumPath = os.path.dirname(uraniumUMPath)
mypyPathParts = [".", os.path.join(".", "plugins"), os.path.join(".", "plugins", "VersionUpgrade"),
uraniumPath, os.path.join(uraniumPath, "stubs")]
if sys.platform == "win32": if sys.platform == "win32":
os.putenv("MYPYPATH", r".;.\plugins;.\plugins\VersionUpgrade;..\Uranium\;..\Uranium\stubs\\" ) os.putenv("MYPYPATH", ";".join(mypyPathParts))
else: else:
os.putenv("MYPYPATH", r".:./plugins:./plugins/VersionUpgrade:../Uranium/:../Uranium\stubs/") os.putenv("MYPYPATH", ":".join(mypyPathParts))
# Mypy really needs to be run via its Python script otherwise it can't find its data files. # Mypy really needs to be run via its Python script otherwise it can't find its data files.
mypyExe = where("mypy.bat" if sys.platform == "win32" else "mypy") mypyExe = where("mypy.bat" if sys.platform == "win32" else "mypy")