Fix travis.yml; use py.test and install dev-requirements

Fixes #25
master
sloria 10 years ago
parent 683627796e
commit ccf58472c8
  1. 6
      {{cookiecutter.app_name}}/.travis.yml
  2. 2
      {{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py

@ -6,8 +6,6 @@ python:
- "3.3" - "3.3"
- "2.7" - "2.7"
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: pip install -r requirements/dev.txt
install: pip install -r requirements.txt
# command to run tests, e.g. python setup.py test script: py.test tests
script: nosetests

@ -4,7 +4,7 @@ import os
os_env = os.environ os_env = os.environ
class Config(object): class Config(object):
SECRET_KEY = os_env['{{cookiecutter.app_name | upper}}_SECRET'] # TODO: Change me SECRET_KEY = os_env.get('{{cookiecutter.app_name | upper}}_SECRET', 'secret-key') # TODO: Change me
APP_DIR = os.path.abspath(os.path.dirname(__file__)) # This directory APP_DIR = os.path.abspath(os.path.dirname(__file__)) # This directory
PROJECT_ROOT = os.path.abspath(os.path.join(APP_DIR, os.pardir)) PROJECT_ROOT = os.path.abspath(os.path.join(APP_DIR, os.pardir))
BCRYPT_LOG_ROUNDS = 13 BCRYPT_LOG_ROUNDS = 13

Loading…
Cancel
Save