Merge pull request #76 from galaxyproject/travis_fix

Rearrange tests to fix README checks on Travis.
galaxyproject · Feb 16, 2015 · d0a8f44 · d0a8f44
2 parents 5c6868b + c799cf6
commit d0a8f44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,8 @@ python:
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi
   - pip install -r requirements.txt
-  - pip install pyflakes flake8
+  - pip install pyflakes flake8 readme
 
 # command to run tests, e.g. python setup.py test
-script: make lint && make test
+script: make lint && make test && if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then true; else make lint-readme; fi
+
diff --git a/Makefile b/Makefile
@@ -32,7 +32,10 @@ clean-test:
 	rm -fr htmlcov/
 
 lint:
-	flake8 --max-complexity 11 planemo tests && python setup.py check -r -s
+	flake8 --max-complexity 11 planemo tests
+
+lint-readme:
+	python setup.py check -r -s
 
 test:
 	python setup.py test