Update travis config and makefile

Author: joguSD

.travis.yml

@@ -3,24 +3,23 @@ language: python
 matrix:
     include:
         - python: 2.6
-          env: TOXENV=py26
+          env: TEST_TYPE=test
         - python: 2.7
-          env: TOXENV=py27
+          env: TEST_TYPE=test
+        - python: 2.7
+          env: TEST_TYPE=check
         - python: 3.3
-          env: TOXENV=py33
+          env: TEST_TYPE=test
         - python: 3.4
-          env: TOXENV=py34
+          env: TEST_TYPE=test
         - python: 3.5
-          env: TOXENV=py35
+          env: TEST_TYPE=test
         - python: 3.6
-          env: TOXENV=py36
+          env: TEST_TYPE=test
 
 sudo: false
 install:
-  - travis_retry pip install tox
-  - if [[ $TOXENV == 'py27' ]]; then pip install -r requirements-dev.txt; pip install -e .; fi
+  - if [[ $TEST_TYPE == 'check' ]]; then pip install -r requirements-dev.txt; fi
+  - python scripts/ci/install
 script:
-  - tox
-  # We only need to run the lint/flake8 checks on one version of python
-  # So I've arbitrarily chosen python2.7.
-  - if [[ $TOXENV == 'py27' ]]; then make check; fi
+  - make $TEST_TYPE

Makefile

@@ -31,12 +31,16 @@ check:
 	#
 	pylint --rcfile .pylintrc -E awsshell
 
+test:
+	python scripts/ci/run-tests
+
 pylint:
 	###### PYLINT ######
 	# Python linter.  This will generally not have clean output.
 	# So you'll need to manually verify this output.
 	#
 	#
 	pylint --rcfile .pylintrc awsshell
+
 coverage:
 	py.test --cov awsshell --cov-report term-missing tests/