From 27b1fc4548352ce8dc3dbe048c68885818e282d5 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sun, 6 Oct 2019 08:33:41 -0700 Subject: [PATCH] pubsync test --- Makefile | 4 ++-- tools/efrotools/code.py | 4 +++- tools/efrotools/snippets.py | 4 ++++ tools/snippets | 2 +- tools/update_project | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0aba8fb6..ddf1f9ad 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ # The targets here do not expect -jX to be passed to them and generally # add that argument to subprocesses as needed. -# Default is to build/run the mac version. -all: cmake +# Print help by default +all: help # We often want one job per core, so try to determine our logical core count. ifeq ($(wildcard /proc),/proc) # Linux diff --git a/tools/efrotools/code.py b/tools/efrotools/code.py index 94f236a9..24e4f370 100644 --- a/tools/efrotools/code.py +++ b/tools/efrotools/code.py @@ -482,7 +482,9 @@ def _filter_module_name(mpath: str) -> str: def runmypy(filenames: List[str], full: bool = False, check: bool = True) -> None: """Run MyPy on provided filenames.""" - args = ['mypy', '--pretty', '--config-file', '.mypy.ini'] + filenames + args = [ + 'python3.7', '-m', 'mypy', '--pretty', '--config-file', '.mypy.ini' + ] + filenames if full: args.insert(1, '--no-incremental') subprocess.run(args, check=check) diff --git a/tools/efrotools/snippets.py b/tools/efrotools/snippets.py index aaf53dd7..8ad6190a 100644 --- a/tools/efrotools/snippets.py +++ b/tools/efrotools/snippets.py @@ -370,6 +370,10 @@ def makefile_target_list() -> None: return ' - ' + doc return doc + print('--------------------------\n' + 'Available Makefile Targets\n' + '--------------------------\n') + entries: List[_Entry] = [] for i, line in enumerate(lines): diff --git a/tools/snippets b/tools/snippets index 9c27a31e..5bd72dcf 100755 --- a/tools/snippets +++ b/tools/snippets @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.7 """Wee little snippets of functionality specific to this project. All top level functions here can be run by passing them as the first diff --git a/tools/update_project b/tools/update_project index 32c8c6a8..9f5bafff 100755 --- a/tools/update_project +++ b/tools/update_project @@ -224,7 +224,7 @@ def main() -> None: # Update our python enums module. # Should do this before updating asset deps since this is an asset. - if os.path.exists('tools/update_puthon_enums_module'): + if os.path.exists('tools/update_python_enums_module'): if os.system('tools/update_python_enums_module' + checkarg) != 0: print(CLRRED + 'Error checking/updating python enums module' + CLREND)