From 4be134a782a0ea7e1f75f5a782a70804295325b5 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 21 Jan 2014 15:47:06 +0100 Subject: [PATCH] improve developer start scripts --- jenkins.sh | 7 +++++-- load-base-data.sh | 5 +++++ requirements.txt | 10 +++++----- run.sh | 15 +++++++++++++++ start.sh | 30 ++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100755 load-base-data.sh create mode 100755 run.sh create mode 100755 start.sh diff --git a/jenkins.sh b/jenkins.sh index 8c0f29d..40436dc 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -2,6 +2,9 @@ pip install --upgrade setuptools pip install --upgrade pip pip install --upgrade pylint -pip install --upgrade -v --allow-all-external --allow-unverified django-admin-tools -r requirements.txt -echo Nothing to test for now +pip install --upgrade -r requirements.txt +./portail-citoyen syncdb --migrate --noinput --no-initial-data +./portail-citoyen loaddata initial_data +./portail-citoyen validate +(pylint -f parseable --rcfile /var/lib/jenkins/pylint.django.rc compte_agglo_montpellier/ | tee pylint.out) || /bin/true (pylint -f parseable --rcfile /var/lib/jenkins/pylint.django.rc portail_citoyen/ | tee pylint.out) || /bin/true diff --git a/load-base-data.sh b/load-base-data.sh new file mode 100755 index 0000000..7111c07 --- /dev/null +++ b/load-base-data.sh @@ -0,0 +1,5 @@ +BASE=`dirname $0` + +ENV=${ENV:-dev} + +$BASE/run.sh loaddata --traceback initial_data diff --git a/requirements.txt b/requirements.txt index f16df20..12c249f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ --allow-all-external ---allow-unverified python-entrouvert ---allow-unverified django-cms --allow-unverified django-admin-tools +-f https://repos.entrouvert.org/django-cms.git/ +django-cms +-f https://repos.entrouvert.org/python-entrouvert.git/ +python-entrouvert requests>=1.0.0 cmsplugin-text-wrapper>=0.5 feedparser django>=1.5.1,<1.6 -git+git://repos.entrouvert.org/authentic.git/#egg=authentic2-9999 -git+git://repos.entrouvert.org/django-cms.git/@develop#egg=django-cms-2.4.1.9999 -git+git://repos.entrouvert.org/python-entrouvert.git/#egg=python-entrouvert-9999 +authentic2 south>=0.8.4 Pillow diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..9b16ac0 --- /dev/null +++ b/run.sh @@ -0,0 +1,15 @@ +#!/bin/sh +BASE=`dirname $0` +PROJECT=portail-citoyen +CTL=$BASE/${PROJECT} +VENV=$BASE/${PROJECT}-venv + +if [ ! -n "$VIRTUAL_ENV" ]; then + if [ ! -d $VENV ]; then + $BASE/start.sh norun + fi + . $VENV/bin/activate +fi +export DEBUG=1 +$CTL "${@:-runserver}" + diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..6e46416 --- /dev/null +++ b/start.sh @@ -0,0 +1,30 @@ +PROJECT=portail-citoyen +CTL=${PROJECT} +VENV=${PROJECT}-venv + +if [ "$VIRTUAL_ENV" = "" ]; then + if which mkvirtualenv >/dev/null 2>&1; then + workon $PROJECT || (mkvirtualenv $PROJECT; workon $PROJECT) + else + if [ ! -d $VENV ]; then + virtualenv --system-site-packages $VENV 2>/dev/null || virtualenv $VENV + fi + . ./$VENV/bin/activate + fi +fi +pip install --upgrade setuptools +pip install --upgrade pip +pip install --upgrade pyOpenSSL ndg-httpsclient requests +sed -i 's/^MAX = 64/MAX = 200/' $VENV/lib/python*/site-packages/ndg/httpsclient/subj_alt_name.py +pip install --upgrade --process-dependency-links -r requirements.txt +if [ ! -f $PROJECT.db ]; then + ./$CTL syncdb --all --noinput + ./$CTL migrate --fake + if [ -f load-base-data.sh ]; then + ./load-base-data.sh + fi +fi +if [ "$1" != "norun" ]; then + export DEBUG=1 + ./$CTL runserver +fi