Cleanup staging, fix import for django 1.11

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 2794571af482a030f4ccea2074cc3edf46656b2d..bdda2bc9bc90dfa6aba89cb05f9c92c7de642d00 100755 (executable)
--- a/app/bin/app.sh
+++ b/app/bin/app.sh
@@ -19,16 +19,9 @@ gid='www-data'
 # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
 
 # Staging
-# pip install pandas xlwt
-# pip install -U https://forge.ircam.fr/p/django-eve/source/download/dev/
-# pip install https://forge.ircam.fr/p/django-prestashop/source/download/master/ --src /srv/lib
-# pip install -U https://github.com/stephenmcd/grappelli-safe/archive/dynamic_stacked.zip
-# pip install django-querysetsequence==0.6.1 django==1.9.11
-# pip install django-autocomplete-light django-querysetsequence
-# /usr/bin/yes | pip uninstall django-orderable
-# pip install bleach==1.5.0 django==1.9.11
-
-chown -R $uid:$gid $media
+# cd /srv/lib/mezzanine-organization
+# pip install -U -r requirements.txt
+# cd /srv/app
 
 # waiting for other services
 sh $app/bin/wait.sh

diff --git a/app/urls.py b/app/urls.py
index 5992a830d0d56522ae5391717de40118ed6c3c9a..29d3121f0522de6c45a78ea329fe20a1bc65ce37 100644 (file)
--- a/app/urls.py
+++ b/app/urls.py
@@ -25,7 +25,7 @@ from future.builtins import str
 
 import django.views.i18n
 from django.views.i18n import javascript_catalog
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.contrib.sitemaps.views import sitemap