Merge branch 'master' into do-some-gardening

Makefile

@@ -29,7 +29,7 @@ remove-install-stamp:
 update: remove-install-stamp install
 
 serve: install
-	cd budget; $(PYTHON) run.py
+	$(PYTHON) -m budget.manage runserver
 
 test: $(DEV_STAMP)
 	$(VENV)/bin/tox

budget/api.py

@@ -2,8 +2,8 @@
 from flask import Blueprint, request
 from flask_rest import RESTResource, need_auth
 
-from models import db, Project, Person, Bill
+from .models import db, Project, Person, Bill
-from forms import (ProjectForm, EditProjectForm, MemberForm,
+from .forms import (ProjectForm, EditProjectForm, MemberForm,
                     get_billform_for)
 
 

budget/forms.py

@@ -7,10 +7,11 @@ from flask_babel import lazy_gettext as _
 from flask import request
 
 from wtforms.widgets import html_params
-from models import Project, Person
 from datetime import datetime
 from jinja2 import Markup
-from utils import slugify
+
+from .models import Project, Person
+from .utils import slugify
 
 
 def get_billform_for(project, set_default=True, **kwargs):

budget/manage.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
+from getpass import getpass
 from flask_script import Manager, Command
 from flask_migrate import Migrate, MigrateCommand
 from werkzeug.security import generate_password_hash
 
-from run import app
+from .run import app
-from models import db
+from .models import db
-from getpass import getpass
 
 
 class GeneratePasswordHash(Command):
@@ -24,5 +24,9 @@ manager.add_command('db', MigrateCommand)
 manager.add_command('generate_password_hash', GeneratePasswordHash)   
 
 
-if __name__ == '__main__':
+def main():
     manager.run()
+
+
+if __name__ == '__main__':
+    main()

budget/run.py

@@ -7,12 +7,12 @@ from flask_babel import Babel
 from flask_migrate import Migrate, upgrade, stamp
 from raven.contrib.flask import Sentry
 
-from web import main, db, mail
+from .web import main, db, mail
-from api import api
+from .api import api
-from utils import PrefixedWSGI
+from .utils import PrefixedWSGI
-from utils import minimal_round
+from .utils import minimal_round
 
-import default_settings
+from . import default_settings
 
 app = Flask(__name__, instance_path='/etc/ihatemoney', instance_relative_config=True)
 

budget/tests/tests.py

@@ -17,9 +17,9 @@ from flask import session
 if 'IHATEMONEY_SETTINGS_FILE_PATH' in os.environ:
     del os.environ['IHATEMONEY_SETTINGS_FILE_PATH']
 
-import run
+from .. import run
-import models
+from .. import models
-import utils
+from .. import utils
 
 __HERE__ = os.path.dirname(os.path.abspath(__file__))
 

budget/web.py

@@ -21,14 +21,13 @@ import werkzeug
 from sqlalchemy import orm
 from functools import wraps
 
-# local modules
+from .models import db, Project, Person, Bill
-from models import db, Project, Person, Bill
+from .forms import (
-from forms import (
     AdminAuthenticationForm, AuthenticationForm, EditProjectForm,
     InviteForm, MemberForm, PasswordReminder, ProjectForm, get_billform_for,
     ExportForm
 )
-from utils import Redirect303, list_of_dicts2json, list_of_dicts2csv
+from .utils import Redirect303, list_of_dicts2json, list_of_dicts2csv
 
 main = Blueprint("main", __name__)
 mail = Mail()

dev-requirements.txt

@@ -1,2 +1,3 @@
 zest.releaser
 tox
+pytest

tox.ini

@@ -6,7 +6,7 @@ skip_missing_interpreters = True
 
 commands =
     python --version
-    python -m unittest discover -s budget
+    py.test budget/tests/tests.py
 deps =
     -rdev-requirements.txt
     -rrequirements.txt