Refactor the CI script a bit to make adding black check easier

jstasiak · jstasiak · commit 69ad22cf852a · 2019-05-15T23:26:38.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,9 +12,6 @@ install:
     # mypy can't be installed on pypy
     - if [[ "${TRAVIS_PYTHON_VERSION}" != "pypy"* ]] ; then pip install mypy ; fi
 script:
-    - make test_coverage
-    - flake8 --version
-    - make flake8
-    - if [[ "${TRAVIS_PYTHON_VERSION}" != "pypy"* ]] ; then make mypy ; fi
+    - make ci
 after_success:
     - coveralls
diff --git a/Makefile b/Makefile
@@ -1,5 +1,12 @@
 .PHONY: all virtualenv
 MAX_LINE_LENGTH=110
+PYTHON_IMPLEMENTATION:=$(shell python -c "import sys;import platform;sys.stdout.write(platform.python_implementation())")
+
+LINT_TARGETS:=flake8
+ifneq ($(findstring PyPy,$(PYTHON_IMPLEMENTATION)),PyPy)
+	LINT_TARGETS:=$(LINT_TARGETS) mypy
+endif
+
 
 virtualenv: ./env/requirements.built
 
@@ -10,6 +17,12 @@ env:
 	./env/bin/pip install -r requirements-dev.txt
 	cp requirements-dev.txt ./env/requirements.built
 
+.PHONY: ci
+ci: test_coverage lint
+
+.PHONY: lint
+lint: $(LINT_TARGETS)
+
 flake8:
 	flake8 --max-line-length=$(MAX_LINE_LENGTH) examples *.py
 
