From 75c423c88e2f5eb3038517314e81315c6fb7c6d3 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 12 Jun 2018 13:21:10 +0300 Subject: [PATCH 1/7] Update @pydanny and @webyneter bios --- .github/ISSUE_TEMPLATE/paid-support.md | 2 +- README.rst | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md index 7cd2c4a57..d565e564f 100644 --- a/.github/ISSUE_TEMPLATE/paid-support.md +++ b/.github/ISSUE_TEMPLATE/paid-support.md @@ -7,4 +7,4 @@ Provided your question goes beyound [regular support](https://github.com/pydanny * Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB. -* Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Django, Docker, and Heroku. +* Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience. diff --git a/README.rst b/README.rst index 7e24a8369..0eaea5194 100644 --- a/README.rst +++ b/README.rst @@ -98,7 +98,9 @@ Support this Project! This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django: -* https://www.patreon.com/danielroygreenfeld: Project lead. Expertise in AWS ELB and Django. +* Daniel Roy Greenfeld, Project Lead (`GitHub `_, `Patreon `_): expertise in Django and AWS ELB. + +* Nikita Shupeyko, Core Developer (`GitHub `_): expertise in Python/Django, hands-on DevOps and frontend experience. Projects that provide financial support to the maintainers: From 636b5f361d196cb15a3f4d07ac430988e124c499 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 15 Jun 2018 12:10:27 +0100 Subject: [PATCH 2/7] Remove entry from .gitignore causing compose/local to match --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9e4496f1c..54fafb8be 100644 --- a/.gitignore +++ b/.gitignore @@ -215,7 +215,6 @@ tags [Ii]nclude [Ll]ib [Ll]ib64 -[Ll]ocal [Ss]cripts pyvenv.cfg pip-selfcheck.json From a9db5b09826e8c6e033c5f00d1ba736b56f44195 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 15 Jun 2018 14:20:28 -0700 Subject: [PATCH 3/7] Update django-test-plus from 1.0.22 to 1.1.0 --- {{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 c67276107..d3e938ea2 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -22,7 +22,7 @@ coverage==4.5.1 # https://github.com/nedbat/coveragepy # Django # ------------------------------------------------------------------------------ factory-boy==2.11.1 # https://github.com/FactoryBoy/factory_boy -django-test-plus==1.0.22 # https://github.com/revsys/django-test-plus +django-test-plus==1.1.0 # https://github.com/revsys/django-test-plus django-debug-toolbar==1.9.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==2.0.7 # https://github.com/django-extensions/django-extensions From cec06b2d813c8a78396600f27871f6a5b8b2011c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 15 Jun 2018 14:20:32 -0700 Subject: [PATCH 4/7] Update pytest-django from 3.2.1 to 3.3.0 --- {{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 c67276107..60600308b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -27,4 +27,4 @@ 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 django-extensions==2.0.7 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.5.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==3.2.1 # https://github.com/pytest-dev/pytest-django +pytest-django==3.3.0 # https://github.com/pytest-dev/pytest-django From c6c8ca953afcd721bf7ef7b13b3f7a77587bacf9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 16 Jun 2018 15:07:40 +0100 Subject: [PATCH 5/7] Remove entry from other .gitignore causing compose/local to match --- {{cookiecutter.project_slug}}/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index c6273596b..679fb9026 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -330,7 +330,6 @@ tags [Ii]nclude [Ll]ib [Ll]ib64 -[Ll]ocal [Ss]cripts pyvenv.cfg pip-selfcheck.json From 24a7e535c66bc63ac37e112b26215c4eb9d43a51 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 17 Jun 2018 12:36:30 -0700 Subject: [PATCH 6/7] Update psycopg2-binary from 2.7.4 to 2.7.5 --- {{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 ac8e452d0..a72a54186 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -6,7 +6,7 @@ Sphinx==1.7.5 # https://github.com/sphinx-doc/sphinx {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.7.4 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.7.5 # https://github.com/psycopg/psycopg2 {%- endif %} # Testing From f3d76a413422092a38b58167bdd4e7a3aea7b405 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 19 Jun 2018 00:07:14 +0200 Subject: [PATCH 7/7] Update celery from 3.1.25 to 3.1.26.post2 (#1683) --- {{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 6b2ec4b55..a5399ea5a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ whitenoise==3.3.1 # https://github.com/evansd/whitenoise {%- endif %} redis>=2.10.5 # https://github.com/antirez/redis {%- if cookiecutter.use_celery == "y" %} -celery==3.1.25 # pyup: <4.0 # https://github.com/celery/celery +celery==3.1.26.post2 # pyup: <4.0 # https://github.com/celery/celery {%- endif %} # Django