From 330fa0479d061adef0b49eb9048f626b8baea70b Mon Sep 17 00:00:00 2001 From: JB Date: Thu, 12 Oct 2017 15:11:43 -0700 Subject: [PATCH 1/5] Add env to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6228dff..03912de 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,7 @@ docs/_build/ #virtual env venv +env /static .vagrant From e4afd02a33ce48914ffb8e13db14ee4262da80e3 Mon Sep 17 00:00:00 2001 From: JB Date: Fri, 13 Oct 2017 12:15:59 -0700 Subject: [PATCH 2/5] Update libraries for 2017 and Django to 1.9.13 --- bank_import/urls.py | 7 +++---- main/urls.py | 7 +++---- proprio/settings.py | 42 ++++++++++++++++++++++++++---------------- proprio/urls.py | 15 ++++++++------- requirements.txt | 10 +++++----- 5 files changed, 45 insertions(+), 36 deletions(-) diff --git a/bank_import/urls.py b/bank_import/urls.py index 1f11d63..879d1bd 100644 --- a/bank_import/urls.py +++ b/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), -) +] diff --git a/main/urls.py b/main/urls.py index a8c202a..9a2eacb 100644 --- a/main/urls.py +++ b/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\d+)/$', views.tenant_cashflows, name="tenant_cashflows"), -) +] diff --git a/proprio/settings.py b/proprio/settings.py index 4e8184f..2b11fb5 100644 --- a/proprio/settings.py +++ b/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,9 +42,9 @@ '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', @@ -54,18 +52,30 @@ '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.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 + ], + }, + }, +] -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 diff --git a/proprio/urls.py b/proprio/urls.py index 7355e7d..df8160b 100644 --- a/proprio/urls.py +++ b/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.*)$' % 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'), +] diff --git a/requirements.txt b/requirements.txt index b0da523..ccdcf0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -Django==1.8.7 -Whoosh==2.7 +Django==1.9.13 +Whoosh==2.7.4 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 +gunicorn==19.7.1 +openpyxl==2.4.8 From 07251c598faad02012a1a02557c3611b113b21a7 Mon Sep 17 00:00:00 2001 From: JB Date: Fri, 13 Oct 2017 15:44:26 -0700 Subject: [PATCH 3/5] Update to Django 1.10.8 --- proprio/settings.py | 16 ++++++++-------- requirements.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/proprio/settings.py b/proprio/settings.py index 2b11fb5..c4135c7 100644 --- a/proprio/settings.py +++ b/proprio/settings.py @@ -63,14 +63,14 @@ 'APP_DIRS': True, 'OPTIONS': { '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 + '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 ], }, }, diff --git a/requirements.txt b/requirements.txt index ccdcf0d..e3fdc41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.9.13 +Django==1.10.8 Whoosh==2.7.4 dj-static==0.0.6 django-bootstrap-form==3.3 From 6afc70984e33707ca734d2e5128d929c9d1e0b0d Mon Sep 17 00:00:00 2001 From: JB Date: Fri, 13 Oct 2017 15:50:23 -0700 Subject: [PATCH 4/5] Update to Django 1.11.6 ( LTS ) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e3fdc41..e47fa89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.10.8 +Django==1.11.6 Whoosh==2.7.4 dj-static==0.0.6 django-bootstrap-form==3.3 From fb0acc60ab50c49570f070344940f21d727b8b09 Mon Sep 17 00:00:00 2001 From: JB Date: Tue, 24 Oct 2017 10:36:27 -0700 Subject: [PATCH 5/5] Adding missing libraries to requirments --- requirements.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e47fa89..9f6bb3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,10 @@ 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.3 django-lineage==0.2.0 -gunicorn==19.7.1 -openpyxl==2.4.8 +django-imagekit==4.0.1 +django-nested-inline==0.3.7