summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhardythe12014-09-15 12:46:53 +0530
committerhardythe12014-09-15 12:46:53 +0530
commitec036fc104dc4d0ff72d66d1806591bbed7dafd0 (patch)
tree325d0a4a32c563b2fe87248d577b19fb16814761
parent8e918fe711ce95532532ab917e95af3ec319e794 (diff)
parent70a500a571afa1e3c92a5669a03d81949774f4a1 (diff)
downloadscipy2014-ec036fc104dc4d0ff72d66d1806591bbed7dafd0.tar.gz
scipy2014-ec036fc104dc4d0ff72d66d1806591bbed7dafd0.tar.bz2
scipy2014-ec036fc104dc4d0ff72d66d1806591bbed7dafd0.zip
Merge branch 'master' of https://github.com/FOSSEE/scipy2014
-rw-r--r--README.md11
-rwxr-xr-x[-rw-r--r--]manage.py0
-rw-r--r--scipy/sample-config.py5
-rw-r--r--scipy/settings.py2
4 files changed, 17 insertions, 1 deletions
diff --git a/README.md b/README.md
index d6fac9b..839f9aa 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,14 @@ scipy2014
=========
Website for SciPy India 2014
+
+
+## Setup dev environment
+
+1. Use the requirements.txt file to install all the dependencies.
+
+2. Copy the `sample-config.py` file to `config.py` and edit your config.
+
+ ```
+ cp scipy/sample-config.py scipy/config.py
+ ```
diff --git a/manage.py b/manage.py
index 054487a..054487a 100644..100755
--- a/manage.py
+++ b/manage.py
diff --git a/scipy/sample-config.py b/scipy/sample-config.py
new file mode 100644
index 0000000..6d7d980
--- /dev/null
+++ b/scipy/sample-config.py
@@ -0,0 +1,5 @@
+DB_ENGINE = 'django.db.backends.sqlite3'
+DB_NAME = 'scipy.db'
+DB_USER = ''
+DB_PASS = ''
+SECRET_KEY = 'Use your secret key here'
diff --git a/scipy/settings.py b/scipy/settings.py
index 353fa4f..63588fb 100644
--- a/scipy/settings.py
+++ b/scipy/settings.py
@@ -56,7 +56,7 @@ WSGI_APPLICATION = 'scipy.wsgi.application'
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.mysql',
+ 'ENGINE': DB_ENGINE,
'NAME': DB_NAME,
'USER': DB_USER,
'PASSWORD': DB_PASS