Merge pull request #905 from parklab/flake8

#898
refinery-platform · Feb 25, 2016 · 9ffd03e · 9ffd03e
2 parents 47fcf48 + e2b8225
commit 9ffd03e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ before_script:
   - npm install --quiet -g grunt-cli karma bower
   - cd ui && npm install && bower install && cd ../
 script:
-  - pep8 --exclude=migrations,ui ..
+  - flake8 --exclude=migrations,ui ..
   - coverage run manage.py test
   - cd ui && grunt && cd ../
 after_success:

diff --git a/refinery/config/settings/aws.py b/refinery/config/settings/aws.py
@@ -4,7 +4,7 @@
 # more details.
 
 # Like dev, but overriding some things.
-from .dev import *
+from .dev import *  # NOQA
 
 EMAIL_BACKEND = 'django_smtp_ssl.SSLEmailBackend'
 EMAIL_HOST_USER = get_setting('EMAIL_HOST_USER')

diff --git a/requirements.txt b/requirements.txt
@@ -33,6 +33,7 @@ django-uuidfield==0.2
 djangular==0.2.3
 docutils==0.10
 enum34==1.0.4
+flake8==2.5.4
 flower==0.8.4
 Jinja2==2.6
 jsonpickle==0.4.0
@@ -45,7 +46,6 @@ mockcache==1.0.2
 ndg-httpsclient==0.3.2
 networkx==1.7
 pathtools==0.1.2
-pep8==1.6.2
 poster==0.8.1
 psycopg2==2.4.5
 py2neo==2.0.7