Merge pull request #65 from maxmind/andy/better-travis-yaml

Set env vars in travis matrix instead of hardcoding python versions

Author: wesrice

.travis.yml

@@ -14,6 +14,9 @@ matrix:
       dist: trusty
     - python: 3.7
       dist: xenial
+      env:
+        - RUN_SNYK=1
+        - RUN_LINTER=1
     - python: nightly
       dist: xenial
     - python: pypy
@@ -32,18 +35,18 @@ before_install:
   - sudo ldconfig
   - cd ..
   - pip install -e git+https://github.com/maxmind/MaxMind-DB-Reader-python#egg=maxminddb
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then sudo apt-get install -y nodejs; npm install -g snyk; fi"
+  - "if [[ $RUN_SNYK ]]; then sudo apt-get install -y nodejs; npm install -g snyk; fi"
 install:
   - pip install -r requirements.txt
   - pip install requests_mock pylint coveralls yapf
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then snyk test --org=maxmind; fi"
+  - "if [[ $RUN_SNYK ]]; then snyk test --org=maxmind; fi"
 script:
   - coverage run --source=geoip2 setup.py test
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then ./.travis-pylint.sh; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then ./.travis-yapf.sh; fi"
+  - "if [[ $RUN_LINTER ]]; then ./.travis-pylint.sh; fi"
+  - "if [[ $RUN_LINTER ]]; then ./.travis-yapf.sh; fi"
 after_success:
   - coveralls
-  - "if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.7' ]]; then snyk monitor --org=maxmind --project-name=maxmind/GeoIP2-python; fi"
+  - "if [[ $RUN_SNYK && $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then snyk monitor --org=maxmind --project-name=maxmind/GeoIP2-python; fi"
 notifications:
   email:
     on_failure: always