Merge branch 'master' into 1225-introduce-development-time-celery-services

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

README.rst

@@ -1,14 +1,14 @@
 Cookiecutter Django
 =======================
 
-.. 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://pyup.io/repos/github/pydanny/cookiecutter-django/shield.svg
+    :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
 

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
 ---------------
@@ -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::
 

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/

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:
 

requirements.txt

@@ -1,11 +1,11 @@
 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.1.3
+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

{{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']);
 });

{{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.1
 
 django-debug-toolbar==1.8
 

{{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.1
 
 # pytest
 pytest-django==3.1.2