From 041616db2ccc807c937d716926e5048f9bf5a58c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 31 Jul 2017 08:45:09 +0200 Subject: [PATCH 01/12] Update factory-boy to 2.9.0 (#1259) * Update factory-boy from 2.8.1 to 2.9.0 * Update factory-boy from 2.8.1 to 2.9.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 77f03ddb1..0abe9c1fe 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ Sphinx==1.6.3 django-extensions==1.8.1 Werkzeug==0.12.2 django-test-plus==1.0.18 -factory-boy==2.8.1 +factory-boy==2.9.0 django-debug-toolbar==1.8 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index bf7039a47..485f9f702 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -10,7 +10,7 @@ psycopg2==2.7.3 coverage==4.4.1 flake8==3.4.1 # pyup: != 2.6.0 django-test-plus==1.0.18 -factory-boy==2.8.1 +factory-boy==2.9.0 # pytest pytest-django==3.1.2 From 32b429a3bfc3c248d6c5e31a53df9ee15367f69a Mon Sep 17 00:00:00 2001 From: Shupeyko Nikita Date: Mon, 31 Jul 2017 12:47:29 +0300 Subject: [PATCH 02/12] Add PyPi badge indicating the latest stable release available (#1262) Closes #1202. --- README.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index c08b4a662..99fe8aa2e 100644 --- a/README.rst +++ b/README.rst @@ -1,14 +1,18 @@ Cookiecutter Django ======================= +.. image:: https://badge.fury.io/py/cookiecutter-django.svg + :target: https://badge.fury.io/py/cookiecutter-django + :alt: PyPI Package + +.. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master + :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master + :alt: Build Status + .. image:: https://pyup.io/repos/github/pydanny/cookiecutter-django/shield.svg :target: https://pyup.io/repos/github/pydanny/cookiecutter-django/ :alt: Updates -.. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master - :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master - :alt: Build Status - .. 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 From 394880a46895d02d2930e62ff924eb2b8276e2ba Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 31 Jul 2017 12:58:29 +0300 Subject: [PATCH 03/12] Remove latest PyPI version badge For the same reason as in #1203. --- README.rst | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 99fe8aa2e..9f2af8495 100644 --- a/README.rst +++ b/README.rst @@ -1,20 +1,16 @@ Cookiecutter Django ======================= -.. image:: https://badge.fury.io/py/cookiecutter-django.svg - :target: https://badge.fury.io/py/cookiecutter-django - :alt: PyPI Package - .. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master - :alt: Build Status + :alt: Build Status .. image:: https://pyup.io/repos/github/pydanny/cookiecutter-django/shield.svg - :target: https://pyup.io/repos/github/pydanny/cookiecutter-django/ - :alt: Updates + :target: https://pyup.io/repos/github/pydanny/cookiecutter-django/ + :alt: Updates .. 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 + :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. From ce33b0c4988a4fcc7c73e7a1415cb68bde77fc2d Mon Sep 17 00:00:00 2001 From: Bert de Miranda Date: Mon, 31 Jul 2017 12:16:38 +0200 Subject: [PATCH 04/12] Update developing-locally-docker.rst (#1242) --- docs/developing-locally-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index f9ce74d17..cf24485bd 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -39,7 +39,7 @@ on your development system:: $ docker-compose -f local.yml build -If you want to build the production environment you don't have to pass an argument -f, it will automatically use production.yml. +If you want to build the production environment you use ``production.yml`` as -f argument (``docker-compose.yml`` or ``docker-compose.yaml`` are the defaults). Boot the System --------------- From fe903e5c14ac3c061d1c0461beec365c9e8ea699 Mon Sep 17 00:00:00 2001 From: Shupeyko Nikita Date: Mon, 31 Jul 2017 13:27:58 +0300 Subject: [PATCH 05/12] Fix docs erros/typos (#1264) * Fix #.1 * Fix #.2 [Running management commands: "docker-compose -f production.yml run" to "docker-compose -f local.yml run'](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html#running-management-commands). * Fix #.3 Designate @bertdemiranda as a contributor (#1242). --- CONTRIBUTORS.rst | 1 + docs/developing-locally-docker.rst | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 4eb5b41c6..60a299759 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -59,6 +59,7 @@ Listed in alphabetical order. Ben Warren `@bwarren2` Ben Lopatin Benjamin Abel + Bert de Miranda `@bertdemiranda`_ Bo Lopker `@blopker`_ Bouke Haarsma Brent Payne `@brentpayne`_ @brentpayne diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index cf24485bd..99622c3ca 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -59,13 +59,13 @@ You can also set the environment variable ``COMPOSE_FILE`` pointing to ``local.y And then run:: - $ docker-compose -f production.yml up + $ docker-compose up Running management commands ~~~~~~~~~~~~~~~~~~~~~~~~~~~ As with any shell command that we wish to run in our container, this is done -using the ``docker-compose -f production.yml run`` command. +using the ``docker-compose -f local.yml run`` command. To migrate your app and to create a superuser, run:: From d36ff72c0febb68d1e2fdc83696892eb972a1b32 Mon Sep 17 00:00:00 2001 From: orzarchi Date: Mon, 31 Jul 2017 16:04:36 +0300 Subject: [PATCH 06/12] Fix gulpfile default task stuck on runServer (#1260) --- {{cookiecutter.project_slug}}/gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js index b9358f611..594fa0901 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.js @@ -101,5 +101,5 @@ gulp.task('watch', function() { // Default task gulp.task('default', function() { - runSequence(['styles', 'scripts', 'imgCompression'], 'runServer', 'browserSync', 'watch'); + runSequence(['styles', 'scripts', 'imgCompression'], ['runServer', 'browserSync', 'watch']); }); From b4e68a6bf12e4eaae7daa69322d42aa5d421c813 Mon Sep 17 00:00:00 2001 From: Nathan Victor Date: Mon, 31 Jul 2017 08:57:33 -0500 Subject: [PATCH 07/12] Update 404 with how to link (#1244) --- docs/live-reloading-and-sass-compilation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/live-reloading-and-sass-compilation.rst b/docs/live-reloading-and-sass-compilation.rst index 5996bc327..7f978ede5 100644 --- a/docs/live-reloading-and-sass-compilation.rst +++ b/docs/live-reloading-and-sass-compilation.rst @@ -21,4 +21,4 @@ The base app will now run as it would with the usual ``manage.py runserver`` but To get live reloading to work you'll probably need to install an `appropriate browser extension`_ -.. _appropriate browser extension: http://feedback.livereload.com/knowledgebase/articles/86242-how-do-i-install-and-use-the-browser-extensions- +.. _appropriate browser extension: http://livereload.com/extensions/ From ffedad91034b68a28b058a4efc93331dbeee53af Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Tue, 1 Aug 2017 13:06:07 -0400 Subject: [PATCH 08/12] Add project generation option docs (#1267) * Add project generation option docs * Alter wording --- docs/project-generation-options.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index 5ada6a3fa..8db3077dc 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -75,6 +75,9 @@ js_task_runner [1] use_lets_encrypt [n] Use `Let's Encrypt`_ as the certificate authority for this project. +custom_bootstrap_compilation [n] + If you use Grunt, scaffold out recompiling Bootstrap as as task. (Useful for letting you change Bootstrap variables in real time.) Consult project README for more details. + open_source_license [1] Select a software license for the project. The choices are: From c5ed6173b2ecf17a2e8d7a1419338f5c5e3623c3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 2 Aug 2017 07:15:51 +0200 Subject: [PATCH 09/12] Update pytest from 3.1.3 to 3.2.0 (#1271) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 28095be3c..705ed9466 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.12.14 binaryornot==0.4.3 # Testing -pytest==3.1.3 +pytest==3.2.0 pep8==1.7.0 pyflakes==1.5.0 tox==2.7.0 From 83081a20b529f2a49723680bc3da39c77e1cf07e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 2 Aug 2017 15:07:25 +0200 Subject: [PATCH 10/12] Update factory-boy to 2.9.1 (#1272) * Update factory-boy from 2.9.0 to 2.9.1 * Update factory-boy from 2.9.0 to 2.9.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0abe9c1fe..3e9241e29 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ Sphinx==1.6.3 django-extensions==1.8.1 Werkzeug==0.12.2 django-test-plus==1.0.18 -factory-boy==2.9.0 +factory-boy==2.9.1 django-debug-toolbar==1.8 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 485f9f702..24742c2b3 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -10,7 +10,7 @@ psycopg2==2.7.3 coverage==4.4.1 flake8==3.4.1 # pyup: != 2.6.0 django-test-plus==1.0.18 -factory-boy==2.9.0 +factory-boy==2.9.1 # pytest pytest-django==3.1.2 From 0e6b5f3c6665c5b87a9e98a405f6281976b2ea70 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 3 Aug 2017 18:28:48 +0200 Subject: [PATCH 11/12] Update pyflakes from 1.5.0 to 1.6.0 (#1275) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 705ed9466..c0dc71477 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ binaryornot==0.4.3 # Testing pytest==3.2.0 pep8==1.7.0 -pyflakes==1.5.0 +pyflakes==1.6.0 tox==2.7.0 pytest-cookies==0.2.0 From c90480b6dffb3a57a46ce12979199470a46ee0ff Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 3 Aug 2017 18:29:01 +0200 Subject: [PATCH 12/12] Update binaryornot from 0.4.3 to 0.4.4 (#1274) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c0dc71477..98599040f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ cookiecutter==1.5.1 flake8==3.4.1 # pyup: != 2.6.0 sh==1.12.14 -binaryornot==0.4.3 +binaryornot==0.4.4 # Testing pytest==3.2.0