Merge pull request #9 from ahmedaljazzar/jazzar/upgrade

Upgrade Django with some modifications

Author: iamjazzar

.circleci/config.yml

@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/django-mako
+    docker:
+      - image: circleci/python:3.6.7
+    steps:
+      - checkout
+      - run: sudo chown -R circleci:circleci /usr/local/bin
+      - run: sudo chown -R circleci:circleci /usr/local/lib/python3.6/site-packages
+      - run:
+          command: |
+            pip install -r requirements.txt
+      - run:
+          command: |
+            python manage.py test
+      - store_test_results:
+          path: test-results
+      - store_artifacts:
+          path: test-results
+          destination: tr1

README.md

@@ -82,4 +82,4 @@ in my blog post named [Integrating third-party templates' libraries with Django]
 
 ## License
 The MIT License (MIT)
-Copyright (c) 2018 Ahmed Jazzar <me@ahmedjazzar.com>
+Copyright (c) 2017-2019 Ahmed Jazzar <me@ahmedjazzar.com>

config/urls.py

@@ -1,25 +1,10 @@
-"""django-mako URL Configuration
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/1.11/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.conf.urls import url, include
-    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
-"""
-from django.conf.urls import url
+from django.urls import re_path
 
 from niceapp import views
 
 urlpatterns = [
-    url(r'^(?P<engine>django|mako)?$', views.function_based_view),
-    url(r'^class/(?P<engine>django|mako)?$',
-        views.ClassBasedView.as_view(),
-        name='CBV'),
+    re_path(r'^(?P<engine>django|mako)?$', views.function_based_view),
+    re_path(r'^class/(?P<engine>django|mako)?$',
+            views.ClassBasedView.as_view(),
+            name='CBV'),
 ]

niceapp/views.py

@@ -1,4 +1,4 @@
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, render
 from django.views.generic import TemplateView
 
 
@@ -19,9 +19,10 @@ def function_based_view(request, engine):
     else:
         template_name = 'django.html'
 
-    return render_to_response(
+    return render(
         template_name=template_name,
         context=context,
+        request=request,
         using=engine,
     )
 
@@ -38,7 +39,6 @@ def get_template_names(self):
     def get_context_data(self, **kwargs):
         context = super(ClassBasedView, self).get_context_data(**kwargs)
         engine = kwargs['engine']
-        print context
         context.update({
             'items': [
                 'Wow',

requirements.txt

@@ -1,2 +1,2 @@
-Django==1.11.3
+django==2.1.4
 Mako==1.0.7

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='djangomako',
-    version='1.1.1',
+    version='1.2.0',
     packages=['djangomako'],
     install_requires=['Mako==1.0.7'],
     classifiers=[