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

2016-08-22 17:47:11 -04:00 · 2016-08-22 17:47:11 -04:00 · 87f9c6d44a
commit 87f9c6d44a
parent c5d3a341c4 207bb61852
2 changed files with 5 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -26,7 +26,7 @@ matrix:

 before_script:
 - $pip_install flake8
- go get github.com/urfave/gfmrun/...
+- go get github.com/urfave/gfmrun/... || true
 - go get golang.org/x/tools/... || true
 - if [ ! -f node_modules/.bin/markdown-toc ] ; then
    npm install markdown-toc ;
--- a/4
+++ b/4
@ -61,6 +61,10 @@ def _test():

@_target
 def _gfmrun():
+    go_version = check_output('go version'.split()).split()[2]
+    if go_version < 'go1.3':
+        print('runtests: skip on {}'.format(go_version), file=sys.stderr)
+        return
    _run(['gfmrun', '-c', str(_gfmrun_count()), '-s', 'README.md'])