diff --git a/Makefile b/Makefile index f8f87d8b..6b32e48d 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ remove-install-stamp: update: remove-install-stamp install serve: install - $(PYTHON) -m budget.manage runserver + $(PYTHON) -m ihatemoney.manage runserver test: $(DEV_STAMP) $(VENV)/bin/tox @@ -38,7 +38,7 @@ release: $(DEV_STAMP) $(VENV)/bin/fullrelease build-translations: - $(VENV)/bin/pybabel compile -d budget/translations + $(VENV)/bin/pybabel compile -d ihatemoney/translations build-requirements: $(VIRTUALENV) $(TEMPDIR) diff --git a/budget/__init__.py b/ihatemoney/__init__.py similarity index 100% rename from budget/__init__.py rename to ihatemoney/__init__.py diff --git a/budget/api.py b/ihatemoney/api.py similarity index 96% rename from budget/api.py rename to ihatemoney/api.py index 7ce6a34f..a34fa12b 100644 --- a/budget/api.py +++ b/ihatemoney/api.py @@ -2,9 +2,9 @@ from flask import Blueprint, request from flask_rest import RESTResource, need_auth -from .models import db, Project, Person, Bill -from .forms import (ProjectForm, EditProjectForm, MemberForm, - get_billform_for) +from ihatemoney.models import db, Project, Person, Bill +from ihatemoney.forms import (ProjectForm, EditProjectForm, MemberForm, + get_billform_for) api = Blueprint("api", __name__, url_prefix="/api") diff --git a/budget/babel.cfg b/ihatemoney/babel.cfg similarity index 100% rename from budget/babel.cfg rename to ihatemoney/babel.cfg diff --git a/budget/default_settings.py b/ihatemoney/default_settings.py similarity index 100% rename from budget/default_settings.py rename to ihatemoney/default_settings.py diff --git a/budget/forms.py b/ihatemoney/forms.py similarity index 98% rename from budget/forms.py rename to ihatemoney/forms.py index bd7fc5b5..9ee71d0d 100644 --- a/budget/forms.py +++ b/ihatemoney/forms.py @@ -10,8 +10,8 @@ from wtforms.widgets import html_params from datetime import datetime from jinja2 import Markup -from .models import Project, Person -from .utils import slugify +from ihatemoney.models import Project, Person +from ihatemoney.utils import slugify def get_billform_for(project, set_default=True, **kwargs): """Return an instance of BillForm configured for a particular project. diff --git a/budget/manage.py b/ihatemoney/manage.py similarity index 90% rename from budget/manage.py rename to ihatemoney/manage.py index 0a662840..0bedf41f 100755 --- a/budget/manage.py +++ b/ihatemoney/manage.py @@ -5,8 +5,8 @@ from flask_script import Manager, Command from flask_migrate import Migrate, MigrateCommand from werkzeug.security import generate_password_hash -from .run import app -from .models import db +from ihatemoney.run import app +from ihatemoney.models import db class GeneratePasswordHash(Command): @@ -20,7 +20,7 @@ migrate = Migrate(app, db) manager = Manager(app) manager.add_command('db', MigrateCommand) -manager.add_command('generate_password_hash', GeneratePasswordHash) +manager.add_command('generate_password_hash', GeneratePasswordHash) def main(): diff --git a/budget/messages.pot b/ihatemoney/messages.pot similarity index 100% rename from budget/messages.pot rename to ihatemoney/messages.pot diff --git a/budget/migrations/README b/ihatemoney/migrations/README similarity index 100% rename from budget/migrations/README rename to ihatemoney/migrations/README diff --git a/budget/migrations/alembic.ini b/ihatemoney/migrations/alembic.ini similarity index 100% rename from budget/migrations/alembic.ini rename to ihatemoney/migrations/alembic.ini diff --git a/budget/migrations/env.py b/ihatemoney/migrations/env.py similarity index 100% rename from budget/migrations/env.py rename to ihatemoney/migrations/env.py diff --git a/budget/migrations/script.py.mako b/ihatemoney/migrations/script.py.mako similarity index 100% rename from budget/migrations/script.py.mako rename to ihatemoney/migrations/script.py.mako diff --git a/budget/migrations/versions/26d6a218c329_.py b/ihatemoney/migrations/versions/26d6a218c329_.py similarity index 100% rename from budget/migrations/versions/26d6a218c329_.py rename to ihatemoney/migrations/versions/26d6a218c329_.py diff --git a/budget/migrations/versions/b9a10d5d63ce_.py b/ihatemoney/migrations/versions/b9a10d5d63ce_.py similarity index 100% rename from budget/migrations/versions/b9a10d5d63ce_.py rename to ihatemoney/migrations/versions/b9a10d5d63ce_.py diff --git a/budget/migrations/versions/f629c8ef4ab0_initialize_all_members_weights_to_1.py b/ihatemoney/migrations/versions/f629c8ef4ab0_initialize_all_members_weights_to_1.py similarity index 100% rename from budget/migrations/versions/f629c8ef4ab0_initialize_all_members_weights_to_1.py rename to ihatemoney/migrations/versions/f629c8ef4ab0_initialize_all_members_weights_to_1.py diff --git a/budget/models.py b/ihatemoney/models.py similarity index 100% rename from budget/models.py rename to ihatemoney/models.py diff --git a/budget/run.py b/ihatemoney/run.py similarity index 94% rename from budget/run.py rename to ihatemoney/run.py index 5e65c905..6a119a66 100644 --- a/budget/run.py +++ b/ihatemoney/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 .api import api -from .utils import PrefixedWSGI -from .utils import minimal_round +from ihatemoney.web import main, db, mail +from ihatemoney.api import api +from ihatemoney.utils import PrefixedWSGI +from ihatemoney.utils import minimal_round -from . import default_settings +from ihatemoney import default_settings app = Flask(__name__, instance_path='/etc/ihatemoney', instance_relative_config=True) diff --git a/budget/static/css/bootstrap-datepicker3.standalone.css b/ihatemoney/static/css/bootstrap-datepicker3.standalone.css similarity index 100% rename from budget/static/css/bootstrap-datepicker3.standalone.css rename to ihatemoney/static/css/bootstrap-datepicker3.standalone.css diff --git a/budget/static/css/bootstrap.min.css b/ihatemoney/static/css/bootstrap.min.css similarity index 100% rename from budget/static/css/bootstrap.min.css rename to ihatemoney/static/css/bootstrap.min.css diff --git a/budget/static/css/main.css b/ihatemoney/static/css/main.css similarity index 100% rename from budget/static/css/main.css rename to ihatemoney/static/css/main.css diff --git a/budget/static/fonts/OFL.txt b/ihatemoney/static/fonts/OFL.txt similarity index 100% rename from budget/static/fonts/OFL.txt rename to ihatemoney/static/fonts/OFL.txt diff --git a/budget/static/fonts/comfortaa-regular-webfont.eot b/ihatemoney/static/fonts/comfortaa-regular-webfont.eot similarity index 100% rename from budget/static/fonts/comfortaa-regular-webfont.eot rename to ihatemoney/static/fonts/comfortaa-regular-webfont.eot diff --git a/budget/static/fonts/comfortaa-regular-webfont.svg b/ihatemoney/static/fonts/comfortaa-regular-webfont.svg similarity index 100% rename from budget/static/fonts/comfortaa-regular-webfont.svg rename to ihatemoney/static/fonts/comfortaa-regular-webfont.svg diff --git a/budget/static/fonts/comfortaa-regular-webfont.woff b/ihatemoney/static/fonts/comfortaa-regular-webfont.woff similarity index 100% rename from budget/static/fonts/comfortaa-regular-webfont.woff rename to ihatemoney/static/fonts/comfortaa-regular-webfont.woff diff --git a/budget/static/fonts/fontfaces.css b/ihatemoney/static/fonts/fontfaces.css similarity index 100% rename from budget/static/fonts/fontfaces.css rename to ihatemoney/static/fonts/fontfaces.css diff --git a/budget/static/fonts/lobster-webfont.eot b/ihatemoney/static/fonts/lobster-webfont.eot similarity index 100% rename from budget/static/fonts/lobster-webfont.eot rename to ihatemoney/static/fonts/lobster-webfont.eot diff --git a/budget/static/fonts/lobster-webfont.svg b/ihatemoney/static/fonts/lobster-webfont.svg similarity index 100% rename from budget/static/fonts/lobster-webfont.svg rename to ihatemoney/static/fonts/lobster-webfont.svg diff --git a/budget/static/fonts/lobster-webfont.woff b/ihatemoney/static/fonts/lobster-webfont.woff similarity index 100% rename from budget/static/fonts/lobster-webfont.woff rename to ihatemoney/static/fonts/lobster-webfont.woff diff --git a/budget/static/images/delete.png b/ihatemoney/static/images/delete.png similarity index 100% rename from budget/static/images/delete.png rename to ihatemoney/static/images/delete.png diff --git a/budget/static/images/deleter.png b/ihatemoney/static/images/deleter.png similarity index 100% rename from budget/static/images/deleter.png rename to ihatemoney/static/images/deleter.png diff --git a/budget/static/images/edit.png b/ihatemoney/static/images/edit.png similarity index 100% rename from budget/static/images/edit.png rename to ihatemoney/static/images/edit.png diff --git a/budget/static/images/glyphicons-halflings-white.png b/ihatemoney/static/images/glyphicons-halflings-white.png similarity index 100% rename from budget/static/images/glyphicons-halflings-white.png rename to ihatemoney/static/images/glyphicons-halflings-white.png diff --git a/budget/static/images/glyphicons-halflings.png b/ihatemoney/static/images/glyphicons-halflings.png similarity index 100% rename from budget/static/images/glyphicons-halflings.png rename to ihatemoney/static/images/glyphicons-halflings.png diff --git a/budget/static/images/gradient.png b/ihatemoney/static/images/gradient.png similarity index 100% rename from budget/static/images/gradient.png rename to ihatemoney/static/images/gradient.png diff --git a/budget/static/images/reactivate.png b/ihatemoney/static/images/reactivate.png similarity index 100% rename from budget/static/images/reactivate.png rename to ihatemoney/static/images/reactivate.png diff --git a/budget/static/js/bootstrap-datepicker.js b/ihatemoney/static/js/bootstrap-datepicker.js similarity index 100% rename from budget/static/js/bootstrap-datepicker.js rename to ihatemoney/static/js/bootstrap-datepicker.js diff --git a/budget/static/js/bootstrap.min.js b/ihatemoney/static/js/bootstrap.min.js similarity index 100% rename from budget/static/js/bootstrap.min.js rename to ihatemoney/static/js/bootstrap.min.js diff --git a/budget/static/js/ihatemoney.js b/ihatemoney/static/js/ihatemoney.js similarity index 100% rename from budget/static/js/ihatemoney.js rename to ihatemoney/static/js/ihatemoney.js diff --git a/budget/static/js/jquery-3.1.1.min.js b/ihatemoney/static/js/jquery-3.1.1.min.js similarity index 100% rename from budget/static/js/jquery-3.1.1.min.js rename to ihatemoney/static/js/jquery-3.1.1.min.js diff --git a/budget/static/js/locales/bootstrap-datepicker.fr.min.js b/ihatemoney/static/js/locales/bootstrap-datepicker.fr.min.js similarity index 100% rename from budget/static/js/locales/bootstrap-datepicker.fr.min.js rename to ihatemoney/static/js/locales/bootstrap-datepicker.fr.min.js diff --git a/budget/static/js/tether.min.js b/ihatemoney/static/js/tether.min.js similarity index 100% rename from budget/static/js/tether.min.js rename to ihatemoney/static/js/tether.min.js diff --git a/budget/templates/add_bill.html b/ihatemoney/templates/add_bill.html similarity index 100% rename from budget/templates/add_bill.html rename to ihatemoney/templates/add_bill.html diff --git a/budget/templates/add_member.html b/ihatemoney/templates/add_member.html similarity index 100% rename from budget/templates/add_member.html rename to ihatemoney/templates/add_member.html diff --git a/budget/templates/authenticate.html b/ihatemoney/templates/authenticate.html similarity index 100% rename from budget/templates/authenticate.html rename to ihatemoney/templates/authenticate.html diff --git a/budget/templates/create_project.html b/ihatemoney/templates/create_project.html similarity index 100% rename from budget/templates/create_project.html rename to ihatemoney/templates/create_project.html diff --git a/budget/templates/dashboard.html b/ihatemoney/templates/dashboard.html similarity index 100% rename from budget/templates/dashboard.html rename to ihatemoney/templates/dashboard.html diff --git a/budget/templates/debug.html b/ihatemoney/templates/debug.html similarity index 100% rename from budget/templates/debug.html rename to ihatemoney/templates/debug.html diff --git a/budget/templates/display_errors.html b/ihatemoney/templates/display_errors.html similarity index 100% rename from budget/templates/display_errors.html rename to ihatemoney/templates/display_errors.html diff --git a/budget/templates/edit_member.html b/ihatemoney/templates/edit_member.html similarity index 100% rename from budget/templates/edit_member.html rename to ihatemoney/templates/edit_member.html diff --git a/budget/templates/edit_project.html b/ihatemoney/templates/edit_project.html similarity index 100% rename from budget/templates/edit_project.html rename to ihatemoney/templates/edit_project.html diff --git a/budget/templates/forms.html b/ihatemoney/templates/forms.html similarity index 100% rename from budget/templates/forms.html rename to ihatemoney/templates/forms.html diff --git a/budget/templates/home.html b/ihatemoney/templates/home.html similarity index 100% rename from budget/templates/home.html rename to ihatemoney/templates/home.html diff --git a/budget/templates/invitation_mail.en b/ihatemoney/templates/invitation_mail.en similarity index 100% rename from budget/templates/invitation_mail.en rename to ihatemoney/templates/invitation_mail.en diff --git a/budget/templates/invitation_mail.fr b/ihatemoney/templates/invitation_mail.fr similarity index 100% rename from budget/templates/invitation_mail.fr rename to ihatemoney/templates/invitation_mail.fr diff --git a/budget/templates/layout.html b/ihatemoney/templates/layout.html similarity index 100% rename from budget/templates/layout.html rename to ihatemoney/templates/layout.html diff --git a/budget/templates/list_bills.html b/ihatemoney/templates/list_bills.html similarity index 100% rename from budget/templates/list_bills.html rename to ihatemoney/templates/list_bills.html diff --git a/budget/templates/password_reminder.en b/ihatemoney/templates/password_reminder.en similarity index 100% rename from budget/templates/password_reminder.en rename to ihatemoney/templates/password_reminder.en diff --git a/budget/templates/password_reminder.fr b/ihatemoney/templates/password_reminder.fr similarity index 100% rename from budget/templates/password_reminder.fr rename to ihatemoney/templates/password_reminder.fr diff --git a/budget/templates/password_reminder.html b/ihatemoney/templates/password_reminder.html similarity index 100% rename from budget/templates/password_reminder.html rename to ihatemoney/templates/password_reminder.html diff --git a/budget/templates/recent_projects.html b/ihatemoney/templates/recent_projects.html similarity index 100% rename from budget/templates/recent_projects.html rename to ihatemoney/templates/recent_projects.html diff --git a/budget/templates/reminder_mail.en b/ihatemoney/templates/reminder_mail.en similarity index 100% rename from budget/templates/reminder_mail.en rename to ihatemoney/templates/reminder_mail.en diff --git a/budget/templates/reminder_mail.fr b/ihatemoney/templates/reminder_mail.fr similarity index 100% rename from budget/templates/reminder_mail.fr rename to ihatemoney/templates/reminder_mail.fr diff --git a/budget/templates/send_invites.html b/ihatemoney/templates/send_invites.html similarity index 100% rename from budget/templates/send_invites.html rename to ihatemoney/templates/send_invites.html diff --git a/budget/templates/settle_bills.html b/ihatemoney/templates/settle_bills.html similarity index 100% rename from budget/templates/settle_bills.html rename to ihatemoney/templates/settle_bills.html diff --git a/budget/templates/sidebar_table_layout.html b/ihatemoney/templates/sidebar_table_layout.html similarity index 100% rename from budget/templates/sidebar_table_layout.html rename to ihatemoney/templates/sidebar_table_layout.html diff --git a/budget/tests/__init__.py b/ihatemoney/tests/__init__.py similarity index 100% rename from budget/tests/__init__.py rename to ihatemoney/tests/__init__.py diff --git a/budget/tests/ihatemoney.cfg b/ihatemoney/tests/ihatemoney.cfg similarity index 100% rename from budget/tests/ihatemoney.cfg rename to ihatemoney/tests/ihatemoney.cfg diff --git a/budget/tests/ihatemoney_envvar.cfg b/ihatemoney/tests/ihatemoney_envvar.cfg similarity index 100% rename from budget/tests/ihatemoney_envvar.cfg rename to ihatemoney/tests/ihatemoney_envvar.cfg diff --git a/budget/tests/tests.py b/ihatemoney/tests/tests.py similarity index 99% rename from budget/tests/tests.py rename to ihatemoney/tests/tests.py index 386920f5..afd6af41 100644 --- a/budget/tests/tests.py +++ b/ihatemoney/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'] -from .. import run -from .. import models -from .. import utils +from ihatemoney import run +from ihatemoney import models +from ihatemoney import utils __HERE__ = os.path.dirname(os.path.abspath(__file__)) diff --git a/budget/translations/fr/LC_MESSAGES/messages.mo b/ihatemoney/translations/fr/LC_MESSAGES/messages.mo similarity index 100% rename from budget/translations/fr/LC_MESSAGES/messages.mo rename to ihatemoney/translations/fr/LC_MESSAGES/messages.mo diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po similarity index 100% rename from budget/translations/fr/LC_MESSAGES/messages.po rename to ihatemoney/translations/fr/LC_MESSAGES/messages.po diff --git a/budget/utils.py b/ihatemoney/utils.py similarity index 100% rename from budget/utils.py rename to ihatemoney/utils.py diff --git a/budget/web.py b/ihatemoney/web.py similarity index 99% rename from budget/web.py rename to ihatemoney/web.py index ba771247..affe1047 100644 --- a/budget/web.py +++ b/ihatemoney/web.py @@ -22,13 +22,13 @@ import werkzeug from sqlalchemy import orm from functools import wraps -from .models import db, Project, Person, Bill -from .forms import ( +from ihatemoney.models import db, Project, Person, Bill +from ihatemoney.forms import ( AdminAuthenticationForm, AuthenticationForm, EditProjectForm, InviteForm, MemberForm, PasswordReminder, ProjectForm, get_billform_for, ExportForm ) -from .utils import Redirect303, list_of_dicts2json, list_of_dicts2csv +from ihatemoney.utils import Redirect303, list_of_dicts2json, list_of_dicts2csv main = Blueprint("main", __name__) mail = Mail() diff --git a/budget/wsgi.py b/ihatemoney/wsgi.py similarity index 100% rename from budget/wsgi.py rename to ihatemoney/wsgi.py diff --git a/tox.ini b/tox.ini index b918bdbe..05886252 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skip_missing_interpreters = True commands = python --version - py.test budget/tests/tests.py + py.test ihatemoney/tests/tests.py deps = -rdev-requirements.txt -rrequirements.txt