From 9827517357147afb4985b255f56875081ea4fd94 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Thu, 23 Mar 2017 12:14:04 -0700 Subject: [PATCH 01/19] Update README.rst --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index f1b12122c..3103da5c0 100644 --- a/README.rst +++ b/README.rst @@ -265,10 +265,10 @@ Support This Project This project is maintained by volunteers. Support their efforts by spreading the word about: -.. image:: https://s3.amazonaws.com/tsacademy/images/tsa-logo-250x60-transparent-01.png - :name: Two Scoops Academy +.. image:: https://cdn.shopify.com/s/files/1/0304/6901/t/2/assets/logo.png?11985289740589874793 + :name: Two Scoops Press :align: center - :alt: Two Scoops Academy - :target: https://twoscoops.academy/ + :alt: Two Scoops Press + :target: https://twoscoopspress.com .. _`PyPA Code of Conduct`: https://www.pypa.io/en/latest/code-of-conduct/ From 09c0d1632b1fc58bfb5cf4cd0a3eb14da558398a Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Thu, 23 Mar 2017 12:15:55 -0700 Subject: [PATCH 02/19] Update README.rst --- README.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.rst b/README.rst index 3103da5c0..f57eb1248 100644 --- a/README.rst +++ b/README.rst @@ -270,5 +270,11 @@ This project is maintained by volunteers. Support their efforts by spreading the :align: center :alt: Two Scoops Press :target: https://twoscoopspress.com + + .. image:: https://pyup.io/static/images/logo.png + :name: pyup + :align: center + :alt: pyup + :target: https://pyup.io/ .. _`PyPA Code of Conduct`: https://www.pypa.io/en/latest/code-of-conduct/ From a2195d2278fddc60c7d036eb316acecc975f4f17 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Thu, 23 Mar 2017 12:22:55 -0700 Subject: [PATCH 03/19] Update README.rst --- README.rst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index f57eb1248..aad87103e 100644 --- a/README.rst +++ b/README.rst @@ -265,13 +265,23 @@ Support This Project This project is maintained by volunteers. Support their efforts by spreading the word about: +Two Scoops Press +~~~~~~~~~~~~~~~~~~ + +Bringing you the best dairy-themed Django references in the universe + .. image:: https://cdn.shopify.com/s/files/1/0304/6901/t/2/assets/logo.png?11985289740589874793 :name: Two Scoops Press :align: center :alt: Two Scoops Press :target: https://twoscoopspress.com - .. image:: https://pyup.io/static/images/logo.png +pyup +~~~~~~~~~~~~~~~~~~ + +Bringing you automated security and dependency updates + +.. image:: https://pyup.io/static/images/logo.png :name: pyup :align: center :alt: pyup From 2cdd7e9fd03a7e3ba844bd76d4df4473ed4fa389 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Thu, 23 Mar 2017 12:26:03 -0700 Subject: [PATCH 04/19] Update README.rst --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index aad87103e..0817c6b88 100644 --- a/README.rst +++ b/README.rst @@ -268,23 +268,23 @@ This project is maintained by volunteers. Support their efforts by spreading the Two Scoops Press ~~~~~~~~~~~~~~~~~~ -Bringing you the best dairy-themed Django references in the universe - .. image:: https://cdn.shopify.com/s/files/1/0304/6901/t/2/assets/logo.png?11985289740589874793 :name: Two Scoops Press :align: center :alt: Two Scoops Press :target: https://twoscoopspress.com +Two Scoops Press brings you the best dairy-themed Django references in the universe + pyup ~~~~~~~~~~~~~~~~~~ - -Bringing you automated security and dependency updates .. image:: https://pyup.io/static/images/logo.png :name: pyup :align: center :alt: pyup :target: https://pyup.io/ + +Pyup brings you automated security and dependency updates used by Google and other organizations. Free for open source projects! .. _`PyPA Code of Conduct`: https://www.pypa.io/en/latest/code-of-conduct/ From 0278ad835ba0faa3d623ec7c6d65e909254828a5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 24 Mar 2017 11:25:18 +0100 Subject: [PATCH 05/19] Update django from 1.10.5 to 1.10.6 (#1064) From 57e9a223fea0c735c388104bdddb6ac574f21f9e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 24 Mar 2017 11:25:36 +0100 Subject: [PATCH 06/19] Update psycopg2 to 2.7.1 (#1073) * Update psycopg2 from 2.7 to 2.7.1 * Update psycopg2 from 2.7 to 2.7.1 * Update psycopg2 from 2.7 to 2.7.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index bd0355301..80dc0834c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -38,7 +38,7 @@ django-allauth==0.31.0 # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg {% else %} # Python-PostgreSQL Database Adapter -psycopg2==2.7 +psycopg2==2.7.1 {%- endif %} # Unicode slugification diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 9a860f877..65c3f26cc 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -6,7 +6,7 @@ # Python-PostgreSQL Database Adapter # If using Win for dev, this assumes Unix in prod # ------------------------------------------------ -psycopg2==2.7 +psycopg2==2.7.1 {%- endif %} # WSGI Handler diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 78fec9422..03cade464 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -4,7 +4,7 @@ {% if cookiecutter.windows == 'y' -%} # Python-PostgreSQL Database Adapter # If using Win for dev, this assumes Unix in test/prod -psycopg2==2.7 +psycopg2==2.7.1 {%- endif %} coverage==4.3.4 From 5965bbeaa4d40ca6c3db12f9edc7e0e98b652f56 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 24 Mar 2017 11:27:46 +0100 Subject: [PATCH 07/19] Update pytest from 3.0.6 to 3.0.7 (#1078) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cac458b5a..37dca155d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.12.10 binaryornot==0.4.0 # Testing -pytest==3.0.6 +pytest==3.0.7 pep8==1.7.0 pyflakes==1.5.0 tox==2.6.0 From 5b522d3deed9a3f29a68961afba090b755268df2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 24 Mar 2017 11:28:00 +0100 Subject: [PATCH 08/19] Update werkzeug from 0.11.15 to 0.12.1 (#1080) --- {{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 8093d77c7..0d9ca38f4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -6,7 +6,7 @@ django-coverage-plugin==1.5.0 Sphinx==1.5.3 django-extensions==1.7.7 -Werkzeug==0.11.15 +Werkzeug==0.12.1 django-test-plus==1.0.17 factory-boy==2.8.1 From 26962b41af58df241f5bd4ae9fee8f43a602d0cc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 24 Mar 2017 11:28:12 +0100 Subject: [PATCH 09/19] Update gunicorn from 19.6.0 to 19.7.1 (#1089) --- {{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 65c3f26cc..390112080 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -12,7 +12,7 @@ psycopg2==2.7.1 # WSGI Handler # ------------------------------------------------ gevent==1.2.1 -gunicorn==19.6.0 +gunicorn==19.7.1 # Static and Media Storage # ------------------------------------------------ From b5918029a1d30802fac6969ec02f1b65ad627d82 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 24 Mar 2017 11:28:38 +0100 Subject: [PATCH 10/19] Update sphinx from 1.5.2 to 1.5.3 (#1054) From 7da1bf79b807290423bb97262043a4f6e67403cb Mon Sep 17 00:00:00 2001 From: Shupeyko Nikita Date: Fri, 24 Mar 2017 20:45:31 +0300 Subject: [PATCH 11/19] Replace links section with depends_on in docker-compose config files (#1092) Closes #1091 --- {{cookiecutter.project_slug}}/dev.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/{{cookiecutter.project_slug}}/dev.yml b/{{cookiecutter.project_slug}}/dev.yml index 3eabb9012..122dea449 100644 --- a/{{cookiecutter.project_slug}}/dev.yml +++ b/{{cookiecutter.project_slug}}/dev.yml @@ -19,7 +19,8 @@ services: dockerfile: ./compose/django/Dockerfile-dev command: /start-dev.sh depends_on: - - postgres + - postgres{% if cookiecutter.use_mailhog == 'y' %} + - mailhog{% endif %} environment: - POSTGRES_USER={{cookiecutter.project_slug}} - USE_DOCKER=yes @@ -27,11 +28,6 @@ services: - .:/app ports: - "8000:8000" - links: - - postgres -{% if cookiecutter.use_mailhog == 'y' %} - - mailhog -{% endif %} {% if cookiecutter.use_pycharm == 'y' %} pycharm: @@ -44,8 +40,6 @@ services: - POSTGRES_USER={{cookiecutter.project_slug}} volumes: - .:/app - links: - - postgres {% endif %} {% if cookiecutter.use_mailhog == 'y' %} From 0b14104ae0df6eef4cafd65f947ef57becc89576 Mon Sep 17 00:00:00 2001 From: Wee Liat Date: Sat, 1 Apr 2017 23:30:24 +0800 Subject: [PATCH 12/19] added btn class to forget password (#1102) --- .../templates/account/password_reset.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html index 7478c419b..b9869fb23 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html @@ -18,7 +18,7 @@
{% csrf_token %} {{ form|crispy }} - +

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}

