aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2016-09-09 19:02:04 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2016-09-09 19:02:10 +0200
commita3b1237ba86026ebf07c44ef95c6678028456b5a (patch)
tree7f6aa1df377467e4c592e441c2857917910ff1ca
parentdf3f95788c9db29a2abe8d531c2076351c0ab4a5 (diff)
downloadipaddress-a3b1237ba86026ebf07c44ef95c6678028456b5a.tar.gz
separate test and source code quality checks, and only run flake8 on newer versions
-rw-r--r--.travis.yml1
-rw-r--r--Makefile8
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 27df2cb..ddc269c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ install:
- "pip install flake8"
script:
- "make test"
+ - "make lint"
notifications:
email:
- phihag@phihag.de
diff --git a/Makefile b/Makefile
index 6d0dcb3..e73256a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,16 @@
-default: test
+default: test lint
test:
- flake8 ipaddress.py test_ipaddress.py
python test_ipaddress.py
+lint:
+ @(python --version 2>&1 | grep -q ' 2\.6\.') || flake8 ipaddress.py test_ipaddress.py
+
pypi:
python setup.py sdist bdist_wheel upload
clean:
rm -rf -- build dist ipaddress.egg-info
-.PHONY: default test clean pypi
+.PHONY: default test clean pypi lint