Upgrade Libraries

.gitignore

@@ -51,6 +51,7 @@ docs/_build/
 
 #virtual env
 venv
+env
 
 /static
 .vagrant

bank_import/urls.py

@@ -1,9 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', views.forms),
     url(r'^generate-mapping$', views.generate),
     url(r'^submit-mapping$', views.submit),
-)
+]

main/urls.py

@@ -1,9 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from . import views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', views.tenants, name="tenants"),
     url(r'^tenant-cashflows/(?P<tenant_id>\d+)/$',
         views.tenant_cashflows, name="tenant_cashflows"),
-)
+]

proprio/settings.py

@@ -23,8 +23,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
-
 # hack from http://stackoverflow.com/a/7651002/436792
 TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'
 
@@ -33,7 +31,7 @@
 
 # Application definition
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'main',
     'bank_import',
     'django.contrib.admin',
@@ -44,28 +42,40 @@
     'django.contrib.staticfiles',
     'lineage',  # https://github.com/marcuswhybrow/django-lineage
     'bootstrapform',  # https://github.com/tzangms/django-bootstrap-form
-)
+]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE_CLASSES = [
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
+]
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates'),
+        ],
+        'APP_DIRS': True,
+        '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',
+            'django.template.context_processors.request',  # for django-lineage
+            ],
+        },
+    },
+]
 
-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.core.context_processors.tz",
-    "django.contrib.messages.context_processors.messages",
-    'django.core.context_processors.request',  # for django-lineage
-)
 ROOT_URLCONF = 'proprio.urls'
 
 # Database

proprio/urls.py

@@ -1,19 +1,20 @@
 from django.conf import settings
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
+from django.contrib.auth import views as auth_views
 from django.views.generic import RedirectView
-from django.contrib.auth.views import logout
+from proprio import views
 import re
 
 admin.autodiscover()
 
 media_regex = r'^%s(?P<path>.*)$' % re.escape(settings.MEDIA_URL.lstrip('/'))
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', RedirectView.as_view(url='main/', permanent=True)),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^main/', include('main.urls')),
     url(r'^import/', include('bank_import.urls')),
-    url(r'^accounts/login/$', 'django.contrib.auth.views.login'),
-    url(r'^accounts/logout/$', lambda request: logout(request, '/')),
-    url(media_regex, 'proprio.views.serve_static'),
-)
+    url(r'^accounts/login/$', auth_views.login),
+    url(r'^accounts/logout/$', lambda request: auth_views.logout(request, '/')),
+    url(media_regex, views.serve_static, name='static files'),
+]

requirements.txt

@@ -1,7 +1,10 @@
-Django==1.8.7
-Whoosh==2.7
+Django==1.11.6
+Whoosh==2.7.4
+Pillow==4.3.0
+gunicorn==19.7.1
+openpyxl==2.4.8
 dj-static==0.0.6
-django-bootstrap-form==3.2
+django-bootstrap-form==3.3
 django-lineage==0.2.0
-gunicorn==19.4.1
-openpyxl==2.3.1
+django-imagekit==4.0.1
+django-nested-inline==0.3.7