Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[flake8]
max-line-length = 99

[tool:pytest]
flake8-ignore =
ignore =
*/migrations/*.py E501
manage.py F401
admin.py F401
2 changes: 1 addition & 1 deletion vol/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ class JobFactory(factory.django.DjangoModelFactory):
organisation = factory.SubFactory(OrganisationFactory)

class Meta:
model = Job
model = Job
2 changes: 1 addition & 1 deletion vol/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __str__(self):
return self.name

class Meta:
ordering = ['id']
ordering = ['id']


class Job(models.Model):
Expand Down