bump django requirement to 1.7 (#6221)

combo/settings.py

@@ -30,7 +30,7 @@ from django.conf.global_settings import *
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'r^(w+o4*txe1=t+0w*w3*9%idij!yeq1#axpsi4%5*u#3u&)1t'
@@ -83,7 +83,7 @@ WSGI_APPLICATION = 'combo.wsgi.application'
 
 
 # Database
-# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -93,7 +93,7 @@ DATABASES = {
 }
 
 # Internationalization
-# https://docs.djangoproject.com/en/1.6/topics/i18n/
+# https://docs.djangoproject.com/en/1.7/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -107,7 +107,7 @@ USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.6/howto/static-files/
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
 
 STATIC_URL = '/static/'
 

requirements.txt

@@ -1,4 +1,4 @@
-Django==1.6
+Django==1.7
 django-ckeditor
 -e git+http://repos.entrouvert.org/gadjo.git/#egg=gadjo
 django-cmsplugin-blurp

setup.py

@@ -57,7 +57,7 @@ setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
     ],
-    install_requires=['django == 1.6',
+    install_requires=['django == 1.7',
         'django-ckeditor',
         'gadjo',
         'django-cmsplugin-blurp',