Add rdf_io and skosxl, update modules

diff --git a/app/bin/app.sh b/app/bin/app.sh
index bdda2bc9bc90dfa6aba89cb05f9c92c7de642d00..724a27201d52dc827ed86317b08d40c9317da853 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -18,10 +18,8 @@ uid='www-data'
 gid='www-data'
 # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 
-# Staging
-# cd /srv/lib/mezzanine-organization
-# pip install -U -r requirements.txt
-# cd /srv/app
+# Install (staging) libs
+/srv/bin/build/local/setup_lib.sh
 
 # waiting for other services
 sh $app/bin/wait.sh

diff --git a/app/settings.py b/app/settings.py
index 66ead2b8839aabad23d456783697ec7b82e2da17..0e0eae79d92de01e1cd246a94e0719240aeb4827 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -284,6 +284,8 @@ INSTALLED_APPS = [
     'compat',
     'guardian',
     'extra_views',
+    'rdf_io',
+    'skosxl',
 ]
 
 CUSTOM_MODULES = False

diff --git a/app/urls.py b/app/urls.py
index 29d3121f0522de6c45a78ea329fe20a1bc65ce37..d07f5b0fbe6f116b158ab021ed1f4f35e2ac3205 100644 (file)
--- a/app/urls.py
+++ b/app/urls.py
@@ -227,3 +227,9 @@ if "mezzanine.pages" in settings.INSTALLED_APPS:
 handler404 = "mezzanine.core.views.page_not_found"
 handler500 = "mezzanine.core.views.server_error"
 handler403 = "organization.core.views.permission_denied"
+
+# rdi_io patterns.
+if "rdf_io" in settings.INSTALLED_APPS:
+    urlpatterns += [
+        url(r"^rdf_io/", include('rdf_io.urls'))
+        ]

diff --git a/docker-compose.yml b/docker-compose.yml
index ce072e9da633ac4a67c2bc5f8b4e959df7dd8cfc..f7c0de17bfd6bb4a983a146defc0c988dee403e2 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,8 @@
 # Authors:
 # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
 
+# version 1
+
 var:
     image: debian:jessie
     volumes:

diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index c53579a554d31b1f3ce308b43cd5da9388f0cdcd..969b8d08c2ea0c64c81391204a16092e22a5069e 160000 (submodule)
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit c53579a554d31b1f3ce308b43cd5da9388f0cdcd
+Subproject commit 969b8d08c2ea0c64c81391204a16092e22a5069e