Skip to content

Commit

Permalink
Merge pull request #18 from epicserve/flake8
Browse files Browse the repository at this point in the history
Added flake8 and testing with flake8 in shippable.
  • Loading branch information
frankwiles committed Aug 28, 2015
2 parents da654ee + dfd3f63 commit a74aecb
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ install:
- pip install -e .
- pip install $DJANGO
- pip install -r requirements-travisci.txt
- pip install coveralls
- pip install coveralls flake8
script:
- flake8 . --ignore=E501
- coverage run --source=test_plus setup.py test
after_success:
- coveralls
Expand Down
3 changes: 3 additions & 0 deletions test_plus/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
from .test import TestCase

__all__ = [
'TestCase',
]
2 changes: 0 additions & 2 deletions test_plus/test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import warnings
from distutils.version import LooseVersion

import django
from django.conf import settings
Expand All @@ -8,7 +7,6 @@
from django.core.urlresolvers import reverse, NoReverseMatch
from django.db import connections, DEFAULT_DB_ALIAS
from django.db.models import Q
from django.test import TestCase
from distutils.version import LooseVersion
from django.test import RequestFactory, signals, TestCase
from django.test.client import store_rendered_templates
Expand Down
1 change: 0 additions & 1 deletion test_project/runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

os.environ['DJANGO_SETTINGS_MODULE'] = 'test_project.settings'

import django
from django.conf import settings

# Add test_plus to Python path
Expand Down
3 changes: 2 additions & 1 deletion test_project/test_app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
)


urlpatterns = patterns('',
urlpatterns = patterns(
'',
url(r'^accounts/', include('django.contrib.auth.urls')),
url(r'^view/200/$', view_200, name='view-200'),
url(r'^view/201/$', view_201, name='view-201'),
Expand Down
1 change: 0 additions & 1 deletion test_project/test_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os
import django
BASE_DIR = os.path.dirname(os.path.dirname(__file__))


Expand Down

0 comments on commit a74aecb

Please sign in to comment.