# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1428007974 -7200
# Node ID 4bb38d03e430edb7e267adbb7fd6a3864fe52989
# Parent  90424cb55cfe0aa1461fea9a396df7fb1caafbb2
upgrade django to 1.8

diff -r 90424cb55cfe -r 4bb38d03e430 src/hdalab/settings.py
--- a/src/hdalab/settings.py	Thu Apr 02 03:23:59 2015 +0200
+++ b/src/hdalab/settings.py	Thu Apr 02 22:52:54 2015 +0200
@@ -2,7 +2,6 @@
 # Django settings for hdalab project.
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
@@ -98,14 +97,35 @@
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'u!@fo&-)d-hqz7==jmc2*_^__wod8$k^lb7^)y@ihbok)gn4fe'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    ('django.template.loaders.cached.Loader', (
-        'django.template.loaders.filesystem.Loader',
-        'django.template.loaders.app_directories.Loader',
-    )),
-    #     'django.template.loaders.eggs.Loader',
-)
+
+#template settings
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+        ],
+        'OPTIONS': {
+            'context_processors': [
+               'django.contrib.auth.context_processors.auth',
+               'django.template.context_processors.debug',
+               'django.template.context_processors.i18n',
+               'django.template.context_processors.media',
+               'django.template.context_processors.static',
+               'django.template.context_processors.tz',
+               'django.contrib.messages.context_processors.messages',
+               'hdalab.context_processors.version',
+            ],
+            'loaders': [
+                ('django.template.loaders.cached.Loader', (
+                    'django.template.loaders.filesystem.Loader',
+                    'django.template.loaders.app_directories.Loader',
+                )),
+            ],
+            'debug': DEBUG,
+        },
+     },
+]
+
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -116,26 +136,9 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-# List of processors used by RequestContext to populate the context.
-# Each one should be a callable that takes the request object as its
-# only parameter and returns a dictionary to add to the context.
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-    'django.contrib.messages.context_processors.messages',
-    'hdalab.context_processors.version',
-)
 
 ROOT_URLCONF = 'hdalab.urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
 
 INSTALLED_APPS = (
     'hdalab',
diff -r 90424cb55cfe -r 4bb38d03e430 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu Apr 02 03:23:59 2015 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Apr 02 22:52:54 2015 +0200
@@ -17,7 +17,7 @@
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
     'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.7.6/tarball/', 'local':"Django-1.7.6.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.8/tarball/', 'local':"Django-1.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.5.1.tar.gz', 'local':"django-extensions-1.5.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/v1.1.tar.gz', 'local':"django-registration-1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'HTTPLIB2': { 'setup': 'httplib2', 'url':'https://github.com/jcgregorio/httplib2/archive/v0.9.tar.gz', 'local':"httplib2-0.7.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
@@ -25,7 +25,7 @@
     'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.14.tar.gz#md5=4cdd0549ef4699bd67b96264d3b21427', 'local':'ssh-1.7.14.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.2', 'local':'fabric-1.4.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.3.tar.gz', 'local':'mercurial-2.2.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-    'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/django-haystack/django-haystack/archive/v2.3.1.tar.gz', 'local': 'django-haystack-2.3.1.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+    'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/django-haystack/django-haystack/archive/v2.4.0.tar.gz', 'local': 'django-haystack-2.4.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'WHOOSH': {'setup': 'whoosh', 'url':'https://pypi.python.org/packages/source/W/Whoosh/Whoosh-2.6.0.zip', 'local':'Whoosh-2.6.0.zip', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'WIKITOOLS' : { 'setup': 'wikitools', 'url': 'https://github.com/alexz-enwp/wikitools/archive/1.2.tar.gz', 'local': 'wikitools-1.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'ISODATE' : {'setup': 'isodate', 'url': 'http://pypi.python.org/packages/source/i/isodate/isodate-0.5.1.tar.gz', 'local': 'isodate-0.5.1.tar.gz', 'install' : {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
diff -r 90424cb55cfe -r 4bb38d03e430 virtualenv/res/src/Django-1.7.6.tar.gz
Binary file virtualenv/res/src/Django-1.7.6.tar.gz has changed
diff -r 90424cb55cfe -r 4bb38d03e430 virtualenv/res/src/Django-1.8.tar.gz
Binary file virtualenv/res/src/Django-1.8.tar.gz has changed
diff -r 90424cb55cfe -r 4bb38d03e430 virtualenv/res/src/django-haystack-2.3.1.tar.gz
Binary file virtualenv/res/src/django-haystack-2.3.1.tar.gz has changed
diff -r 90424cb55cfe -r 4bb38d03e430 virtualenv/res/src/django-haystack-2.4.0.tar.gz
Binary file virtualenv/res/src/django-haystack-2.4.0.tar.gz has changed
diff -r 90424cb55cfe -r 4bb38d03e430 virtualenv/web/res/requirements.txt
--- a/virtualenv/web/res/requirements.txt	Thu Apr 02 03:23:59 2015 +0200
+++ b/virtualenv/web/res/requirements.txt	Thu Apr 02 22:52:54 2015 +0200
@@ -1,7 +1,7 @@
 #-e git+git://github.com/IRI-Research/rdflib.git@96c30f98bbb628e13aaa32c9c392584b0fbf8788#egg=rdflib
 #STATIC_DEPS=true LIBXML2_VERSION=2.9.2 LIBXSLT_VERSION=1.1.28 LIBICONV_VERSION=1.14 pip install --no-index -r requirements.txt
 -f ../../res/src
-Django==1.7.6
+Django==1.8
 Pillow==2.7.0
 PyYAML==3.11
 SPARQLWrapper==1.6.4
@@ -18,7 +18,7 @@
 django-celery-email==1.1.0
 django-envelope==1.0
 django-extensions==1.5.1
-django-haystack==2.3.1
+django-haystack==2.4.0
 django-honeypot==0.4.0
 django-registration==1.1
 easy-thumbnails==2.2