From 6a0a2e5637fb72f3c55e25d0e59811416f8525b6 Mon Sep 17 00:00:00 2001 From: Aleksei Kuznetcov Date: Sun, 15 Apr 2018 17:14:11 -0400 Subject: [PATCH 1/6] Update runtime python version from 3.6.4 to 3.6.5 --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 5c4538034..486fcce12 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.6.4 +python-3.6.5 From cf03bf74e7698564921698132b1d060ab0283afa Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 30 Apr 2018 21:16:09 +0200 Subject: [PATCH 2/6] Update gunicorn from 19.8.0 to 19.8.1 (#1627) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index fa27b6648..9f997c2d9 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gevent==1.2.2 -gunicorn==19.8.0 # https://github.com/benoitc/gunicorn +gunicorn==19.8.1 # https://github.com/benoitc/gunicorn boto3==1.6.2 # pyup: update minor # https://github.com/boto/boto3 psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} From b8a709b191bb7ba77a91470c3601f2b8ae19f2b3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 May 2018 01:08:03 -0700 Subject: [PATCH 3/6] Update django from 2.0.4 to 2.0.5 --- {{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 bd0242985..236f483c7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -15,7 +15,7 @@ celery==3.1.25 # pyup: <4.0 # https://github.com/celery/celery # Django # ------------------------------------------------------------------------------ -django==2.0.4 # pyup: < 2.1 # https://www.djangoproject.com/ +django==2.0.5 # pyup: < 2.1 # https://www.djangoproject.com/ django-environ==0.4.4 # https://github.com/joke2k/django-environ django-model-utils==3.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.35.0 # https://github.com/pennersr/django-allauth From b7172cfebaa0dd8860e1173f4a97b1e6fdfdd8b7 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Sat, 5 May 2018 01:29:47 +0300 Subject: [PATCH 4/6] Conditionally gitignore virtualenv files Fixes #1321 the right way. --- {{cookiecutter.project_slug}}/.gitignore | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index f3f92da22..84b7e6d62 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -324,7 +324,7 @@ Session.vim # Auto-generated tag files tags - +{% if cookiecutter.use_docker == 'n' %} ### VirtualEnv template # Virtualenv @@ -337,16 +337,10 @@ tags [Ss]cripts pyvenv.cfg pip-selfcheck.json +{% endif %} - -{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%} +### Project template +{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} MailHog -{% endif %} - +{%- endif %} {{ cookiecutter.project_slug }}/media/ - -{% if cookiecutter.use_docker == 'y' -%} -# Added to maintain local compose files which are ignored by something above. -# See issue https://github.com/pydanny/cookiecutter-django/issues/1321 -!/compose/local/ -{% endif %} From 4944907fb578181e103ea96bed409d85bf1d21b3 Mon Sep 17 00:00:00 2001 From: Nikita Shupeyko Date: Sat, 5 May 2018 01:30:57 +0300 Subject: [PATCH 5/6] Upgrade redis service to 3.2 (#1631) --- {{cookiecutter.project_slug}}/local.yml | 2 +- {{cookiecutter.project_slug}}/production.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index ed8dec0bd..d22a9d089 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -45,7 +45,7 @@ services: {%- if cookiecutter.use_celery == 'y' %} redis: - image: redis:3.0 + image: redis:3.2 celeryworker: <<: *django diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index f57c98105..f8f8ca22c 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -46,7 +46,7 @@ services: - "0.0.0.0:443:443" redis: - image: redis:3.0 + image: redis:3.2 {%- if cookiecutter.use_celery == 'y' %} celeryworker: From 8203cfe4fc1650d2abe8d600aba7ca87d2c6d160 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 5 May 2018 03:06:41 +0200 Subject: [PATCH 6/6] Update factory-boy to 2.11.0 (#1632) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e9f057b4a..7bdc013ab 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -21,7 +21,7 @@ coverage==4.5.1 # https://github.com/nedbat/coveragepy # Django # ------------------------------------------------------------------------------ -factory-boy==2.10.0 # https://github.com/FactoryBoy/factory_boy +factory-boy==2.11.0 # https://github.com/FactoryBoy/factory_boy django-test-plus==1.0.22 # https://github.com/revsys/django-test-plus django-debug-toolbar==1.9.1 # https://github.com/jazzband/django-debug-toolbar