From 2d09b9c819d870e83f796369a62b007333ceb577 Mon Sep 17 00:00:00 2001 From: Joshua McKenty Date: Wed, 17 Apr 2013 13:00:03 -0700 Subject: [PATCH] Run pip install from fabfile. --- fabfile.py | 1 + refstack/web.py | 14 +++++++++++++- requirements.txt | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/fabfile.py b/fabfile.py index 449ae6b9..29093f4b 100644 --- a/fabfile.py +++ b/fabfile.py @@ -18,4 +18,5 @@ def deploy(): with cd('/var/www/refstack'): run('git checkout master') run('git pull') + run('sudo pip install -r requirements.txt') run('sudo uwsgi --reload /tmp/project-master_refstack.pid') \ No newline at end of file diff --git a/refstack/web.py b/refstack/web.py index 7d07e192..2bb6254c 100644 --- a/refstack/web.py +++ b/refstack/web.py @@ -8,7 +8,7 @@ import random import sqlite3 import sys from flask import Flask, request, render_template, g, jsonify - +from contextlib import closing # TODO(JMC): Make me a config var DATABASE = '/var/www/refstack/database.db' @@ -29,6 +29,18 @@ def before_request(): def teardown_request(exception): if hasattr(g, 'db'): g.db.close() + +def query_db(query, args=(), one=False): + cur = g.db.execute(query, args) + rv = [dict((cur.description[idx][0], value) + for idx, value in enumerate(row)) for row in cur.fetchall()] + return (rv[0] if rv else None) if one else rv + +def init_db(): + with closing(connect_db()) as db: + with app.open_resource('schema.sql') as f: + db.cursor().executescript(f.read()) + db.commit() @app.route('/', methods=['POST','GET']) def index(): diff --git a/requirements.txt b/requirements.txt index c11c3845..1246d918 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ requests twisted -flask \ No newline at end of file +flask +sqlite3 \ No newline at end of file