From 29397141543ef245e7e3f9670a754c987475e7c6 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 24 Mar 2011 11:39:35 +0100 Subject: [PATCH] use django 1.3.x --- pandora/settings.py | 15 ++++++++------- requirements.txt | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pandora/settings.py b/pandora/settings.py index 1b3653258..7ca643966 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -30,13 +30,14 @@ DEFAULT_FROM_EMAIL='admin@' + URL.split('/')[0] MANAGERS = ADMINS -DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = 'dev.sqlite' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. - +DATABASES = { + 'default': { + 'NAME': 'pandora', + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'USER': 'pandora', + 'PASSWORD': '' + } +} #rabbitmq connection settings CELERY_RESULT_BACKEND = "database" diff --git a/requirements.txt b/requirements.txt index 0db31d72a..90cfe61a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ --e svn+http://code.djangoproject.com/svn/django/branches/releases/1.2.X#egg=django +-e svn+http://code.djangoproject.com/svn/django/branches/releases/1.3.X#egg=django #South -e bzr+http://code.0x2620.org/python-ox/#egg=python-ox -e bzr+http://code.0x2620.org/oxtimeline/#egg=oxtimeline