diff --git a/.travis.yml b/.travis.yml index 9aa041b..436b2b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ before_script: - psql -c 'create database test_db;' -U postgres - pipenv run python manage.py collectstatic script: -- pipenv run coverage run --source=. --omit manage.py,"*/admin.py","*/migrations/*" manage.py test -v 2 +- pipenv run flake8 +- pipenv run coverage run --source=. --omit manage.py,"*/admin.py","*/migrations/*","*/apps.py",volproject/wsgi.py manage.py test -v 2 - coveralls services: - postgresql diff --git a/setup.cfg b/setup.cfg index e905fc0..2c8ca0a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,6 @@ [flake8] max-line-length = 99 - -[tool:pytest] -flake8-ignore = +ignore = */migrations/*.py E501 manage.py F401 admin.py F401 diff --git a/vol/factories.py b/vol/factories.py index 60e5994..baaeded 100644 --- a/vol/factories.py +++ b/vol/factories.py @@ -41,4 +41,4 @@ class JobFactory(factory.django.DjangoModelFactory): organisation = factory.SubFactory(OrganisationFactory) class Meta: - model = Job \ No newline at end of file + model = Job diff --git a/vol/models.py b/vol/models.py index ebaabf9..e62f6b3 100644 --- a/vol/models.py +++ b/vol/models.py @@ -41,7 +41,7 @@ def __str__(self): return self.name class Meta: - ordering = ['id'] + ordering = ['id'] class Job(models.Model):