Fix the make lint command.

The flake8 directive was specified in tox.ini and setup.cfg while only one is used. Also remove the lint.sh script and move the code to the Makefile.
tangentlabs · Jul 31, 2016 · e290b42 · e290b42
1 parent 9999048
commit e290b42
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,8 @@ coverage:
 	py.test --cov=oscar --cov-report=term-missing
 
 lint:
-	./lint.sh
+	flake8 src/oscar/
+	isort -q --recursive --diff src/
 
 testmigrations:
 	pip install -r requirements_migrations.txt

diff --git a/lint.sh b/lint.sh
diff --git a/requirements.txt b/requirements.txt
@@ -16,7 +16,7 @@ whitenoise==3.2
 Pillow==3.3.0
 
 # Misc
-flake8==2.5.1
+flake8==3.0.3
 flake8-debugger==1.4.0
 flake8-blind-except==0.1.0
 pyprof2calltree==1.3.2

diff --git a/setup.cfg b/setup.cfg
@@ -6,6 +6,9 @@ python_files=test_*.py *tests.py
 testpaths = tests/
 
 [flake8]
+exclude = migrations
+ignore = F405,W503
+max-complexity = 10
 max-line-length=99
 
 [isort]

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,3 @@
-[flake8]
-exclude = migrations
-max-complexity = 10
-ignore = W503
-
 [tox]
 envlist = {py27,py33,py34,py35}-{1.8,1.9}