cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-23 10:04:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into django-multi

Browse Source
This commit is contained in:
Arnav Choudhury 2020-09-14 01:34:10 +05:30
commit 99ef9f44b9
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
<!-- GENERATOR_PLACEHOLDER --> <!-- GENERATOR_PLACEHOLDER -->
## [2020-09-12]
### Updated
- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814))
- Update pytest to 6.0.2 ([#2819](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2819))
- Update django-anymail to 8.0 ([#2818](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2818))
## [2020-09-11]
### Updated
- Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809))
## [2020-09-10] ## [2020-09-10]
### Updated ### Updated
- Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807)) - Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807))

2
requirements.txt
View File

@ -12,7 +12,7 @@ flake8-isort==4.0.0
# Testing # Testing
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
tox==3.20.0 tox==3.20.0
pytest==6.0.1 pytest==6.0.2
pytest-cookies==0.5.1 pytest-cookies==0.5.1
pytest-instafail==0.4.2 pytest-instafail==0.4.2
pyyaml==5.3.1 pyyaml==5.3.1

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

@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
mypy==0.770 # https://github.com/python/mypy mypy==0.770 # https://github.com/python/mypy
django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs
pytest==6.0.1 # https://github.com/pytest-dev/pytest pytest==6.0.2 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
# Documentation # Documentation

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

@ -22,21 +22,21 @@ django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages
django-storages[google]==1.10 # https://github.com/jschneier/django-storages django-storages[google]==1.10 # https://github.com/jschneier/django-storages
{%- endif %} {%- endif %}
{%- if cookiecutter.mail_service == 'Mailgun' %} {%- if cookiecutter.mail_service == 'Mailgun' %}
django-anymail[mailgun]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Amazon SES' %} {%- elif cookiecutter.mail_service == 'Amazon SES' %}
django-anymail[amazon_ses]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mailjet' %} {%- elif cookiecutter.mail_service == 'Mailjet' %}
django-anymail[mailjet]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mandrill' %} {%- elif cookiecutter.mail_service == 'Mandrill' %}
django-anymail[mandrill]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Postmark' %} {%- elif cookiecutter.mail_service == 'Postmark' %}
django-anymail[postmark]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Sendgrid' %} {%- elif cookiecutter.mail_service == 'Sendgrid' %}
django-anymail[sendgrid]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SendinBlue' %} {%- elif cookiecutter.mail_service == 'SendinBlue' %}
django-anymail[sendinblue]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SparkPost' %} {%- elif cookiecutter.mail_service == 'SparkPost' %}
django-anymail[sparkpost]==7.2.1 # https://github.com/anymail/django-anymail django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Other SMTP' %} {%- elif cookiecutter.mail_service == 'Other SMTP' %}
django-anymail==7.2.1 # https://github.com/anymail/django-anymail django-anymail==8.0 # https://github.com/anymail/django-anymail
{%- endif %} {%- endif %}