Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ To install the Python library requirements, run:

pip install -r requirements.txt

or, if you want to use Postgres as the dabase backend:

pip install -r requirements-postgres.txt

To initialise the database (SQLite is used by default), run:

python manage.py syncdb


## Running

Though the client and server can be run independently (and they are in fact run as such our ovii server), you can run them both on your local machine simply with:
Expand Down
8 changes: 5 additions & 3 deletions complexityplot/complexityplot/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
DEBUG = True
TEMPLATE_DEBUG = DEBUG

BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

ADMINS = (
('Simon Walton', '[email protected]'),
)
Expand Down Expand Up @@ -63,9 +65,9 @@
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/var/www/example.com/static/"
STATIC_ROOT = "/Users/sim/Documents/ComplexityPlot/Web/complexityplot/"
STATIC_ROOT = BASE_DIR

BASE_DIR = "/Users/sim/Documents/ComplexityPlot/Web/complexityplot/"
BASE_DIR = BASE_DIR

# URL prefix for static files.
# Example: "http://example.com/static/", "http://static.example.com/"
Expand Down Expand Up @@ -123,7 +125,7 @@
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
"/Users/sim/Documents/ComplexityPlot/Web/complexityplot/templates/"
os.path.normpath(os.path.join(BASE_DIR, 'templates'))
)

INSTALLED_APPS = (
Expand Down
2 changes: 2 additions & 0 deletions requirements-postgres.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-r requirements.txt
psycopg2==2.4.6
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
Django==1.5.1
South==0.7.6
distribute==0.6.35
dj-database-url==0.2.1
gunicorn==0.17.2
heroku==0.1.2
ipython==0.13.1
numpy==1.7.0
psycopg2==2.4.6
python-dateutil==1.5
requests==1.2.0
virtualenv==1.9.1
Expand Down