Merge 32efa60 into 9ab669f

.travis.yml

@@ -1,17 +1,20 @@
 language: python
 python:
-  - "3.4"
+  - "3.6.3"
 
 #Django & Database
 addons:
+  #Travis CI does not yet support Postgres 10.1
+  #See https://github.com/travis-ci/travis-ci/issues/8537
+  #postgresql: "10.1"
   postgresql: "9.4"
 
 sudo: false
 
 env:
-  -DJANGO=1.9 DB=mysql
-  -DJANGO=1.9 DB=sqlite3
-  -DJANGO=1.9 DB=postgresql
+  -DJANGO=1.10 DB=mysql
+  -DJANGO=1.10 DB=sqlite3
+  -DJANGO=1.10 DB=postgresql
 
 install:
   - pip install -r requirements.txt

README.rst

@@ -59,9 +59,11 @@ Installation
        'django_blog_it.django_blog_it',
        '..................'
     ]
-    
+
 3. Include the django_blog_it urls in your urls.py::
 
+    from django.conf.urls import include
+
     urlpatterns = [
         url(r'^admin/', admin.site.urls),
         url(r'', include('django_blog_it.urls')),
@@ -76,7 +78,7 @@ Installation
     DISQUSSHORTNAME="Your Disquss Short Name"
 
     export DISQUSSHORTNAME
-   
+
    # google api key for short url
 
     API_KEY="google api key"
@@ -92,33 +94,33 @@ Installation
     GOOGLE_CAPTCHA_SECRET_KEY="Secret key"
 
     export GOOGLE_CAPTCHA_SECRET_KEY
-   
+
    # Google Analytics Account
 
     GOOGLE_ANALYTICS_ID="UA-123456789"
 
     export GOOGLE_ANALYTICS_ID
 
    # Google Login
-   
+
     GP_CLIENT_ID="google client id"
-   
+
     export GP_CLIENT_ID
 
     GP_CLIENT_SECRET="secret key"
 
     export GP_CLIENT_SECRET
-   
-   # Facebook Login 
-   
+
+   # Facebook Login
+
     FB_APP_ID="facebook app id"
 
     export FB_APP_ID
 
     FB_SECRET="023df180c6d868e76a02aec17134c843"
 
     export FB_SECRET
-   
+
    # Default E-mail
 
     DEFAULT_EMAIL="noreply@djangoblogit.com"
@@ -137,7 +139,7 @@ Deploy To Heroku:
 .. image:: https://www.herokucdn.com/deploy/button.svg
    :target: https://heroku.com/deploy?template=https://github.com/MicroPyramid/django-blog-it
 
-Visit our Django web development page `Here`_   
+Visit our Django web development page `Here`_
 
 We welcome your feedback and support, raise github ticket if you want to report a bug. Need new features? `Contact us here`_
 

django_blog_it/posts/tests.py

@@ -26,21 +26,21 @@ def test_blog_get(self):
 
         response = self.client.get('/')
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'posts/index.html')
+        self.assertTemplateUsed(response, 'posts/new_index.html')
 
         response = self.client.get('/blog/'+str(self.blogppost.slug)+'/')
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'posts/blog_view.html')
+        self.assertTemplateUsed(response, 'posts/new_blog_view.html')
 
         response = self.client.get('/blog/category/'+str(self.category.slug)+'/')
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'posts/index.html')
+        self.assertTemplateUsed(response, 'posts/new_index.html')
 
         response = self.client.get('/blog/tags/'+str(self.tag.slug)+'/')
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'posts/index.html')
+        self.assertTemplateUsed(response, 'posts/new_index.html')
 
         response = self.client.get(
             '/blog/'+str(self.blogppost.updated_on.year)+'/'+str(self.blogppost.updated_on.month)+'/')
         self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'posts/index.html')
+        self.assertTemplateUsed(response, 'posts/new_index.html')

django_blog_it/test_settings.py

@@ -4,10 +4,6 @@
 
 SECRET_KEY = '_nc9_+ntllx!ptq5tzh96nn^$a#81#auhrdw#8t#+n0#4ig(lz'
 
-TEMPLATE_LOADERS = (
-    'django.template.loaders.app_directories.Loader',
-)
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -57,8 +53,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-        ],
+        'DIRS': [],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -69,13 +64,12 @@
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
-                'django.core.context_processors.request',
+                'django.template.context_processors.request',
             ],
         },
-
     },
 ]
 DEBUG = True
 EMAIL_PORT    = 1025
 EMAIL_HOST    = '127.0.0.1'
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'

sandbox/requirements.txt

@@ -1,12 +1,11 @@
 boto==2.40.0
-Django==1.9.6
-django-blog-it==0.1
+Django==1.11.1
 django-simple-pagination==1.1.4
 django-storages==1.4.1
-Pillow==3.2.0
+Pillow==4.3.0
 requests==2.10.0
 gunicorn==19.6.0
 whitenoise==3.1
 dj-database-url==0.4.1
-psycopg2==2.6.1
-microurl==0.1
+psycopg2==2.7.1
+microurl==0.1.1