Merge remote-tracking branch 'origin/v1' into merging-from-v1

This commit is contained in:
Dan Buch 2016-07-23 14:52:58 -04:00
commit c360161d62
No known key found for this signature in database
GPG Key ID: FAEF12936DD3E3EC
2 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@ matrix:
before_script: before_script:
- $pip_install flake8 - $pip_install flake8
- go get github.com/urfave/gfmrun/... - go get github.com/urfave/gfmrun/...
- go get golang.org/x/tools/cmd/goimports - go get golang.org/x/tools/cmd/goimports || true
- if [ ! -f node_modules/.bin/markdown-toc ] ; then - if [ ! -f node_modules/.bin/markdown-toc ] ; then
npm install markdown-toc ; npm install markdown-toc ;
fi fi

View File

@ -107,7 +107,7 @@ def _toc():
@_target @_target
def _gen(): def _gen():
go_version = check_output('go version'.split()).split()[2] go_version = check_output('go version'.split()).split()[2]
if go_version < 'go1.4': if go_version < 'go1.5':
print('runtests: skip on {}'.format(go_version), file=sys.stderr) print('runtests: skip on {}'.format(go_version), file=sys.stderr)
return return