Use custom cartridge repo

diff --git a/app/migrations/shop/0009_product_content_model.py b/app/migrations/shop/0009_product_content_model.py
new file mode 100644 (file)
index 0000000..38b0521
--- /dev/null
+++ b/app/migrations/shop/0009_product_content_model.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2016-11-25 13:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shop', '0008_auto_20160907_1726'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='product',
+            name='content_model',
+            field=models.CharField(editable=False, max_length=50, null=True),
+        ),
+    ]

diff --git a/docker-compose.yml b/docker-compose.yml
index 09f1e1f762db29f8e91044fe11195d41232d7e0e..5d28f3a5455bc0a999afe10cd3c291f5b935a9ca 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,9 +47,10 @@ app:
     - ./data/var/log/uwsgi/:/var/log/uwsgi
     - ./lib/grappelli-safe/:/srv/lib/grappelli-safe
     - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda
-    # - ./lib/mezzanine/:/srv/lib/mezzanine
     - ./lib/django-eve/:/srv/lib/django-eve
     - ./lib/django-prestashop/:/srv/lib/django-prestashop
+    # - ./lib/mezzanine/:/srv/lib/mezzanine
+    # - ./lib/cartridge/:/srv/lib/cartridge
   volumes_from:
     - data
   expose:

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 22df85d33f34b385184b291c73b24e5ab3486eab..c15abab1f2e5941ae54adb0b680dd1157c115a19 100644 (file)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,3 +3,4 @@
 -e git+https://github.com/yomguy/grappelli-safe.git@dynamic_stacked#egg=grappelli-safe-0.4.2
 -e git+https://github.com/yomguy/django-eve.git@dev#egg=django-eve-1.0
 -e git+https://github.com/yomguy/django-prestashop.git@dev#egg=django-prestashop-1.0
+-e git+https://github.com/yomguy/cartridge.git#egg=cartridge-0.12-dev