Browse Source

fixup! Split up server code into modules

Maarten van den Berg 5 years ago
parent
commit
752980e94a
3 changed files with 6 additions and 5 deletions
  1. 1 1
      piket_server/flask.py
  2. 1 1
      piket_server/routes/settlements.py
  3. 4 3
      piket_server/seed.py

+ 1 - 1
piket_server/flask.py

6
 from typing import Any
6
 from typing import Any
7
 
7
 
8
 from flask import Flask
8
 from flask import Flask
9
-from flask_sqlalchemy import SQLAlchemy
9
+from flask_sqlalchemy import SQLAlchemy  # type: ignore
10
 
10
 
11
 DATA_HOME = os.environ.get("XDG_DATA_HOME", "~/.local/share")
11
 DATA_HOME = os.environ.get("XDG_DATA_HOME", "~/.local/share")
12
 CONFIG_DIR = os.path.join(DATA_HOME, "piket_server")
12
 CONFIG_DIR = os.path.join(DATA_HOME, "piket_server")

+ 1 - 1
piket_server/routes/settlements.py

6
 from flask import jsonify, request
6
 from flask import jsonify, request
7
 
7
 
8
 from piket_server.flask import app, db
8
 from piket_server.flask import app, db
9
-from piket_server.models import Settlement
9
+from piket_server.models import Consumption, Settlement
10
 
10
 
11
 
11
 
12
 @app.route("/settlements", methods=["GET"])
12
 @app.route("/settlements", methods=["GET"])

+ 4 - 3
piket_server/seed.py

6
 import csv
6
 import csv
7
 import os
7
 import os
8
 
8
 
9
-from piket_server import db, Person, Settlement, ConsumptionType, Consumption
9
+from piket_server.models import Person, Settlement, ConsumptionType, Consumption
10
+from piket_server.flask import db
10
 
11
 
11
 
12
 
12
 def main():
13
 def main():
52
         print("All data removed. Recreating database...")
53
         print("All data removed. Recreating database...")
53
         db.create_all()
54
         db.create_all()
54
 
55
 
55
-        from alembic.config import Config
56
-        from alembic import command
56
+        from alembic.config import Config  # type: ignore
57
+        from alembic import command  # type: ignore
57
 
58
 
58
         alembic_cfg = Config(os.path.join(os.path.dirname(__file__), "alembic.ini"))
59
         alembic_cfg = Config(os.path.join(os.path.dirname(__file__), "alembic.ini"))
59
         command.stamp(alembic_cfg, "head")
60
         command.stamp(alembic_cfg, "head")