From 1a82a2a3afd9ce9495cef22d8320233a06236c22 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2017 18:09:29 +0200 Subject: [PATCH 13/19] Update sh from 1.12.10 to 1.12.13 (#1100) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 37dca155d..63848a8e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.5.1 flake8==3.3.0 # pyup: != 2.6.0 -sh==1.12.10 +sh==1.12.13 binaryornot==0.4.0 # Testing From 86922be94b47244b3872eb7079b2e86c38633e7c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2017 18:12:29 +0200 Subject: [PATCH 14/19] Update pytz from 2016.10 to 2017.2 (#1098) --- {{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 80dc0834c..b837af6cd 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -45,7 +45,7 @@ psycopg2==2.7.1 awesome-slugify==1.6.5 # Time zones support -pytz==2016.10 +pytz==2017.2 # Redis support django-redis==4.7.0 From c5c8b6b5e8a952b8c6f310f51ca30f4062d15b9d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2017 18:12:50 +0200 Subject: [PATCH 15/19] Update django-extensions from 1.7.7 to 1.7.8 (#1096) --- {{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 0d9ca38f4..81b3966e8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,7 +5,7 @@ coverage==4.3.4 django-coverage-plugin==1.5.0 Sphinx==1.5.3 -django-extensions==1.7.7 +django-extensions==1.7.8 Werkzeug==0.12.1 django-test-plus==1.0.17 factory-boy==2.8.1 From 9af01c50a841b3db868de1a13c2cb5e302018ffd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 1 Apr 2017 18:14:22 +0200 Subject: [PATCH 16/19] Update django-debug-toolbar from 1.6 to 1.7 (#1069) --- {{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 81b3966e8..672334946 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -10,7 +10,7 @@ Werkzeug==0.12.1 django-test-plus==1.0.17 factory-boy==2.8.1 -django-debug-toolbar==1.6 +django-debug-toolbar==1.7 # improved REPL ipdb==0.10.2 From f62e05b95e60c043cb463c66b40ca69c1f2d9c26 Mon Sep 17 00:00:00 2001 From: Jannis Gebauer Date: Wed, 5 Apr 2017 10:28:42 +0200 Subject: [PATCH 17/19] stay on 1.10.x for now until 1.11 is compatible --- {{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 b837af6cd..9eae0ce48 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.10.6 +django==1.10.6 # pyup: >=1.10,<1.11 # Configuration django-environ==0.4.1 From 3bbbcea0d0d580751a4e6bf8635ae276e9bfcc38 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 5 Apr 2017 10:36:50 +0200 Subject: [PATCH 18/19] Update django from 1.10.6 to 1.10.7 (#1110) --- {{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 9eae0ce48..b8f880b80 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.10.6 # pyup: >=1.10,<1.11 +django==1.10.7 # pyup: >=1.10,<1.11 # Configuration django-environ==0.4.1 From 66ffa5c93c32c636d2e986c566eb4184e463a29f Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Thu, 6 Apr 2017 19:04:46 +0300 Subject: [PATCH 19/19] Switch to current runtime version Closes #1094 --- {{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 941591788..e16ddff2c 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -{% if cookiecutter.use_python3 == 'y' -%}python-3.5.1{% else %}python-2.7.10{%- endif %} +{% if cookiecutter.use_python3 == 'y' -%}python-3.5.3{% else %}python-2.7.10{%- endif %}