From 9640999fb084baae51e14537615b820eaa528e7e Mon Sep 17 00:00:00 2001 From: "Cimon Lucas (LCM)" Date: Sat, 29 Jul 2017 01:20:09 +0200 Subject: [PATCH 1/2] Making golang-based hooks compatible with Cygwin --- pre_commit/languages/golang.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pre_commit/languages/golang.py b/pre_commit/languages/golang.py index c091bacf..4493d616 100644 --- a/pre_commit/languages/golang.py +++ b/pre_commit/languages/golang.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import contextlib import os.path +import sys from pre_commit import git from pre_commit.envcontext import envcontext @@ -61,7 +62,12 @@ def install_environment(repo_cmd_runner, version, additional_dependencies): repo_cmd_runner, ('git', 'clone', '.', repo_src_dir), ) - env = dict(os.environ, GOPATH=directory) + if sys.platform == 'cygwin': # pragma: no cover + _, gopath, _ = cmd_output('cygpath', '-w', directory) + gopath = gopath.strip() + else: + gopath = directory + env = dict(os.environ, GOPATH=gopath) cmd_output('go', 'get', './...', cwd=repo_src_dir, env=env) for dependency in additional_dependencies: cmd_output('go', 'get', dependency, cwd=repo_src_dir, env=env) From 3fbe4f5a6ff5a4991ca9bfe0d42da14e1c6cd3dd Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sat, 29 Jul 2017 16:20:45 -0400 Subject: [PATCH 2/2] Appease autopep8 --- pre_commit/languages/golang.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_commit/languages/golang.py b/pre_commit/languages/golang.py index 4493d616..87687234 100644 --- a/pre_commit/languages/golang.py +++ b/pre_commit/languages/golang.py @@ -62,7 +62,7 @@ def install_environment(repo_cmd_runner, version, additional_dependencies): repo_cmd_runner, ('git', 'clone', '.', repo_src_dir), ) - if sys.platform == 'cygwin': # pragma: no cover + if sys.platform == 'cygwin': # pragma: no cover _, gopath, _ = cmd_output('cygpath', '-w', directory) gopath = gopath.strip() else: