From 3034a0c09afc5df72d7ed9dd694a47a826508a9d Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 30 Jun 2010 10:45:27 +0100
Subject: [PATCH] Initial groundwork for using virtualenv

---
 .gitignore       | 1 +
 init.sh          | 8 --------
 requirements.txt | 6 ++++++
 setup-env.sh     | 3 +++
 sso/models.py    | 2 +-
 start.sh         | 3 ++-
 6 files changed, 13 insertions(+), 10 deletions(-)
 delete mode 100755 init.sh
 create mode 100644 requirements.txt
 create mode 100755 setup-env.sh

diff --git a/.gitignore b/.gitignore
index 83dd37b..0ee7e8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ piston
 django_evolution
 logs/
 settingslocal.py
+env
diff --git a/init.sh b/init.sh
deleted file mode 100755
index df810e8..0000000
--- a/init.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-svn co http://code.djangoproject.com/svn/django/branches/releases/1.1.X/django django
-svn co http://django-evolution.googlecode.com/svn/trunk/django_evolution
-hg clone http://bitbucket.org/jespern/django-piston/
-rm -rf piston
-mv django-piston/piston ./
-rm -rf django-piston
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..7bbe5bc
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,6 @@
+Django==1.1.2
+django-evolution==0.5
+django-piston==0.2.2
+django-registration==0.7
+yolk==0.4.1
+-e git+http://github.com/bradjasper/django-jsonfield.git#egg=django_jsonfield
diff --git a/setup-env.sh b/setup-env.sh
new file mode 100755
index 0000000..9b5563a
--- /dev/null
+++ b/setup-env.sh
@@ -0,0 +1,3 @@
+virtualenv --distribute env
+. ./env/bin/activate
+pip install -r requirements.txt
diff --git a/sso/models.py b/sso/models.py
index d424905..8053064 100644
--- a/sso/models.py
+++ b/sso/models.py
@@ -8,7 +8,7 @@ from django.db.models import signals
 from django.contrib.auth.models import User, UserManager, Group
 from django.utils import simplejson as json
 
-from django_jsonfield.fields import JSONField
+from nosj.fields import JSONField
 from eve_api.models import EVEAccount, EVEPlayerCorporation, EVEPlayerAlliance
 from reddit.models import RedditAccount
 
diff --git a/start.sh b/start.sh
index ef067de..0e2d79b 100755
--- a/start.sh
+++ b/start.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-/usr/bin/python ./manage.py runfcgi method=threaded host=127.0.0.1 port=9981
+. ./env/bin/activate
+python ./manage.py runfcgi method=threaded host=127.0.0.1 port=9981