From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 6 Jul 2017 16:41:20 +0000 (+0200)
Subject: iAdd grapelli as module
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e6ea32b287fefea74f035ab48d0a670c123fb123;p=mezzo.git

iAdd grapelli as module
---

diff --git a/.gitmodules b/.gitmodules
index ad5be2c1..136000fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,3 +17,8 @@
 [submodule "bin"]
 	path = bin
 	url = https://github.com/Ircam-Web/mezzo-bin.git
+[submodule "lib/grappelli-safe"]
+	path = lib/grappelli-safe
+	url = https://github.com/yomguy/grappelli-safe.git
+        branch = dynamic_stacked
+
diff --git a/app/requirements.txt b/app/requirements.txt
index 7efbc04b..2c2658cf 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -2,6 +2,3 @@ setuptools
 uwsgi
 mysqlclient
 psycopg2
-
--e git+https://github.com/yomguy/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
--e git+https://github.com/yomguy/cartridge.git#egg=cartridge-0.12-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 4646b16c..9c7ed5a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,8 +46,7 @@ app:
   command: /bin/sh bin/app.sh --runserver
   volumes:
     - ./app:/srv/app
-    - ./lib/:/srv/lib/
-    
+    - ./lib:/srv/lib
   volumes_from:
     - var
   expose:
diff --git a/lib/grappelli-safe b/lib/grappelli-safe
new file mode 160000
index 00000000..64188e41
--- /dev/null
+++ b/lib/grappelli-safe
@@ -0,0 +1 @@
+Subproject commit 64188e4182af7b348308dcc03849c21fa1a9542e