diff --git a/.travis.yml b/.travis.yml index 158f7e0..f536a58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +# Config file for automatic testing at travis-ci.org +sudo: false # http://docs.travis-ci.com/user/migrating-from-legacy/ language: python python: - 2.7 diff --git a/{{cookiecutter.app_name}}/.travis.yml b/{{cookiecutter.app_name}}/.travis.yml index 70c1b80..dece91f 100644 --- a/{{cookiecutter.app_name}}/.travis.yml +++ b/{{cookiecutter.app_name}}/.travis.yml @@ -1,11 +1,9 @@ # Config file for automatic testing at travis-ci.org - +sudo: false # http://docs.travis-ci.com/user/migrating-from-legacy/ language: python - python: - - "3.3" - - "2.7" - + - 2.7 + - 3.3 + - 3.4 install: pip install -r requirements/dev.txt - script: py.test tests diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py index 073c378..81c3b19 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/user/models.py @@ -4,7 +4,7 @@ import datetime as dt from flask_login import UserMixin -from {{cookiecutter.app_name}}.database import Column, Model, reference_col, SurrogatePK, db, relationship +from {{cookiecutter.app_name}}.database import Column, Model, SurrogatePK, db, reference_col, relationship from {{cookiecutter.app_name}}.extensions import bcrypt