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

Merge commit '2e672856bed0aba3904576104cf7cf746d07897c'

Browse Source
This commit is contained in:
Trung Dong Huynh 2017-11-28 11:38:41 +00:00
commit a83250e263
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -110,7 +110,7 @@ Two Scoops of Django 1.11
:alt: Two Scoops of Django :alt: Two Scoops of Django
:target: http://twoscoopspress.org/products/two-scoops-of-django-1-11 :target: http://twoscoopspress.org/products/two-scoops-of-django-1-11
Two Scoops of Django is the best dairy-themed Django reference in the universe Two Scoops of Django is the best dessert-themed Django reference in the universe
pyup pyup
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

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.2.3 pytest==3.2.5
pycodestyle==2.3.1 pycodestyle==2.3.1
pyflakes==1.6.0 pyflakes==1.6.0
tox==2.9.1 tox==2.9.1

4
{{cookiecutter.project_slug}}/config/settings/production.py
View File

@ -169,7 +169,7 @@ TEMPLATES[0]['OPTIONS']['loaders'] = [
('django.template.loaders.cached.Loader', [ ('django.template.loaders.cached.Loader', [
'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ]), 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ]),
] ]
{% set _DEFAULT_CONN_MAX_AGE=60 %}
# DATABASE CONFIGURATION # DATABASE CONFIGURATION
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
{% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%} {% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%}
@ -182,12 +182,14 @@ DATABASES = {
'PASSWORD': env('RDS_PASSWORD'), 'PASSWORD': env('RDS_PASSWORD'),
'HOST': env('RDS_HOSTNAME'), 'HOST': env('RDS_HOSTNAME'),
'PORT': env('RDS_PORT'), 'PORT': env('RDS_PORT'),
'CONN_MAX_AGE': env.int('CONN_MAX_AGE', default={{ _DEFAULT_CONN_MAX_AGE }}),
} }
} }
{% else %} {% else %}
# Use the Heroku-style specification # Use the Heroku-style specification
# Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ # Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ
DATABASES['default'] = env.db('DATABASE_URL') DATABASES['default'] = env.db('DATABASE_URL')
DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default={{ _DEFAULT_CONN_MAX_AGE }})
{%- endif %} {%- endif %}
# CACHING # CACHING

1
{{cookiecutter.project_slug}}/env.example
View File

@ -2,6 +2,7 @@
# PostgreSQL # PostgreSQL
POSTGRES_PASSWORD=mysecretpass POSTGRES_PASSWORD=mysecretpass
POSTGRES_USER=postgresuser POSTGRES_USER=postgresuser
CONN_MAX_AGE=
# Domain name, used by caddy # Domain name, used by caddy
DOMAIN_NAME={{ cookiecutter.domain_name }} DOMAIN_NAME={{ cookiecutter.domain_name }}

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

@ -1,7 +1,7 @@
# Local development dependencies go here # Local development dependencies go here
-r base.txt -r base.txt
coverage==4.4.1 coverage==4.4.2
django-coverage-plugin==1.5.0 django-coverage-plugin==1.5.0
Sphinx==1.6.5 Sphinx==1.6.5
@ -10,7 +10,7 @@ Werkzeug==0.12.2
django-test-plus==1.0.20 django-test-plus==1.0.20
factory-boy==2.9.2 factory-boy==2.9.2
django-debug-toolbar==1.8 django-debug-toolbar==1.9.1
# improved REPL # improved REPL
ipdb==0.10.3 ipdb==0.10.3

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

@ -7,7 +7,7 @@
psycopg2==2.7.3.2 psycopg2==2.7.3.2
{%- endif %} {%- endif %}
coverage==4.4.1 coverage==4.4.2
flake8==3.5.0 # pyup: != 2.6.0 flake8==3.5.0 # pyup: != 2.6.0
django-test-plus==1.0.20 django-test-plus==1.0.20
factory-boy==2.9.2 factory-boy==2.9.2