diff --git a/.travis.yml b/.travis.yml index a1b7c5d..ffe7c18 100644 --- a/.travis.yml +++ b/.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 - - nvm install 6.10 - - nvm use 6.10 + - pip install invoke==1.0.0 + - nvm install 8.11.2 + - nvm use 8.11.2 script: - invoke test diff --git a/README.rst b/README.rst index 91d794c..06a22b0 100644 --- a/README.rst +++ b/README.rst @@ -40,12 +40,10 @@ Features Screenshots ----------- -.. image:: https://dl.dropboxusercontent.com/u/1693233/github/cookiecutter-flask-01.png - :target: 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 :alt: Home page -.. image:: https://dl.dropboxusercontent.com/u/1693233/github/cookiecutter-flask-02.png.png - :target: 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 :alt: Registration form diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 7cb9d32..b1682e8 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{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" }, diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index d5f9dcb..a57e9c9 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{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-quotes==0.13.0 -isort==4.2.15 -pep8-naming==0.5.0 +flake8-isort==2.5 +flake8-quotes==1.0.0 +isort==4.3.4 +pep8-naming==0.7.0 diff --git a/{{cookiecutter.app_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt index 65fac45..92590af 100644 --- a/{{cookiecutter.app_name}}/requirements/prod.txt +++ b/{{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 -SQLAlchemy==1.2.0 +psycopg2==2.7.4 +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 diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py index f4edafa..3a8883d 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py +++ b/{{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) diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html index 1b10b31..7a97035 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/public/register.html @@ -5,7 +5,7 @@

Register


- + {{ form.csrf_token }}
{{form.username.label}} {{form.username(placeholder="Username", class_="form-control")}}