cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-07 13:34:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bugfix/custom-bs-compilation

Browse Source
This commit is contained in:
Bruno Alla 2018-01-05 16:42:32 +00:00
commit db5c445c29
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/deployment-with-elastic-beanstalk.rst
View File

@ -21,6 +21,9 @@ Instructions
If you haven't done so, create a directory of environments:: If you haven't done so, create a directory of environments::
eb init -p python3.4 MY_PROJECT_SLUG eb init -p python3.4 MY_PROJECT_SLUG
# Warning: If you use python3.6, you will run into problems later due to some incompatibility with
# mod_wgsi 3.5 (packaged in 64bit Amazon Linux 2017.09 v2.6.1 running Python 3.6). See:
# https://serverfault.com/questions/884469/mod-wsgi-call-to-site-addsitedir-failed-on-aws-elastic-beanstalk-python-3/885445
Replace `MY_PROJECT_SLUG` with the value you entered for `project_slug`. Replace `MY_PROJECT_SLUG` with the value you entered for `project_slug`.

2
requirements.txt
View File

@ -4,7 +4,7 @@ sh==1.12.14
binaryornot==0.4.4 binaryornot==0.4.4
# Testing # Testing
pytest==3.3.1 pytest==3.3.2
pycodestyle==2.3.1 pycodestyle==2.3.1
pyflakes==1.6.0 pyflakes==1.6.0
tox==2.9.1 tox==2.9.1

5
{{cookiecutter.project_slug}}/README.rst
View File

@ -79,8 +79,6 @@ Email Server
{% if cookiecutter.use_docker == 'y' %} {% if cookiecutter.use_docker == 'y' %}
In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container. In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container.
.. _mailhog: https://github.com/mailhog/MailHog
Container mailhog will start automatically when you will run all docker containers. Container mailhog will start automatically when you will run all docker containers.
Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers. Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers.
@ -88,8 +86,6 @@ With MailHog running, to view messages that are sent by your application, open y
{% else %} {% else %}
In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available. In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available.
.. _mailhog: https://github.com/mailhog/MailHog
To start the service, make sure you have nodejs installed, and then type the following:: To start the service, make sure you have nodejs installed, and then type the following::
$ npm install $ npm install
@ -101,6 +97,7 @@ To view messages that are sent by your application, open your browser and go to
The email server will exit when you exit the Grunt task on the CLI with Ctrl+C. The email server will exit when you exit the Grunt task on the CLI with Ctrl+C.
{% endif %} {% endif %}
.. _mailhog: https://github.com/mailhog/MailHog
{% endif %} {% endif %}
{% if cookiecutter.use_sentry_for_error_reporting == "y" %} {% if cookiecutter.use_sentry_for_error_reporting == "y" %}

2
{{cookiecutter.project_slug}}/requirements/base.txt
View File

@ -22,7 +22,7 @@ django-crispy-forms==1.7.0
django-model-utils==3.0.0 django-model-utils==3.0.0
# Images # Images
Pillow==4.3.0 Pillow==5.0.0
# Password storage # Password storage
argon2-cffi==16.3.0 argon2-cffi==16.3.0

2
{{cookiecutter.project_slug}}/requirements/local.txt
View File

@ -6,7 +6,7 @@ django-coverage-plugin==1.5.0
Sphinx==1.6.5 Sphinx==1.6.5
django-extensions==1.9.8 django-extensions==1.9.8
Werkzeug==0.13 Werkzeug==0.14.1
django-test-plus==1.0.21 django-test-plus==1.0.21
factory-boy==2.9.2 factory-boy==2.9.2

2
{{cookiecutter.project_slug}}/requirements/production.txt
View File

@ -16,7 +16,7 @@ gunicorn==19.7.1
# Static and Media Storage # Static and Media Storage
# ------------------------------------------------ # ------------------------------------------------
boto3==1.5.6 boto3==1.5.8
django-storages==1.6.5 django-storages==1.6.5
{% if cookiecutter.use_whitenoise != 'y' -%} {% if cookiecutter.use_whitenoise != 'y' -%}
Collectfast==0.6.0 Collectfast==0.6.0