diff options
| author | Andrew Morrow <acm@mongodb.com> | 2018-12-14 19:52:41 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2019-01-30 21:10:29 -0500 |
| commit | a285618a35742923e9e21fa2df4434406b121a4e (patch) | |
| tree | 310d5610441d3b1e16941c23853b3f2bb9c638ff /buildscripts/linter | |
| parent | c065df4a1dae7fe0b73d7a85d13ff2beb47b459d (diff) | |
| download | mongo-a285618a35742923e9e21fa2df4434406b121a4e.tar.gz | |
SERVER-36651 SERVER-36652 SERVER-37600 Upgrade to V3 toolchain and XCode 10 everywhere
Diffstat (limited to 'buildscripts/linter')
| -rw-r--r-- | buildscripts/linter/runner.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/buildscripts/linter/runner.py b/buildscripts/linter/runner.py index e93ccd63a4c..83b58dd9884 100644 --- a/buildscripts/linter/runner.py +++ b/buildscripts/linter/runner.py @@ -67,7 +67,7 @@ def _find_linter(linter, config_dict): # Search for tool # 1. In the same directory as the interpreter # 2. The current path - # 3. In '/opt/mongodbtoolchain/v2/bin' if virtualenv is set up. + # 3. In '/opt/mongodbtoolchain/v3/bin' if virtualenv is set up. python_dir = os.path.dirname(sys.executable) if sys.platform == "win32": # On Windows, these scripts are installed in %PYTHONDIR%\scripts like @@ -83,7 +83,7 @@ def _find_linter(linter, config_dict): python_dir = '/usr/local/bin' # On Linux, these scripts are installed in %PYTHONDIR%\bin like - # '/opt/mongodbtoolchain/v2/bin', but they may point to the wrong interpreter. + # '/opt/mongodbtoolchain/v3/bin', but they may point to the wrong interpreter. cmd_str = os.path.join(python_dir, linter.cmd_name) if linter.ignore_interpreter(): @@ -92,7 +92,7 @@ def _find_linter(linter, config_dict): if linter.cmd_location: cmd_str = linter.cmd_location else: - cmd_str = os.path.join('/opt/mongodbtoolchain/v2/bin', linter.cmd_name) + cmd_str = os.path.join('/opt/mongodbtoolchain/v3/bin', linter.cmd_name) cmd = [cmd_str] else: cmd = [sys.executable, cmd_str] @@ -110,8 +110,8 @@ def _find_linter(linter, config_dict): return base.LinterInstance(linter, cmd) # Check 3: When a virtualenv is setup the linter modules are not installed, so we need - # to use the linters installed in '/opt/mongodbtoolchain/v2/bin'. - cmd = [sys.executable, os.path.join('/opt/mongodbtoolchain/v2/bin', linter.cmd_name)] + # to use the linters installed in '/opt/mongodbtoolchain/v3/bin'. + cmd = [sys.executable, os.path.join('/opt/mongodbtoolchain/v3/bin', linter.cmd_name)] if _check_version(linter, cmd, linter.get_lint_version_cmd_args()): return base.LinterInstance(linter, cmd) |