ahamilton/eris
1
0
Fork 0
Code Releases Activity

release: Use ubuntu golang for godoc and go vet.

Browse source 
- The github versions weren't installing anymore.
This commit is contained in:
Andrew Hamilton 2021-05-18 22:54:54 +10:00
parent 5d553a6542
commit 3e7d306273
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eris/tools.py
View file

@ -468,13 +468,13 @@ def svglib(path):
return Status.normal, _image_to_text(image) return Status.normal, _image_to_text(image)
@deps(deps={"go/github.com/golang/go/src/cmd/godoc"}, @deps(deps={"golang-go"},
url="https://github.com/golang/go", executables={"godoc"}) url="https://github.com/golang/go", executables={"go"})
def godoc(path): def godoc(path):
with tempfile.TemporaryDirectory() as temp_dir: with tempfile.TemporaryDirectory() as temp_dir:
symlink_path = os.path.join(temp_dir, "file.go") symlink_path = os.path.join(temp_dir, "file.go")
os.symlink(os.path.abspath(path), symlink_path) os.symlink(os.path.abspath(path), symlink_path)
stdout, stderr, returncode = _do_command(["godoc", "."], cwd=temp_dir) stdout, stderr, returncode = _do_command(["go", "doc", "."], cwd=temp_dir)
os.remove(symlink_path) os.remove(symlink_path)
return Status.normal, stdout return Status.normal, stdout

4
eris/tools.toml
View file

@ -278,9 +278,9 @@ tools_for_extensions = [
has_color = true has_color = true
[go_vet] [go_vet]
dependencies = ["go/github.com/golang/go/src/cmd/vet"] dependencies = ["golang-go"]
url = "https://github.com/golang/go" url = "https://github.com/golang/go"
command = "vet" command = "go vet"
[golint] [golint]
dependencies = ["go/golang.org/x/lint/golint"] dependencies = ["go/golang.org/x/lint/golint"]

2
tests/golden-files/results/contents-hi3_py
View file

@ -1,2 +1,2 @@
def hi():  def hi(): 
 print("hi")  print("hi")