Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

@@ -25,7 +25,7 @@ pytest:
   stage: test
   before_script:
     - pip install -U pip setuptools
-    - pip install -r test_requirements.txt
+    - pip install -r requirements-test.txt
     - apt-get update && cat system-requirements.txt | xargs apt-get install -y
   script:
     - pytest -v --cov=ojusomap

README.md

@@ -52,6 +52,6 @@ $ python manage.py migrate
 ## Run The Tests
 
 ``` bash
-$ pip install -r test_requirements.txt
+$ pip install -r requirements-test.txt
 $ pytest -v
 ```

requirements-test.txt

@@ -2,3 +2,4 @@
 pytest==3.5.0
 pytest-django==3.1.2
 pytest-cov==2.5.1
+django-override-storage==0.1.4