Fix MySQL package

Bump version to 1.15.2
Fix bug in date/time question stats (#916 )
2018-05-28 10:12:47 +02:00 · 2018-05-28 10:06:18 +02:00 · 2018-05-28 10:05:30 +02:00 · 2018-05-28 09:59:59 +02:00 · 2018-05-28 09:59:59 +02:00 · 2018-05-28 09:59:59 +02:00
5 changed files with 8 additions and 8 deletions
--- a/2
+++ b/2
@@ -3,7 +3,7 @@ FROM python:3.6
 RUN apt-get update && \
    apt-get install -y git libxml2-dev libxslt1-dev python-dev python-virtualenv locales \
      libffi-dev build-essential python3-dev zlib1g-dev libssl-dev gettext libpq-dev \
-      libmysqlclient-dev libmemcached-dev libjpeg-dev supervisor nginx sudo \
+      default-libmysqlclient-dev libmemcached-dev libjpeg-dev supervisor nginx sudo \
 	  --no-install-recommends && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists/* && \
--- a/src/pretix/init.py
+++ b/src/pretix/init.py
@@ -1 +1 @@
-__version__ = "1.15.1"
+__version__ = "1.15.2"
--- a/src/pretix/control/views/item.py
+++ b/src/pretix/control/views/item.py
@@ -428,11 +428,11 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
                del a['options__answer']
        elif self.object.type in (Question.TYPE_TIME, Question.TYPE_DATE, Question.TYPE_DATETIME):
            qs = qs.order_by('answer')
-            qs_model = qs
-            qs = qs.values('answer').annotate(count=Count('id')).order_by('-count')
-            for a, a_model in zip(qs, qs_model):
+            model_cache = {a.answer: a for a in qs}
+            qs = qs.values('answer').annotate(count=Count('id')).order_by('answer')
+            for a in qs:
                a['alink'] = a['answer']
-                a['answer'] = str(a_model)
+                a['answer'] = str(model_cache[a['answer']])
        else:
            qs = qs.order_by('answer').values('answer').annotate(count=Count('id')).order_by('-count')

--- a/src/requirements/production.txt
+++ b/src/requirements/production.txt
@@ -17,7 +17,7 @@ django-otp==0.3.*
 python-u2flib-server==4.*
 django-formtools==2.0
 celery==4.1.*
-kombu==4.1.*
+kombu==4.2.*
 django-statici18n==1.3.*
 inlinestyler==0.2.*
 BeautifulSoup4
--- a/src/setup.py
+++ b/src/setup.py
@@ -82,7 +82,7 @@ setup(
        'python-u2flib-server==4.*',
        'django-formtools==2.0',
        'celery==4.1.*',
-        'kombu==4.1.*',
+        'kombu==4.2.*',
        'django-statici18n==1.3.*',
        'inlinestyler==0.2.*',
        'BeautifulSoup4',
Author	SHA1	Message	Date
Raphael Michel	8e20b07610	Fix MySQL package	2018-05-28 10:12:47 +02:00
Raphael Michel	ffeb1e1746	Bump version to 1.15.2	2018-05-28 10:06:18 +02:00
Felix Rindt	4692b3e9d2	Fix bug in date/time question stats (#916 ) Fix bug in date/time question stats	2018-05-28 10:05:30 +02:00
Raphael Michel	98ea9ae91c	Fix setup.py	2018-05-28 09:59:59 +02:00
Raphael Michel	40f401b549	Upgrade kombu	2018-05-28 09:59:59 +02:00
Raphael Michel	37e279bf27	Pin celery version	2018-05-28 09:59:59 +02:00