Merge branch 'master' into feature/menus

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.6.5-alpine3.7
 ENV PYTHONUNBUFFERED 1
 
 RUN apk update && apk upgrade && \

base/requirements.txt

@@ -12,7 +12,7 @@ coreapi-cli==1.0.6
 gunicorn==19.6.0
 requests==2.11.1
 six==1.10.0
-Pillow==2.7.0
+Pillow==5.1.0
 mysqlclient==1.3.12
 mock==2.0.0
 pytz==2016.10

v1/ingredient/migrations/0011_auto_20180415_2352.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.1 on 2018-04-15 23:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ingredient', '0010_auto_20180330_1058'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ingredient',
+            name='numerator',
+            field=models.FloatField(default=0, verbose_name='numerator'),
+        ),
+    ]

v1/ingredient/models.py

@@ -41,7 +41,7 @@ class Ingredient(models.Model):
     # It should be removed in future versions.
     title = models.CharField(_('title'), max_length=250)
     quantity = models.FloatField(_('quantity'), default=0)
-    numerator = models.FloatField(_('numerator'), default=1)
+    numerator = models.FloatField(_('numerator'), default=0)
     denominator = models.FloatField(_('denominator'), default=1)
     measurement = models.CharField(_('measurement'), max_length=200, blank=True, null=True)
     ingredient_group = models.ForeignKey(IngredientGroup, on_delete=models.CASCADE, related_name='ingredients', null=True)