Update environment, requirements and manage thesurus through Django-skosxl

diff --git a/Dockerfile b/Dockerfile
index c1ca162c4d786044d77175301cbcc6356da37d45..61b9ac7f5314b5790a8c191c3958b55aab4e2bde 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 FROM continuumio/miniconda
 ENV PYTHONUNBUFFERED 1
 
-RUN mkdir -p /srv/src/app
+RUN mkdir -p /srv/src/app &&\
+    mkdir -p /srv/src/lib 
 WORKDIR /srv/src/app
 ADD conda-environment.yml /srv/src/app/
 RUN conda update --all -y &&\

diff --git a/conda-environment.yml b/conda-environment.yml
index eca81f8b310c2100bf9e7d7430b5eae379dee555..4edaeb7641ea7bbcc4658665a6e454f0fcd0ec74 100644 (file)
--- a/conda-environment.yml
+++ b/conda-environment.yml
@@ -1,14 +1,14 @@
 name: MCM
 dependencies:
-- django=1.9.5=py27_0
-- openssl=1.0.2h=1
-- pip=8.1.2=py27_0
-- python=2.7.12=1
-- readline=6.2=2
-- setuptools=23.0.0=py27_0
-- sqlite=3.13.0=0
-- tk=8.5.18=0
-- wheel=0.29.0=py27_0
-- zlib=1.2.8=3
+- pip=9.*
+- python=2.7
+- sqlite
+- wheel
+- pip:
+    - django==1.9.*
+    - "--src=/srv/src/lib"
+    - "--editable=git+https://github.com/thomasfillon/django-skosxl.git@master#egg=django-skosxl"
+    - "--editable=git+https://github.com/thomasfillon/django-rdf-io.git@master#egg=django-rdf-io"
+    - Werkzeug
 prefix: /opt/conda/envs/MCM
 

diff --git a/docker-compose.yml b/docker-compose.yml
index 374647c5e6f7e44f905fe39c8d7a55404bad0446..d5cb8c3fa4d9e9a594bcb7690625e6eead5e7aac 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   app:
     build: .
-    command: python manage.py runserver 0.0.0.0:8000
+    command: python manage.py runserver_plus 0.0.0.0:8000
     volumes:
       - .:/srv/src/app/
     ports:

diff --git a/telemeta_mcm/settings.py b/telemeta_mcm/settings.py
index 390d710997a579a560400a9c7f8e8e17b13b3106..8a4776d7203b88c0368e54019356e6c8bc1d0bf7 100644 (file)
--- a/telemeta_mcm/settings.py
+++ b/telemeta_mcm/settings.py
@@ -38,6 +38,9 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'skosxl',
+    'rdf_io',
+    'django_extensions'
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -120,3 +123,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_URL = '/static/'
+
+
+# SKOSXL settings
+SKOSXL_DEFAULT_LANG = 'fr'

diff --git a/telemeta_mcm/urls.py b/telemeta_mcm/urls.py
index a9758124aeb9dbcf7caf535accecc3af047daef8..34682d8a9dddc090d3dd8482180fb97d004f9fb2 100644 (file)
--- a/telemeta_mcm/urls.py
+++ b/telemeta_mcm/urls.py
@@ -13,9 +13,11 @@ Including another URLconf
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url
+from django.conf.urls import url, include 
 from django.contrib import admin
 
+
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'^telemeta/skosxl/', include('skosxl.urls'))
 ]