Merge pull request #81 from agiliq/django-1.9

upgraded to django 1.10
agiliq · May 26, 2017 · 9b223bc · 9b223bc
2 parents 3e30e72 + 2fb1b88
commit 9b223bc
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,11 @@ python:
 
 env:
   - DJANGO='Django>=1.8,<1.9'
-  - DJANGO='Django>=1.9,<1.10'
+  - DJANGO='Django>=1.10,<1.11'
 
 install:
-  - pip install --use-mirrors $DJANGO
-  - pip install --use-mirrors coverage coveralls
+  - pip install $DJANGO
+  - pip install coverage coveralls
 
 script: coverage run setup.py test
 

diff --git a/example/core/templates/home.html b/example/core/templates/home.html
@@ -1,11 +1,13 @@
+{% load static %}
+
 <!DOCTYPE html>
 <html lang='en'>
     <head>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
         <script>document.cookie='resolution='+Math.max(window.outerWidth, 0)+'; path=/';</script>
-        <link href="{{ STATIC_URL }}core/css/bootstrap_2.3.2.css" rel="stylesheet" type='text/css'>
-        <link href="{{ STATIC_URL }}core/css/bootstrap-responsive_2.3.2.css" rel="stylesheet" type='text/css'>
+        <link href="{% static 'core/css/bootstrap_2.3.2.css' %}" rel="stylesheet" type='text/css'>
+        <link href="{% static 'core/css/bootstrap-responsive_2.3.2.css' %}" rel="stylesheet" type='text/css'>
         <style type='text/css'>
 
             .row .hero-unit  {
@@ -27,8 +29,8 @@
             */
         </style>
         <script src="http://code.jquery.com/jquery-1.10.1.min.js" ></script>
-        <script src="{{ STATIC_URL }}parsley/js/parsley.js" ></script>
-        <script type='text/javascript' src='{{ STATIC_URL }}core/js/bootstrap-tab.min.js'></script>
+        <script src="{% static 'parsley/js/parsley.js' %}" ></script>
+        <script type='text/javascript' src='{% static "core/js/bootstrap-tab.min.js" %}'></script>
         {{ form.media }}
 
     </head>
@@ -63,7 +65,7 @@ <h1><small>Its time to </small>Play !</h1>
                             <p>Try submitting this form without entering anything. </p>
                     </div>
                     <h1>Form</h1>
-                    <form parsley-validate action='' method='post'>
+                    <form data-parsley-validate action='' method='post'>
                         {% csrf_token %}
                         {{ form.as_p }}
                         <input type='submit' value='Submit' class='btn btn-primary btn-large' />

diff --git a/example/example/settings/common.py b/example/example/settings/common.py
@@ -104,11 +104,25 @@
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'example.wsgi.application'
 
-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.
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_PATH, 'templates'),
+        ],        
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+
 
 INSTALLED_APPS = (
     'django.contrib.auth',

diff --git a/example/example/urls.py b/example/example/urls.py
@@ -1,12 +1,12 @@
 from django.contrib import admin
-from django.conf.urls import patterns, url, include
+from django.conf.urls import include, url
 
 from core.views import HomeView
 
 admin.autodiscover()
 
 
-urlpatterns = patterns('core.views',
+urlpatterns =[
     url(r'^admin/', include(admin.site.urls)),
     url(r'^$', HomeView.as_view(), name='home'),
-)
+]
diff --git a/example/requirements.txt b/example/requirements.txt
@@ -1,2 +1,2 @@
-Django==1.5.2
+Django==1.10
 gunicorn