From 1d55a608c03d423525b470fba6fd819fd15c70a5 Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Sun, 17 Sep 2017 13:56:15 -0500 Subject: [PATCH 01/42] Change pep 8 for pycodestyle in docs and project requirements (#1332) * Change pep8 for pycodestyle in the docs. * Change pep8 for pycodestyle in project requirements. --- docs/linters.rst | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/linters.rst b/docs/linters.rst index 4750e1617..feb59d037 100644 --- a/docs/linters.rst +++ b/docs/linters.rst @@ -30,14 +30,14 @@ The config for pylint is located in .pylintrc. It specifies: * Disable linting messages for missing docstring and invalid name * max-parents=13 -pep8 +pycodestyle ----- This is included in flake8's checks, but you can also run it separately to see a more detailed report: - $ pep8 + $ pycodestyle -The config for pep8 is located in setup.cfg. It specifies: +The config for pycodestyle is located in setup.cfg. It specifies: * Set max line length to 120 chars * Exclude ``.tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules`` diff --git a/requirements.txt b/requirements.txt index e11c9da38..89dba961d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Testing pytest==3.2.2 -pep8==1.7.0 +pycodestyle==2.3.1 pyflakes==1.6.0 tox==2.8.2 pytest-cookies==0.2.0 From 6537f181a57cb45f07b78e4891dca466c6398258 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 18 Sep 2017 09:42:08 +0200 Subject: [PATCH 02/42] Update django-anymail from 0.11.1 to 1.0 (#1334) --- {{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 a347337f8..11096db60 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.5.2 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==0.11.1 +django-anymail==1.0 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client From 874caee360932e784cb71c60cf808a7aab898943 Mon Sep 17 00:00:00 2001 From: Reggie Riser Date: Mon, 18 Sep 2017 03:44:16 -0400 Subject: [PATCH 03/42] Removed references and old CSS specific to Bootstrap alpha. (#1333) * Removed references and old CSS specific to Bootstrap alpha. * Fixed Bootstrap alpha reference in README. --- CONTRIBUTORS.rst | 2 ++ README.rst | 2 +- .../static/css/project.css | 17 ------------ .../static/sass/project.scss | 26 ------------------- .../templates/base.html | 4 +-- 5 files changed, 5 insertions(+), 46 deletions(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index f8c572331..d4e1bfe90 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -128,6 +128,7 @@ Listed in alphabetical order. Peter Bittner `@bittner`_ Raphael Pierzina `@hackebrot`_ Raony Guimarães Corrêa `@raonyguimaraes`_ + Reggie Riser `@reggieriser`_ René Muhl `@rm--`_ Roman Afanaskin `@siauPatrick`_ Roman Osipenko `@romanosipenko`_ @@ -220,6 +221,7 @@ Listed in alphabetical order. .. _@oubiga: https://github.com/oubiga .. _@parbhat: https://github.com/parbhat .. _@raonyguimaraes: https://github.com/raonyguimaraes +.. _@reggieriser: https://github.com/reggieriser .. _@rm--: https://github.com/rm-- .. _@romanosipenko: https://github.com/romanosipenko .. _@shireenrao: https://github.com/shireenrao diff --git a/README.rst b/README.rst index 2b239f784..babbf3810 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ Features * For Django 1.10 * Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental * Renders Django projects with 100% starting test coverage -* Twitter Bootstrap_ v4.0.0 - alpha 6 (`maintained Foundation fork`_ also available) +* Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available) * 12-Factor_ based settings via django-environ_ * Secure by default. We believe in SSL. * Optimized development and production settings diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css index 5f23c427a..a7725c91e 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/css/project.css @@ -12,23 +12,6 @@ border-color: #eed3d7; } -/* This is a fix for the bootstrap4 alpha release */ -@media (max-width: 47.9em) { - .navbar-nav .nav-item { - float: none; - width: 100%; - display: inline-block; - } - - .navbar-nav .nav-item + .nav-item { - margin-left: 0; - } - - .nav.navbar-nav.pull-xs-right { - float: none !important; - } -} - /* Display django-debug-toolbar. See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742 and https://github.com/pydanny/cookiecutter-django/issues/317 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss index 8dafa2201..6e701f290 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss @@ -87,32 +87,6 @@ $red: #b94a48; color: $red; } -//////////////////////////////// - //Navbar// -//////////////////////////////// - -// This is a fix for the bootstrap4 alpha release - -.navbar { - border-radius: 0px; -} - -@media (max-width: 47.9em) { - .navbar-nav .nav-item { - display: inline-block; - float: none; - width: 100%; - } - - .navbar-nav .nav-item + .nav-item { - margin-left: 0; - } - - .nav.navbar-nav.pull-xs-right { - float: none !important; - } -} - //////////////////////////////// //Django Toolbar// //////////////////////////////// diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index f19ff5889..6fdc1798a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -14,7 +14,7 @@ {% block css %} - + @@ -88,7 +88,7 @@ ================================================== --> {% block javascript %} - + From ea5fb0efb60a34a79519db6105d9a809bd85510f Mon Sep 17 00:00:00 2001 From: Wan Liuyang Date: Mon, 18 Sep 2017 21:19:09 +0800 Subject: [PATCH 04/42] Update EMAIL_BACKEND to "anymail.backends.espname.EmailBackend" to match anymail 1.0 (#1335) --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index bf031d351..7ea188ce2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -159,7 +159,7 @@ ANYMAIL = { 'MAILGUN_API_KEY': env('DJANGO_MAILGUN_API_KEY'), 'MAILGUN_SENDER_DOMAIN': env('MAILGUN_SENDER_DOMAIN') } -EMAIL_BACKEND = 'anymail.backends.mailgun.MailgunBackend' +EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend' # TEMPLATE CONFIGURATION # ------------------------------------------------------------------------------ From c8210f063ca7d7015a76944d5c7ec7836422782d Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Tue, 19 Sep 2017 14:40:57 +0200 Subject: [PATCH 05/42] Fix formatting in README.rst --- README.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index babbf3810..23cc2672d 100644 --- a/README.rst +++ b/README.rst @@ -12,13 +12,16 @@ Cookiecutter Django .. image:: https://badges.gitter.im/Join Chat.svg :target: https://gitter.im/pydanny/cookiecutter-django?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge -Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting production-ready Django projects quickly. +Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting +production-ready Django projects quickly. * Documentation: https://cookiecutter-django.readthedocs.io/en/latest/ * See Troubleshooting_ for common errors and obstacles -* If you have problems with Cookiecutter Django, please open issues_ don't send emails to the maintainers. -* Need quick professional paid support? Contact `support@cookiecutter.io`_. This includes configuring your servers, -fixing bugs, reviewing your code and everything in between. +* If you have problems with Cookiecutter Django, please open issues_ don't send + emails to the maintainers. +* Need quick professional paid support? Contact `support@cookiecutter.io`_. + This includes configuring your servers, fixing bugs, reviewing your code and + everything in between. .. _cookiecutter: https://github.com/audreyr/cookiecutter From 93c965d0201961164249d9a38d39e09729de5c90 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Sep 2017 17:02:08 +0200 Subject: [PATCH 06/42] Update raven from 6.1.0 to 6.2.0 (#1340) --- {{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 11096db60..f737e218a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -29,7 +29,7 @@ django-anymail==1.0 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client # -------------------------- -raven==6.1.0 +raven==6.2.0 {%- endif %} {% if cookiecutter.use_opbeat == "y" -%} From 4f727fac7c29441a302054d7f27a1d6de8e506f2 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 22 Sep 2017 20:47:16 +0200 Subject: [PATCH 07/42] Update raven from 6.2.0 to 6.2.1 (#1341) --- {{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 f737e218a..e6496cb22 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -29,7 +29,7 @@ django-anymail==1.0 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client # -------------------------- -raven==6.2.0 +raven==6.2.1 {%- endif %} {% if cookiecutter.use_opbeat == "y" -%} From ee0d52fd97a9c809abdf666ca686c341781ceda2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 23 Sep 2017 11:47:41 -0700 Subject: [PATCH 08/42] Update whitenoise from 3.3.0 to 3.3.1 --- {{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 2d38694e5..960522a88 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ django==1.10.8 # pyup: >=1.10,<1.11 # Configuration django-environ==0.4.4 {% if cookiecutter.use_whitenoise == 'y' -%} -whitenoise==3.3.0 +whitenoise==3.3.1 {%- endif %} From f10d03e8a8ccb31e5ab914192800ecbe08fb0659 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 26 Sep 2017 01:08:44 -0700 Subject: [PATCH 09/42] Update sphinx from 1.6.3 to 1.6.4 --- {{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 6891918b0..015a82353 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,7 +4,7 @@ coverage==4.4.1 django-coverage-plugin==1.5.0 -Sphinx==1.6.3 +Sphinx==1.6.4 django-extensions==1.9.1 Werkzeug==0.12.2 django-test-plus==1.0.18 From 7fba13f0c017e334f5e9885af28745f6829197e5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 29 Sep 2017 10:14:41 -0700 Subject: [PATCH 10/42] Update tox from 2.8.2 to 2.9.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 89dba961d..271ba5496 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ binaryornot==0.4.4 pytest==3.2.2 pycodestyle==2.3.1 pyflakes==1.6.0 -tox==2.8.2 +tox==2.9.0 pytest-cookies==0.2.0 From cda6878486a24b4005c60b66cf7cbc97594b5faf Mon Sep 17 00:00:00 2001 From: Charlie Smith Date: Sat, 30 Sep 2017 13:18:55 +0100 Subject: [PATCH 11/42] More inline docs for DATABASES variable (#1350) * More inline docs for DATABASES variable Use of database url is not part of Django, but comes from django-environ. Was initially confusing where feature came from, as link points to offical django docs. * Contributors update --- CONTRIBUTORS.rst | 2 ++ {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index d4e1bfe90..08bca9078 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -68,6 +68,7 @@ Listed in alphabetical order. Burhan Khalid            `@burhan`_                   @burhan Catherine Devlin `@catherinedevlin`_ Cédric Gaspoz `@cgaspoz`_ + Charlie Smith `@chuckus`_ Chris Curvey `@ccurvey`_ Chris Franklin Chris Franklin `@hairychris`_ @@ -179,6 +180,7 @@ Listed in alphabetical order. .. _@cgaspoz: https://github.com/cgaspoz .. _@chrisdev: https://github.com/chrisdev .. _@ChrisPappalardo: https://github.com/ChrisPappalardo +.. _@chuckus: https://github.com/chuckus .. _@Collederas: https://github.com/Collederas .. _@ddiazpinto: https://github.com/ddiazpinto .. _@dezoito: https://github.com/dezoito diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 274e28067..10261781d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -108,6 +108,8 @@ MANAGERS = ADMINS # DATABASE CONFIGURATION # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#databases +# Uses django-environ to accept uri format +# See: https://django-environ.readthedocs.io/en/latest/#supported-types DATABASES = { 'default': env.db('DATABASE_URL', default='postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}'), } From dea64ad60aa234b704a2e0b3e5d5d8f4334f7f45 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 30 Sep 2017 14:46:19 +0200 Subject: [PATCH 12/42] Update tox from 2.9.0 to 2.9.1 (#1349) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 271ba5496..15b9aad86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ binaryornot==0.4.4 pytest==3.2.2 pycodestyle==2.3.1 pyflakes==1.6.0 -tox==2.9.0 +tox==2.9.1 pytest-cookies==0.2.0 From a6ec7056baf77f7b7d6cc6c9b5faad207f008e13 Mon Sep 17 00:00:00 2001 From: Delio Castillo Date: Sat, 30 Sep 2017 05:47:17 -0700 Subject: [PATCH 13/42] replaces dev.yml with local.yml in all PyCharm configuration files (#1348) --- .../.idea/runConfigurations/Docker__migrate.xml | 2 +- .../.idea/runConfigurations/Docker__runserver.xml | 2 +- .../.idea/runConfigurations/Docker__runserver_plus.xml | 2 +- .../.idea/runConfigurations/Docker__tests___all.xml | 2 +- .../.idea/runConfigurations/Docker__tests___class__TestUser.xml | 2 +- .../runConfigurations/Docker__tests___file__test_models.xml | 2 +- .../.idea/runConfigurations/Docker__tests___module__users.xml | 2 +- .../Docker__tests___specific__test_get_absolute_url.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml index 98fff92e8..95f45bfb7 100644 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml +++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml @@ -6,7 +6,7 @@ -