Permalink
Browse files

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.
  • Loading branch information...
1 parent 9999048 commit e290b422fd4836a4724197e781163bfdbd75da2d @mvantellingen mvantellingen committed Jul 31, 2016
Showing with 6 additions and 14 deletions.
  1. +2 −1 Makefile
  2. +0 −7 lint.sh
  3. +1 −1 requirements.txt
  4. +3 −0 setup.cfg
  5. +0 −5 tox.ini
View
@@ -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
View
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#
-# Run static analysis of the codebase
-#
-# This is run on Travis to ensure that pull requests conform to the project coding standards.
-flake8 src/oscar/ || exit $?
-isort -q --recursive --diff src/ || exit $?
View
@@ -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
View
@@ -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]
View
@@ -1,8 +1,3 @@
-[flake8]
-exclude = migrations
-max-complexity = 10
-ignore = W503
-
[tox]
envlist = {py27,py33,py34,py35}-{1.8,1.9}

0 comments on commit e290b42

Please sign in to comment.