merge

CONTRIBUTORS.txt

@@ -26,6 +26,7 @@ Henrique G. G. Pereira / @ikkebr
 Travis McNeill / gh: Tavistock / @tavistock_esq 
 Matt Linares
 Russell Davies
+Sławek Ehlert / @slafs
 
 * Possesses commit rights
 

{{cookiecutter.repo_name}}/requirements/test.txt

@@ -1,3 +1,4 @@
 # Test dependencies go here.
 -r base.txt
 coverage==3.7.1
+flake8==2.2.2

{{cookiecutter.repo_name}}/setup.cfg

@@ -0,0 +1,4 @@
+[flake8]
+#ignore = E265
+max-line-length = 120
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs

{{cookiecutter.repo_name}}/setup.py

@@ -23,7 +23,7 @@ setup(
     ],
     include_package_data=True,
     install_requires=[
-        'Django>=1.6.1',
+        'Django>=1.6.5',
     ],
     zip_safe=False,
     scripts=['{{ cookiecutter.repo_name }}/manage.py'],

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py

@@ -270,7 +270,6 @@ class Common(Configuration):
     }
     ########## END LOGGING CONFIGURATION
 
-
     ########## Your common stuff: Below this line define 3rd party libary settings
 
 

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/urls.py

@@ -11,7 +11,7 @@ from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$',
+    url(r'^$',  # noqa
         TemplateView.as_view(template_name='pages/home.html'),
         name="home"),
     url(r'^about/$',
@@ -31,4 +31,3 @@ urlpatterns = patterns('',
     # Your stuff: custom urls go here
 
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-

{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/urls.py

@@ -4,7 +4,7 @@ from django.conf.urls import patterns, url
 from users import views
 
 urlpatterns = patterns('',
-    # URL pattern for the UserListView
+    # URL pattern for the UserListView  # noqa
     url(
         regex=r'^$',
         view=views.UserListView.as_view(),