Commit 2e8a891c authored by Okhin's avatar Okhin Committed by GitHub
Browse files

Merge pull request #158 from political-memory/restructure_test

Attempt at fixing tests in the restructure branch
parents eeb5b064 029a6562
......@@ -24,6 +24,10 @@ function downloadFromGithub()
local repo=$2
local ref=$3
if [ -d $dest ]; then
echo "* $repo ($ref) already downloaded, skipping"
return
fi
echo "* Downloading $repo ($ref) from Github..."
wget -O temp.zip -q https://github.com/${repo}/archive/${ref}.zip
unzip -q temp.zip
......@@ -33,7 +37,9 @@ function downloadFromGithub()
set -e
[ -d ${DEST} ] && rm -r ${DEST}
if [ -z ${CI-} ]; then
[ -d ${DEST} ] && rm -r ${DEST}
fi
mkdir -p ${DEST}
downloadFromGithub jquery jquery/jquery 2.1.4
......
......@@ -2,9 +2,11 @@
import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "memopol.settings")
def main():
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "memopol.settings")
from django.core.management import execute_from_command_line
execute_from_command_line(sys.argv)
if __name__ == "__main__":
main()
......@@ -20,7 +20,7 @@ from django.utils.crypto import get_random_string
# Base memopol settings
#
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
DEBUG = os.environ.get('DJANGO_DEBUG', 'false').lower() == 'true'
#
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment