Skip to content

Commit b775599

Browse files
committed
Set env vars in travis matrix instead of hardcoding python versions
1 parent c868c04 commit b775599

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ matrix:
33
include:
44
- python: 2.7
55
dist: trusty
6+
env: RUN_SNYK=1
67
- python: 3.3
78
dist: trusty
89
- python: 3.4
@@ -13,6 +14,7 @@ matrix:
1314
dist: trusty
1415
- python: 3.7
1516
dist: xenial
17+
env: RUN_LINTER=1
1618
- python: nightly
1719
dist: xenial
1820
- python: pypy
@@ -31,23 +33,23 @@ before_install:
3133
- sudo ldconfig
3234
- cd ..
3335
- pip install coverage coveralls
34-
- if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install pylint yapf; fi
36+
- if [[ $RUN_LINTER ]]; then pip install pylint yapf; fi
3537
- |
36-
if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then
38+
if [[ $RUN_SNYK ]]; then
3739
sudo apt-get install -y nodejs;
3840
npm install -g snyk;
3941
fi
4042
4143
script:
4244
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then export MM_FORCE_EXT_TESTS=1; fi
4345
- CFLAGS="-Werror -Wall -Wextra" coverage run --source maxminddb setup.py test
44-
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then snyk test --org=maxmind --file=requirements.txt; fi
45-
- if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pylint --rcfile .pylintrc maxminddb/*.py; fi
46-
- if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then ./.travis-yapf.sh; fi
46+
- if [[ $RUN_SNYK ]]; then snyk test --org=maxmind --file=requirements.txt; fi
47+
- if [[ $RUN_LINTER ]]; then pylint --rcfile .pylintrc maxminddb/*.py; fi
48+
- if [[ $RUN_LINTER ]]; then ./.travis-yapf.sh; fi
4749

4850
after_success:
4951
- coveralls
50-
- if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '2.7' ]]; then snyk monitor --org=maxmind --project-name=maxmind/MaxMind-DB-Reader-python; fi
52+
- if [[ $RUN_SNYK && $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then snyk monitor --org=maxmind --project-name=maxmind/MaxMind-DB-Reader-python; fi
5153

5254
notifications:
5355
email:

0 commit comments

Comments
 (0)