aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2019-10-18 03:09:45 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2019-10-18 03:16:39 +0200
commit724c9d9d610c3f4d75729d93ac8a546cad5281ac (patch)
tree415bab2525004478afc0154cec0caafba1734fdd
parentf92edc4e6163db3ea67b282acf79936f31b73009 (diff)
downloadipaddress-724c9d9d610c3f4d75729d93ac8a546cad5281ac.tar.gz
travis: Run flake8 only on Python 2.7
flake8 has major problems on 2.6, 3.2, and 3.3: See https://travis-ci.org/phihag/ipaddress/jobs/599423233 and https://travis-ci.org/phihag/ipaddress/jobs/599423234 for examples.
-rw-r--r--.travis.yml4
-rw-r--r--Makefile7
2 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 9e2469a..c5f3090 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,10 @@ python:
- "pypy"
- "pypy3"
install:
- - "pip install flake8"
+ - "if python --version 2>&1 | grep -q ' 2\.7\.'; then pip install flake8 ; fi"
script:
- "make test"
- - "make lint"
+ - "make lint-if-2.7"
notifications:
email:
- phihag@phihag.de
diff --git a/Makefile b/Makefile
index 5ed5f51..604fd05 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,10 @@ test:
python test_ipaddress.py
lint:
- @(python --version 2>&1 | grep -q ' 2\.6\.') || flake8 ipaddress.py test_ipaddress.py
+ flake8 *.py
+
+lint-if-2.7:
+ @if python --version 2>&1 | grep -q ' 2\.7\.'; then $(MAKE) lint ; fi
pypi:
python setup.py sdist bdist_wheel upload
@@ -38,5 +41,5 @@ docker-test-3.3:
clean:
rm -rf -- build dist ipaddress.egg-info
-.PHONY: default test clean pypi lint docker-test-all docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3
+.PHONY: default test clean pypi lint docker-test-all docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3 lint-if-2.7