Update requirements, pin modules to the latest version, plus two small fixes

master
Wagner Augusto Andreoli 9 years ago
parent 5c5e7bd92a
commit 88d8ee69b7
  1. 3
      .gitignore
  2. 4
      {{cookiecutter.app_name}}/.gitignore
  3. 8
      {{cookiecutter.app_name}}/requirements/dev.txt
  4. 21
      {{cookiecutter.app_name}}/requirements/prod.txt
  5. 2
      {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/database.py
  6. 2
      {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/templates/nav.html

3
.gitignore vendored

@ -45,3 +45,6 @@ output/
myflaskapp/ myflaskapp/
bower_components bower_components
# PyCharm
.idea/

@ -44,3 +44,7 @@ docs/_build
# Virtualenvs # Virtualenvs
env/ env/
.venv
# PyCharm
.idea/

@ -2,9 +2,9 @@
-r prod.txt -r prod.txt
# Testing # Testing
pytest>=2.6.3 pytest==2.8.2
webtest WebTest==2.0.20
factory-boy==2.5.1 factory-boy==2.6.0
# Management script # Management script
Flask-Script Flask-Script==2.0.5

@ -1,37 +1,40 @@
# Everything needed in production # Everything needed in production
setuptools==18.5
wheel==0.26.0
# Flask # Flask
Flask==0.10.1 Flask==0.10.1
MarkupSafe==0.23 MarkupSafe==0.23
Werkzeug==0.10.4 Werkzeug==0.10.4
Jinja2==2.7.3 Jinja2==2.8
itsdangerous==0.24 itsdangerous==0.24
# Database # Database
Flask-SQLAlchemy==2.0 Flask-SQLAlchemy==2.1
SQLAlchemy==0.9.8 SQLAlchemy==1.0.9
# Migrations # Migrations
Flask-Migrate==1.3.1 Flask-Migrate==1.6.0
# Forms # Forms
Flask-WTF==0.11 Flask-WTF==0.12
WTForms==2.0.2 WTForms==2.0.2
# Deployment # Deployment
gunicorn>=19.1.1 gunicorn>=19.1.1
# Assets # Assets
Flask-Assets==0.10 Flask-Assets==0.11
cssmin>=0.2.0 cssmin>=0.2.0
jsmin>=2.0.11 jsmin>=2.0.11
# Auth # Auth
Flask-Login==0.2.11 Flask-Login==0.3.2
Flask-Bcrypt==0.6.2 Flask-Bcrypt==0.7.1
# Caching # Caching
Flask-Cache>=0.13.1 Flask-Cache>=0.13.1
# Debug toolbar # Debug toolbar
Flask-DebugToolbar==0.9.2 Flask-DebugToolbar==0.10.0

@ -25,7 +25,7 @@ class CRUDMixin(object):
def update(self, commit=True, **kwargs): def update(self, commit=True, **kwargs):
"""Update specific fields of a record.""" """Update specific fields of a record."""
for attr, value in kwargs.iteritems(): for attr, value in kwargs.items():
setattr(self, attr, value) setattr(self, attr, value)
return commit and self.save() or self return commit and self.save() or self

@ -22,7 +22,7 @@
<li><a href="{{ url_for('public.home') }}">Home</a></li> <li><a href="{{ url_for('public.home') }}">Home</a></li>
<li><a href="{{ url_for('public.about') }}">About</a></li> <li><a href="{{ url_for('public.about') }}">About</a></li>
</ul> </ul>
{% if current_user and current_user.is_authenticated() %} {% if current_user and current_user.is_authenticated %}
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li>
<p class="navbar-text"><a class="navbar-link" href="{{ url_for('user.members') }}">Logged in as {{ current_user.username }}</a></p> <p class="navbar-text"><a class="navbar-link" href="{{ url_for('user.members') }}">Logged in as {{ current_user.username }}</a></p>

Loading…
Cancel
Save