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

Merge branch 'master' into 1623-unable-to-restore-the-database-in-docker-version

Browse Source
This commit is contained in:
Nikita P. Shupeyko 2018-05-05 12:08:30 +03:00
commit f392a15613
7 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
{{cookiecutter.project_slug}}/.gitignore vendored
View File

@ -324,7 +324,7 @@ Session.vim
# Auto-generated tag files # Auto-generated tag files
tags tags
{% if cookiecutter.use_docker == 'n' %}
### VirtualEnv template ### VirtualEnv template
# Virtualenv # Virtualenv
@ -337,16 +337,10 @@ tags
[Ss]cripts [Ss]cripts
pyvenv.cfg pyvenv.cfg
pip-selfcheck.json pip-selfcheck.json
{% endif %}
### Project template
{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%} {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
MailHog MailHog
{% endif %} {%- endif %}
{{ cookiecutter.project_slug }}/media/ {{ cookiecutter.project_slug }}/media/
{% if cookiecutter.use_docker == 'y' -%}
# Added to maintain local compose files which are ignored by something above.
# See issue https://github.com/pydanny/cookiecutter-django/issues/1321
!/compose/local/
{% endif %}

2
{{cookiecutter.project_slug}}/local.yml
View File

@ -45,7 +45,7 @@ services:
{%- if cookiecutter.use_celery == 'y' %} {%- if cookiecutter.use_celery == 'y' %}
redis: redis:
image: redis:3.0 image: redis:3.2
celeryworker: celeryworker:
<<: *django <<: *django

2
{{cookiecutter.project_slug}}/production.yml
View File

@ -46,7 +46,7 @@ services:
- "0.0.0.0:443:443" - "0.0.0.0:443:443"
redis: redis:
image: redis:3.0 image: redis:3.2
{%- if cookiecutter.use_celery == 'y' %} {%- if cookiecutter.use_celery == 'y' %}
celeryworker: celeryworker:

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

@ -15,7 +15,7 @@ celery==3.1.25 # pyup: <4.0 # https://github.com/celery/celery
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
django==2.0.4 # pyup: < 2.1 # https://www.djangoproject.com/ django==2.0.5 # pyup: < 2.1 # https://www.djangoproject.com/
django-environ==0.4.4 # https://github.com/joke2k/django-environ django-environ==0.4.4 # https://github.com/joke2k/django-environ
django-model-utils==3.1.1 # https://github.com/jazzband/django-model-utils django-model-utils==3.1.1 # https://github.com/jazzband/django-model-utils
django-allauth==0.35.0 # https://github.com/pennersr/django-allauth django-allauth==0.35.0 # https://github.com/pennersr/django-allauth

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

@ -21,7 +21,7 @@ coverage==4.5.1 # https://github.com/nedbat/coveragepy
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
factory-boy==2.10.0 # https://github.com/FactoryBoy/factory_boy factory-boy==2.11.0 # https://github.com/FactoryBoy/factory_boy
django-test-plus==1.0.22 # https://github.com/revsys/django-test-plus django-test-plus==1.0.22 # https://github.com/revsys/django-test-plus
django-debug-toolbar==1.9.1 # https://github.com/jazzband/django-debug-toolbar django-debug-toolbar==1.9.1 # https://github.com/jazzband/django-debug-toolbar

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

@ -3,7 +3,7 @@
-r base.txt -r base.txt
gevent==1.2.2 gevent==1.2.2
gunicorn==19.8.0 # https://github.com/benoitc/gunicorn gunicorn==19.8.1 # https://github.com/benoitc/gunicorn
boto3==1.6.2 # pyup: update minor # https://github.com/boto/boto3 boto3==1.6.2 # pyup: update minor # https://github.com/boto/boto3
psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
{%- if cookiecutter.use_whitenoise == 'n' %} {%- if cookiecutter.use_whitenoise == 'n' %}

2
{{cookiecutter.project_slug}}/runtime.txt
View File

@ -1 +1 @@
python-3.6.4 python-3.6.5