Merge branch 'master' into pyup-update-flake8-docstrings-1.1.0-to-1.3.0

.travis.yml

@@ -3,13 +3,12 @@ sudo: false  # http://docs.travis-ci.com/user/migrating-from-legacy/
 language: python
 python:
   - 2.7
-  - 3.4
   - 3.5
   - 3.6
 install:
   - pip install cookiecutter
-  - pip install invoke==0.14.0
+  - pip install invoke==1.0.0
-  - nvm install 6.10
+  - nvm install 8.11.2
-  - nvm use 6.10
+  - nvm use 8.11.2
 script:
   - invoke test

README.rst

@@ -40,12 +40,10 @@ Features
 Screenshots
 -----------
 
-.. image:: https://dl.dropboxusercontent.com/u/1693233/github/cookiecutter-flask-01.png
+.. image:: https://user-images.githubusercontent.com/2379650/35603073-7f5b78c2-0609-11e8-8fa8-7c6cce27fed6.png
-    :target: https://dl.dropboxusercontent.com/u/1693233/github/cookiecutter-flask-01.png
     :alt: Home page
 
-.. image:: https://dl.dropboxusercontent.com/u/1693233/github/cookiecutter-flask-02.png.png
+.. image:: https://user-images.githubusercontent.com/2379650/35603086-936a30e2-0609-11e8-8f63-a4c844310aab.png
-    :target: https://dl.dropboxusercontent.com/u/1693233/github/cookiecutter-flask-02.png.png
     :alt: Registration form
 
 

{{cookiecutter.app_name}}/package.json

@@ -15,6 +15,7 @@
   },
   "author": "{{cookiecutter.full_name}}",
   "license": "BSD-3-Clause",
+  "engines": { "node" : ">=4" },
   "bugs": {
     "url": "https://github.com/{{cookiecutter.github_username}}/{{cookiecutter.app_name}}/issues"
   },

{{cookiecutter.app_name}}/requirements/dev.txt

@@ -2,16 +2,16 @@
 -r prod.txt
 
 # Testing
-pytest==3.3.1
+pytest==3.6.1
 WebTest==2.0.29
-factory-boy==2.9.2
+factory-boy==2.11.1
 
 # Lint and code style
 flake8==3.5.0
 flake8-blind-except==0.1.1
-flake8-debugger==3.0.0
+flake8-debugger==3.1.0
 flake8-docstrings==1.3.0
-flake8-isort==2.3
+flake8-isort==2.5
-flake8-quotes==0.13.0
+flake8-quotes==1.0.0
-isort==4.2.15
+isort==4.3.4
-pep8-naming==0.5.0
+pep8-naming==0.7.0

{{cookiecutter.app_name}}/requirements/prod.txt

@@ -1,24 +1,24 @@
 # Everything needed in production
 
 # Flask
-Flask==0.12.2
+Flask==1.0.2
 MarkupSafe==1.0
-Werkzeug==0.13
+Werkzeug==0.14.1
 Jinja2==2.10
 itsdangerous==0.24
 click>=5.0
 
 # Database
 Flask-SQLAlchemy==2.3.2
-psycopg2==2.7.3.2
+psycopg2==2.7.4
-SQLAlchemy==1.2.0
+SQLAlchemy==1.2.8
 
 # Migrations
 Flask-Migrate==2.1.1
 
 # Forms
 Flask-WTF==0.14.2
-WTForms==2.1
+WTForms==2.2.1
 
 # Deployment
 gunicorn>=19.1.1

{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py

@@ -49,7 +49,7 @@ class SurrogatePK(object):
 
     __table_args__ = {'extend_existing': True}
 
-    id = db.Column(db.Integer, primary_key=True)
+    id = Column(db.Integer, primary_key=True)
 
     @classmethod
     def get_by_id(cls, record_id):
@@ -70,6 +70,6 @@ def reference_col(tablename, nullable=False, pk_name='id', **kwargs):
         category_id = reference_col('category')
         category = relationship('Category', backref='categories')
     """
-    return db.Column(
+    return Column(
         db.ForeignKey('{0}.{1}'.format(tablename, pk_name)),
         nullable=nullable, **kwargs)

{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html

@@ -5,7 +5,7 @@
   <h1>Register</h1>
     <br/>
     <form id="registerForm" class="form form-register" method="POST" action="" role="form">
-            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+           {{ form.csrf_token }}
             <div class="form-group">
                 {{form.username.label}}
                 {{form.username(placeholder="Username", class_="form-control")}}