Merge branch 'collection' of csgitlab.ucd.ie:19206226/q-a_platform into collection

 Conflicts:

	config.py

.gitlab-ci.yml

@@ -37,6 +37,11 @@ test:
       - source venv/bin/activate
       - pip install -r requirements.txt
       - echo "TEST"
+      - python -V  # Print out python version for debugging
+      - pip install virtualenv
+      - virtualenv venv
+      - source venv/bin/activate
+      - pip install -r requirements.txt
       - coverage run ModelsTest.py
       - coverage report -m
     # - python setup.py test

config.py

@@ -25,6 +25,10 @@ class Config:
     CACHE_TYPE = "simple"
     ADMIN_EMAIL=['1148636961@qq.com','me@echo.cool','2721712688@qq.com','1635743062@qq.com']
 
+    CACHE_TYPE = os.environ.get('CACHE_TYPE') or "simple"
+    REDIS_URL = os.environ.get('REDIS_URL') or ""
+    REDIS_USERNAME = os.environ.get('REDIS_USERNAME') or ""
+    REDIS_PASSWORD = os.environ.get('REDIS_PASSWORD') or ""
 
     @staticmethod
     def init_app(app):