From d0806f9b07236d8b9d59380af596d26fd960f902 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 00:59:16 -0700 Subject: [PATCH 01/19] changed base.txt --- .../requirements/base.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ac9ba3acf..a0d70ee08 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -50,17 +50,17 @@ pytz==2016.6.1 django-redis==4.4.4 redis>=2.10.0 -{% if cookiecutter.use_celery == "y" %} +{%- if cookiecutter.use_celery == "y" -%} celery==3.1.23 -{% endif %} - -{% if cookiecutter.use_compressor == "y" %} -django_compressor==2.0 -{% endif %} - -{% if cookiecutter.js_task_runner == 'Webpack' -%} -# Webpack -django-webpack-loader==0.3.3 {%- endif %} +{%- if cookiecutter.use_compressor == "y" -%} +django_compressor==2.0 +{%- endif %} + +{%- if cookiecutter.js_task_runner == 'Webpack' -%} +# Webpack +django-webpack-loader==0.3.3 +{%- endif -%} + # Your custom requirements go here From 22bb55d30cceee8d3c0ceab11d9daa8aceb7cf43 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:06:22 -0700 Subject: [PATCH 02/19] second edit base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index a0d70ee08..dc1359cb9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,10 +11,9 @@ django==1.9.8 # Configuration django-environ==0.4.0 -{% if cookiecutter.use_whitenoise == 'y' -%} +{%- if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 -{%- endif %} - +{%- endif -%} # Forms django-braces==1.9.0 @@ -31,7 +30,7 @@ Pillow==3.3.0 # Well-built with regular release cycles! django-allauth==0.26.1 -{% if cookiecutter.windows == 'y' -%} +{%- if cookiecutter.windows == 'y' -%} # On Windows, you must download/install psycopg2 manually # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg {% else %} From 8a164278e9a774e10d2896002d620db05b6bf206 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:12:27 -0700 Subject: [PATCH 03/19] third try on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index dc1359cb9..a79580e87 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -13,7 +13,7 @@ django==1.9.8 django-environ==0.4.0 {%- if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 -{%- endif -%} +{%- endif %} # Forms django-braces==1.9.0 @@ -30,10 +30,10 @@ Pillow==3.3.0 # Well-built with regular release cycles! django-allauth==0.26.1 -{%- if cookiecutter.windows == 'y' -%} +{% if cookiecutter.windows == 'y' -%} # On Windows, you must download/install psycopg2 manually # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg -{% else %} +{% else -%} # Python-PostgreSQL Database Adapter psycopg2==2.6.2 {%- endif %} @@ -49,17 +49,17 @@ pytz==2016.6.1 django-redis==4.4.4 redis>=2.10.0 -{%- if cookiecutter.use_celery == "y" -%} +{% if cookiecutter.use_celery == "y" -%} celery==3.1.23 {%- endif %} -{%- if cookiecutter.use_compressor == "y" -%} +{% if cookiecutter.use_compressor == "y" -%} django_compressor==2.0 {%- endif %} {%- if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack django-webpack-loader==0.3.3 -{%- endif -%} +{%- endif %} # Your custom requirements go here From 0cd1d2c0e7e47845b4ae70071cb25e983c651df6 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:15:35 -0700 Subject: [PATCH 04/19] changed jinja for use_pythn2 == n --- {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index a79580e87..9e729ec2d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -4,7 +4,7 @@ # See http://bitly.com/wheel-building-fails-CPython-35 # Verified bug on Python 3.5.1 wheel==0.29.0 -{%- endif %} +{%- endif -%} # Bleeding edge Django django==1.9.8 @@ -49,11 +49,11 @@ pytz==2016.6.1 django-redis==4.4.4 redis>=2.10.0 -{% if cookiecutter.use_celery == "y" -%} +{%- if cookiecutter.use_celery == "y" -%} celery==3.1.23 {%- endif %} -{% if cookiecutter.use_compressor == "y" -%} +{%- if cookiecutter.use_compressor == "y" -%} django_compressor==2.0 {%- endif %} From c8b85b114f36e2061ba677e3f4220bbd9cd6afe4 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:18:36 -0700 Subject: [PATCH 05/19] fixed redis support for base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9e729ec2d..bc0c5db8f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ django==1.9.8 # Configuration django-environ==0.4.0 -{%- if cookiecutter.use_whitenoise == 'y' -%} +{% if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 {%- endif %} @@ -49,15 +49,15 @@ pytz==2016.6.1 django-redis==4.4.4 redis>=2.10.0 -{%- if cookiecutter.use_celery == "y" -%} +{%- if cookiecutter.use_celery == "y" %} celery==3.1.23 {%- endif %} -{%- if cookiecutter.use_compressor == "y" -%} +{%- if cookiecutter.use_compressor == "y" %} django_compressor==2.0 {%- endif %} -{%- if cookiecutter.js_task_runner == 'Webpack' -%} +{%- if cookiecutter.js_task_runner == 'Webpack' %} # Webpack django-webpack-loader==0.3.3 {%- endif %} From 19e5563feeaa21385c46303293740ee33acd4f3a Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:26:51 -0700 Subject: [PATCH 06/19] fixed webpack jinja on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index bc0c5db8f..7341053d7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -57,7 +57,7 @@ celery==3.1.23 django_compressor==2.0 {%- endif %} -{%- if cookiecutter.js_task_runner == 'Webpack' %} +{% if cookiecutter.js_task_runner == 'Webpack' %} # Webpack django-webpack-loader==0.3.3 {%- endif %} From f6dc75549b4bbcd9f3a73ba40cda27238db0d596 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:31:50 -0700 Subject: [PATCH 07/19] fixed webpack template on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 7341053d7..f37d1ecb3 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -57,7 +57,7 @@ celery==3.1.23 django_compressor==2.0 {%- endif %} -{% if cookiecutter.js_task_runner == 'Webpack' %} +{% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack django-webpack-loader==0.3.3 {%- endif %} From 200d6d0b86ae3e0dde2c5984ac089823d0e1b52b Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:34:59 -0700 Subject: [PATCH 08/19] fixed whitenoise template on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index f37d1ecb3..32a8c22fd 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -13,7 +13,7 @@ django==1.9.8 django-environ==0.4.0 {% if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 -{%- endif %} +{%- endif -%} # Forms django-braces==1.9.0 From 66ad1593a96bbfde643bbb465e402d2fbf91e009 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:38:25 -0700 Subject: [PATCH 09/19] fixed base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 32a8c22fd..926af43d9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,9 +11,9 @@ django==1.9.8 # Configuration django-environ==0.4.0 -{% if cookiecutter.use_whitenoise == 'y' -%} +{%- if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 -{%- endif -%} +{%- endif %} # Forms django-braces==1.9.0 @@ -60,6 +60,6 @@ django_compressor==2.0 {% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack django-webpack-loader==0.3.3 -{%- endif %} +{%- endif -%} # Your custom requirements go here From 44406593bbc575436017ff415f8592c4323c695f Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:41:01 -0700 Subject: [PATCH 10/19] fixed jinja again --- {{cookiecutter.project_slug}}/requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 926af43d9..292fb1963 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,9 +11,9 @@ django==1.9.8 # Configuration django-environ==0.4.0 -{%- if cookiecutter.use_whitenoise == 'y' -%} +{% if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 -{%- endif %} +{%- endif -%} # Forms django-braces==1.9.0 From 41b2906a5a900729824dad1e50ba014933e120f1 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:43:17 -0700 Subject: [PATCH 11/19] fixed webpack on base.html --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 292fb1963..32a8c22fd 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -60,6 +60,6 @@ django_compressor==2.0 {% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack django-webpack-loader==0.3.3 -{%- endif -%} +{%- endif %} # Your custom requirements go here From aebfbde089a8769c8be56085381766254bfb35e7 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:45:37 -0700 Subject: [PATCH 12/19] got rid of extra - for webpack in base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 32a8c22fd..69764d0c1 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -57,7 +57,7 @@ celery==3.1.23 django_compressor==2.0 {%- endif %} -{% if cookiecutter.js_task_runner == 'Webpack' -%} +{%- if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack django-webpack-loader==0.3.3 {%- endif %} From 65f0d781c379cde3dbd9fd8d1a9c999fe26ba2ba Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:49:19 -0700 Subject: [PATCH 13/19] fixed webpack template on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 69764d0c1..2825a2042 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -55,9 +55,9 @@ celery==3.1.23 {%- if cookiecutter.use_compressor == "y" %} django_compressor==2.0 -{%- endif %} +{%- endif -%} -{%- if cookiecutter.js_task_runner == 'Webpack' -%} +{% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack django-webpack-loader==0.3.3 {%- endif %} From e06669aa54096854ebdf243de94838c4e61f0d6a Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:52:14 -0700 Subject: [PATCH 14/19] fixed webpack on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 2825a2042..32a8c22fd 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -55,7 +55,7 @@ celery==3.1.23 {%- if cookiecutter.use_compressor == "y" %} django_compressor==2.0 -{%- endif -%} +{%- endif %} {% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack From 6ae8f4e197543ef2694c58dc2ad4b0845d223952 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:56:44 -0700 Subject: [PATCH 15/19] changed base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 32a8c22fd..91aa367bc 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -51,11 +51,11 @@ redis>=2.10.0 {%- if cookiecutter.use_celery == "y" %} celery==3.1.23 -{%- endif %} +{%- endif -%} {%- if cookiecutter.use_compressor == "y" %} django_compressor==2.0 -{%- endif %} +{%- endif -%} {% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack From 140b53c8da10427ec9dcb838c2fb388bb8532a84 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 01:59:30 -0700 Subject: [PATCH 16/19] got rid of spaces between celery and compressor on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 91aa367bc..4cbf506ad 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -48,14 +48,12 @@ pytz==2016.6.1 # Redis support django-redis==4.4.4 redis>=2.10.0 - -{%- if cookiecutter.use_celery == "y" %} +{% if cookiecutter.use_celery == "y" %} celery==3.1.23 -{%- endif -%} - -{%- if cookiecutter.use_compressor == "y" %} +{%- endif %} +{% if cookiecutter.use_compressor == "y" %} django_compressor==2.0 -{%- endif -%} +{%- endif %} {% if cookiecutter.js_task_runner == 'Webpack' -%} # Webpack From 5999f33a53d1789ab9cc80d970f7668c31e98263 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 02:01:41 -0700 Subject: [PATCH 17/19] fixed spaces on base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 4cbf506ad..01522023d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -48,10 +48,10 @@ pytz==2016.6.1 # Redis support django-redis==4.4.4 redis>=2.10.0 -{% if cookiecutter.use_celery == "y" %} +{% if cookiecutter.use_celery == "y" -%} celery==3.1.23 {%- endif %} -{% if cookiecutter.use_compressor == "y" %} +{% if cookiecutter.use_compressor == "y" -%} django_compressor==2.0 {%- endif %} From b451894a17d30ac56d033ab3986fd190f6daec8f Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 02:05:05 -0700 Subject: [PATCH 18/19] fixed base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 01522023d..bc0c5db8f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -13,7 +13,7 @@ django==1.9.8 django-environ==0.4.0 {% if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2 -{%- endif -%} +{%- endif %} # Forms django-braces==1.9.0 @@ -48,14 +48,16 @@ pytz==2016.6.1 # Redis support django-redis==4.4.4 redis>=2.10.0 -{% if cookiecutter.use_celery == "y" -%} + +{%- if cookiecutter.use_celery == "y" %} celery==3.1.23 {%- endif %} -{% if cookiecutter.use_compressor == "y" -%} + +{%- if cookiecutter.use_compressor == "y" %} django_compressor==2.0 {%- endif %} -{% if cookiecutter.js_task_runner == 'Webpack' -%} +{%- if cookiecutter.js_task_runner == 'Webpack' %} # Webpack django-webpack-loader==0.3.3 {%- endif %} From e8f5fac46c0c9854c63e29fca5cdc38b246e9928 Mon Sep 17 00:00:00 2001 From: nelsonlho Date: Thu, 4 Aug 2016 02:07:58 -0700 Subject: [PATCH 19/19] fixed base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index bc0c5db8f..f1b320b87 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -58,6 +58,7 @@ django_compressor==2.0 {%- endif %} {%- if cookiecutter.js_task_runner == 'Webpack' %} + # Webpack django-webpack-loader==0.3.3 {%- endif %}