Skip to content

Commit 8626b12

Browse files
committed
Update to Django 1.8
1 parent 5cfb0ae commit 8626b12

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ sudo: false
33
python:
44
- '2.7'
55
- '3.4'
6+
- '3.5'
67
addons:
78
postgresql: "9.3"
89

@@ -11,7 +12,8 @@ cache:
1112
- $HOME/.pip-cache/
1213

1314
install:
14-
- pip install -r requirements-dev.txt --allow-all-external --download-cache $HOME/.pip-cache
15+
- pip install pip==8.1.2
16+
- pip install -r requirements-dev.txt --allow-all-external
1517
- pip install coveralls
1618

1719
env:

junction/feedback/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def get_choice_feedback_questions(conference_id):
5656
schedule item type.
5757
"""
5858
qs = ChoiceFeedbackQuestion.objects.filter(
59-
conference_id=conference_id).select_related('allowed_values')
59+
conference_id=conference_id).prefetch_related('allowed_values')
6060
return _get_question_oragnized_by_type(qs)
6161

6262

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django==1.7.9
1+
Django==1.8.14
22
celery==3.1.18
33
djangorestframework==3.1.3
44
django-filter==0.10.0

0 commit comments

Comments
 (0)