diff --git a/home:entrouvert:cg14-tests/passerelle/_service b/home:entrouvert:cg14-tests/passerelle/_service index e049fab..b868896 100644 --- a/home:entrouvert:cg14-tests/passerelle/_service +++ b/home:entrouvert:cg14-tests/passerelle/_service @@ -2,6 +2,6 @@ repos.entrouvert.org http - /passerelle.git/snapshot/passerelle-08ea46e.tar.gz + /passerelle.git/snapshot/passerelle-ef79c2a.tar.gz diff --git a/home:entrouvert:cg14-tests/passerelle/cg14_config.py b/home:entrouvert:cg14-tests/passerelle/cg14_config.py index 23e5c70..1770ab4 100644 --- a/home:entrouvert:cg14-tests/passerelle/cg14_config.py +++ b/home:entrouvert:cg14-tests/passerelle/cg14_config.py @@ -26,7 +26,9 @@ DATABASES = { INSTALLED_APPS = INSTALLED_APPS[:-1] + ( 'solis', 'makorepost', + 'bdp', 'gadjo', + 'entrouvert.djommon', ) # where to find templates for makorepost objects diff --git a/home:entrouvert:cg14-tests/passerelle/passerelle.init b/home:entrouvert:cg14-tests/passerelle/passerelle.init index af1dd46..6b8e02e 100644 --- a/home:entrouvert:cg14-tests/passerelle/passerelle.init +++ b/home:entrouvert:cg14-tests/passerelle/passerelle.init @@ -51,8 +51,8 @@ do_create_secret() { do_migrate() { # install new applications, if any, migrate others if needed - echo "Applying new migrations (syncdb --migrate)..." - $SCRIPTNAME manage syncdb --migrate --verbosity=2 --traceback --noinput + echo "Installing new apps, applying new migrations (safemigrate)..." + $SCRIPTNAME manage safemigrate --verbosity=2 --traceback --noinput } do_collectstatic() { diff --git a/home:entrouvert:cg14-tests/passerelle/passerelle.spec b/home:entrouvert:cg14-tests/passerelle/passerelle.spec index a2a84c0..e605749 100644 --- a/home:entrouvert:cg14-tests/passerelle/passerelle.spec +++ b/home:entrouvert:cg14-tests/passerelle/passerelle.spec @@ -1,8 +1,8 @@ %define tag 0.5.0 -%define commit 08ea46e +%define commit ef79c2a # si possible, minor = nombre de commit depuis le tag (à la "git describe") -%define minor 34 +%define minor 48 # si minor == 0 #%define version %{tag} @@ -32,7 +32,7 @@ Source8: cg14_config.py BuildArch: noarch BuildRequires: python2-devel python-django python-setuptools-devel -Requires: python-django python-South python-django-jsonresponse python-django-model-utils python-gunicorn python-Mako python-raven python-django-gadjo python-requests python-django-jsonfield +Requires: python-django python-South python-django-jsonresponse python-django-model-utils python-gunicorn python-Mako python-raven python-django-gadjo python-requests python-django-jsonfield python-entrouvert %description Passerelle provides an uniform access to multiple data sources and services.