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/README.rst b/README.rst index c08b4a662..9f2af8495 100644 --- a/README.rst +++ b/README.rst @@ -1,16 +1,16 @@ 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 + :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 + :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. diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst index 1c6a724f6..cb428e8f4 100644 --- a/docs/deployment-with-docker.rst +++ b/docs/deployment-with-docker.rst @@ -55,7 +55,7 @@ It is always better to deploy a site behind HTTPS and will become crucial as the * In the `.env.example`, we have made it simpler for you to change the default `Django Admin` into a custom name through an environmental variable. This should make it harder to guess the access to the admin panel. -* If you are not using a subdomain of the domain name set in the project, then remember to put the your staging/production IP address in the ``ALLOWED_HOSTS``_ environment variable before you deploy your website. Failure to do this will mean you will not have access to your website through the HTTP protocol. +* If you are not using a subdomain of the domain name set in the project, then remember to put the your staging/production IP address in the :code:`DJANGO_ALLOWED_HOSTS` environment variable (see :ref:`settings`) before you deploy your website. Failure to do this will mean you will not have access to your website through the HTTP protocol. * Access to the Django admin is set up by default to require HTTPS in production or once *live*. We recommend that you look into setting up the *Certbot and Let's Encrypt Setup* mentioned below or another HTTPS certification service. diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index f9ce74d17..99622c3ca 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 --------------- @@ -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:: 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/ 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: diff --git a/docs/settings.rst b/docs/settings.rst index 893a47e90..8b4ad4053 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -1,3 +1,5 @@ +.. _settings: + Settings ========== 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 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']); }); 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