iAdd grapelli as module

diff --git a/.gitmodules b/.gitmodules
index ad5be2c1c3d7eb3be20216b9992118e12e258b24..136000fedebe14257165278f5cf21212a3139cc3 100644 (file)
--- 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 7efbc04b40ea9499b3fd0d3d844ce51dd064a85e..2c2658cf22b246bf8f170f6a70f6d8e8c7086492 100644 (file)
--- 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 4646b16c58aae6d6c5a0f0b1597e2e5f7f01516b..9c7ed5a439bc96f787133398ed287ca4e9ddcca5 100644 (file)
--- 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 (submodule)
index 0000000..64188e4
--- /dev/null
+++ b/lib/grappelli-safe
@@ -0,0 +1 @@
+Subproject commit 64188e4182af7b348308dcc03849c21fa1a9542e