[BUG] Fixed settings.py

[DOC] More details about aldjemy

gargantext_web/settings.py

@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-PROJECT_PATH = os.path.join(BASE_DIR, os.pardir)
+PROJECT_PATH = BASE_DIR
 PROJECT_PATH = os.path.abspath(PROJECT_PATH)
 
 import djcelery
@@ -36,13 +36,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes
     # Don't forget to use absolute paths, not relative paths.
-    '/srv/gargantext/templates',
-
-#import os.path
-#
-#TEMPLATE_DIRS = (
-#    os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
-#)
+    os.path.join(PROJECT_PATH, 'templates'),
 )
 
 
@@ -121,11 +115,10 @@ USE_TZ = True
 
 ROOT_URLCONF = 'gargantext_web.urls'
 
-STATIC_ROOT = '/var/www/gargantext/static/'
+# STATIC_ROOT = os.path.join(PROJECT_PATH, '')
 STATIC_URL = '/static/'
 
-MEDIA_ROOT = '/var/www/gargantext/media'
-#MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
+MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
 MEDIA_URL   = '/media/'
 
 
@@ -136,11 +129,8 @@ STATICFILES_FINDERS = (
 
 
 STATICFILES_DIRS = (
-            #os.path.join(BASE_DIR, "static"),
-                '/srv/gargantext/static',
-                #'/var/www/www/alexandre/media',
-                #'/var/www/alexandre.delanoe.org/',
-                )
+    os.path.join(PROJECT_PATH, 'static'),
+)
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",

init/README.rst

@@ -59,34 +59,40 @@ Populate the database
 python manage.py syncdb
 
 
-Last steps of configuration:
-----------------------------
+Last steps of configuration
+---------------------------
 
-1) If your project is not in /srv/gargantext:
+1)  If your project is not in /srv/gargantext:
     ln -s [the project folder] /srv/gargantext
 
-2) build gargantext_lib
-    wget http://docs.delanoe.org/gargantext_lib.tar.bz2
+2)  build gargantext_lib:
     cd /srv/
+    wget http://docs.delanoe.org/gargantext_lib.tar.bz2
     sudo tar xvjf gargantext_lib.tar.bz2
     sudo chown user:user /srv/gargantext_lib
 
-3) Explorer: 
-cd /srv/gargantext_lib/js
-git clone git@github.com:PkSM3/garg.git
+3)  Explorer: 
+    cd /srv/gargantext_lib/js
+    git clone git@github.com:PkSM3/garg.git
 
 4)  Adapt all symlinks:
-ln -s [your folder for tree tagger] [the project folder]/parsing/Tagger/treetagger
-Warning: for ln, path has to be absolute!
+    ln -s [your folder for tree tagger] [the project folder]/parsing/Tagger/treetagger
+    Warning: for ln, path has to be absolute!
+
+5)  patch CTE:
+    patch /srv/gargantext_env/lib/python3.4/site-packages/cte_tree/models.py /srv/gargantext/init/cte_tree.models.diff
 
-5) patch CTE
-patch /srv/gargantext_env/lib/python3.4/site-packages/cte_tree/models.py /srv/gargantext/init/cte_tree.models.diff
+6)  init nodetypes and main variables
+    /srv/gargantext/manage.py shell < /srv/gargantext/init/init.py
 
-6) init nodetypes and main variables
-/srv/gargantext/manage.py shell < /srv/gargantext/init/init.py
+7)  DO NOT use the default aldjemy package:
+    cd /tmp
+    git clone https://github.com/mathieurodic/aldjemy
+    cd aldjemy
+    python3 setup.py install
 
 
-Extras:
+Extras
 ======
 
 Start the Python Notebook server

init/requirements.txt

@@ -6,7 +6,7 @@ Pillow==2.5.3
 Pygments==1.6
 SQLAlchemy==0.9.8
 South==1.0
-aldjemy==0.3.51
+# aldjemy==0.3.51
 amqp==1.4.6
 anyjson==0.3.3
 billiard==3.3.0.18