Add flake8 linting.

federicotdn · federicotdn · commit 1733b83179bf · 2019-06-28T13:36:41.000+02:00
Modify .travis.yml so that it uses Makefile to test and lint.
diff --git a/.travis.yml b/.travis.yml
@@ -36,11 +36,10 @@ before_script:
 jobs:
   include:
   - stage: test
-    name: "Black Formatting"
+    name: "Code Formatting"
     python: 3.6
     script:
-    - pip install black
-    - black --check .
+    - make lint
   - stage: test
     name: "Type Check"
     python: 3.6
@@ -52,7 +51,7 @@ jobs:
     name: "Test 3.5"
     python: "3.5"
     script:
-      - py.test tests --cov rasa -v
+      - make test
   - <<: *run-tests
     name: "Test 3.6"
     python: '3.6'
diff --git a/Makefile b/Makefile
@@ -1,21 +1,18 @@
 .PHONY: clean test lint init check-readme
 
-TEST_PATH=./
-
 help:
 	@echo "    clean"
 	@echo "        Remove python artifacts and build artifacts."
+	@echo "    formatter"
+	@echo "        Apply black formatting to code."
 	@echo "    lint"
 	@echo "        Check style with flake8."
+	@echo "    types"
+	@echo "        Check for type errors using pytype."
 	@echo "    test"
 	@echo "        Run py.test"
 	@echo "    check-readme"
 	@echo "        Check if the readme can be converted from md to rst for pypi"
-	@echo "    init"
-	@echo "        Install Rasa Core"
-
-init:
-	pip install -r requirements.txt
 
 clean:
 	find . -name '*.pyc' -exec rm -f {} +
@@ -24,22 +21,28 @@ clean:
 	rm -rf build/
 	rm -rf .pytype/
 	rm -rf dist/
-	rm -rf *.egg-info
 	rm -rf docs/_build
 
+formatter:
+	black rasa tests
+
+# TODO: Remove '--exit-zero'
 lint:
-	black .
+	flake8 rasa tests --exit-zero
+	black --check rasa tests
+
+types:
+	pytype --keep-going rasa
 
 test: clean
-	py.test tests --verbose --color=yes $(TEST_PATH)
-	black --check .
+	py.test tests --cov rasa
 
 doctest: clean
 	cd docs && make doctest
 
 livedocs:
 	cd docs && make livehtml
 
+# if this runs through we can be sure the readme is properly shown on pypi
 check-readme:
-	# if this runs through we can be sure the readme is properly shown on pypi
 	python setup.py check --restructuredtext --strict
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -12,6 +12,10 @@ nbsphinx==0.3.2
 aioresponses==0.6.0
 moto==1.3.8
 
+# lint/format
+black==19.3b0; python_version>='3.6'
+flake8==3.7.7
+
 # pipeline dependencies
 spacy==2.1.4
 jieba==0.39
diff --git a/setup.cfg b/setup.cfg
@@ -20,3 +20,7 @@ log_cli_level = DEBUG
 [metadata]
 description-file = README.md
 license_file = LICENSE.txt
+
+[flake8]
+max-line-length = 88
+ignore = W503, E121, E126, E211, E225, E501, E203, W391, E402
