diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2017-02-24 16:33:14 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2017-02-24 16:33:14 +0800 |
| commit | d3cdec447d691553a1861a8ac8a2b7d0cf61def1 (patch) | |
| tree | 4cf8b788a265556a02126e7f488e09efe2d6d638 | |
| parent | 35d4472ca6d22cebe2f0d2b81fc5179898a1fd61 (diff) | |
Remove dependency on mysql
Change-Id: I9bbecf8e22b1ee59ab8d80d808c4e8f0bd1a7421
Issue-Id: MULTIVIM-48
Signed-off-by: Bin Yang <bin.yang@windriver.com>
| -rw-r--r-- | kilo/kilo/settings.py | 18 | ||||
| -rw-r--r-- | kilo/requirements.txt | 3 | ||||
| -rw-r--r-- | newton/newton/settings.py | 18 | ||||
| -rw-r--r-- | newton/requirements.txt | 3 |
4 files changed, 6 insertions, 36 deletions
diff --git a/kilo/kilo/settings.py b/kilo/kilo/settings.py index c6ad62b3..5a7ca291 100644 --- a/kilo/kilo/settings.py +++ b/kilo/kilo/settings.py @@ -12,11 +12,6 @@ import os import sys -import redisco - -from kilo.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD -from kilo.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT - # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -73,18 +68,11 @@ REST_FRAMEWORK = { DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'NAME': DB_NAME, - 'HOST': DB_IP, - 'PORT': DB_PORT, - 'USER': DB_USER, - 'PASSWORD': DB_PASSWD, - }, + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } } -redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0) -# CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT) - TIME_ZONE = 'UTC' # Static files (CSS, JavaScript, Images) diff --git a/kilo/requirements.txt b/kilo/requirements.txt index 25904796..6d58957b 100644 --- a/kilo/requirements.txt +++ b/kilo/requirements.txt @@ -2,9 +2,6 @@ Django==1.9.6 djangorestframework==3.3.3 -# for access MySQL -MySQL-python==1.2.5 - # redis cache redis==2.10.5 diff --git a/newton/newton/settings.py b/newton/newton/settings.py index 8a5cc010..b0be17e8 100644 --- a/newton/newton/settings.py +++ b/newton/newton/settings.py @@ -12,11 +12,6 @@ import os import sys -import redisco - -from newton.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD -from newton.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT - # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -73,18 +68,11 @@ REST_FRAMEWORK = { DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'NAME': DB_NAME, - 'HOST': DB_IP, - 'PORT': DB_PORT, - 'USER': DB_USER, - 'PASSWORD': DB_PASSWD, - }, + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } } -redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0) -# CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT) - TIME_ZONE = 'UTC' # Static files (CSS, JavaScript, Images) diff --git a/newton/requirements.txt b/newton/requirements.txt index 25904796..6d58957b 100644 --- a/newton/requirements.txt +++ b/newton/requirements.txt @@ -2,9 +2,6 @@ Django==1.9.6 djangorestframework==3.3.3 -# for access MySQL -MySQL-python==1.2.5 - # redis cache redis==2.10.5 |