diff options
| -rw-r--r-- | budget/default_settings.py | 2 | ||||
| -rw-r--r-- | budget/models.py | 12 | ||||
| -rw-r--r-- | budget/requirements.txt | 2 | ||||
| -rw-r--r-- | budget/run.py | 14 |
4 files changed, 22 insertions, 8 deletions
diff --git a/budget/default_settings.py b/budget/default_settings.py index 111abf2..394ab00 100644 --- a/budget/default_settings.py +++ b/budget/default_settings.py @@ -3,7 +3,7 @@ SQLALCHEMY_DATABASE_URI = 'sqlite:///budget.db' SQLACHEMY_ECHO = DEBUG SECRET_KEY = "tralala" -DEFAULT_MAIL_SENDER = ("Budget manager", "budget@notmyidea.org") +MAIL_DEFAULT_SENDER = ("Budget manager", "budget@notmyidea.org") try: from settings import * diff --git a/budget/models.py b/budget/models.py index 55a97c1..727200f 100644 --- a/budget/models.py +++ b/budget/models.py @@ -17,11 +17,11 @@ class Project(db.Model): _to_serialize = ("id", "name", "password", "contact_email", "members", "active_members", "balance") - id = db.Column(db.String, primary_key=True) + id = db.Column(db.String(64), primary_key=True) name = db.Column(db.UnicodeText) - password = db.Column(db.String) - contact_email = db.Column(db.String) + password = db.Column(db.String(128)) + contact_email = db.Column(db.String(128)) members = db.relationship("Person", backref="project") @property @@ -62,7 +62,7 @@ class Project(db.Model): debts.append({"person": person, "balance": -balance[person.id]}) # Try and find exact matches for credit in credits: - match = self.exactmatch(credit["balance"], debts) + match = self.exactmatch(round(credit["balance"], 2), debts) if match: for m in match: transactions.append({"ower": m["person"], "receiver": credit["person"], "amount": m["balance"]}) @@ -155,7 +155,7 @@ class Person(db.Model): _to_serialize = ("id", "name", "activated") id = db.Column(db.Integer, primary_key=True) - project_id = db.Column(db.String, db.ForeignKey("project.id")) + project_id = db.Column(db.String(64), db.ForeignKey("project.id")) bills = db.relationship("Bill", backref="payer") name = db.Column(db.UnicodeText) @@ -230,7 +230,7 @@ class Bill(db.Model): class Archive(db.Model): id = db.Column(db.Integer, primary_key=True) - project_id = db.Column(db.String, db.ForeignKey("project.id")) + project_id = db.Column(db.String(64), db.ForeignKey("project.id")) name = db.Column(db.UnicodeText) @property diff --git a/budget/requirements.txt b/budget/requirements.txt index 87d8966..5d7433a 100644 --- a/budget/requirements.txt +++ b/budget/requirements.txt @@ -1,7 +1,7 @@ flask>=0.9 flask-wtf==0.8 flask-sqlalchemy -flask-mail +flask-mail>=0.8 flask-babel flask-rest jinja2==2.6 diff --git a/budget/run.py b/budget/run.py index 845192d..1a65022 100644 --- a/budget/run.py +++ b/budget/run.py @@ -1,3 +1,5 @@ +import warnings + from flask import Flask, g, request, session from flask.ext.babel import Babel from raven.contrib.flask import Sentry @@ -9,6 +11,18 @@ from api import api app = Flask(__name__) app.config.from_object("default_settings") +# Deprecations +if 'DEFAULT_MAIL_SENDER' in app.config: + # Since flask-mail 0.8 + warnings.warn( + "DEFAULT_MAIL_SENDER is deprecated in favor of MAIL_DEFAULT_SENDER" + +" and will be removed in further version", + UserWarning + ) + if not 'MAIL_DEFAULT_SENDER' in app.config: + app.config['MAIL_DEFAULT_SENDER'] = DEFAULT_MAIL_SENDER + + app.register_blueprint(main) app.register_blueprint(api) |