Bruno Alla
6ef30b1741
Merge branch 'master' into simplify-environment
...
# Conflicts:
# docs/deployment-on-heroku.rst
2018-03-06 09:55:28 +00:00
Nicholas
b4738d2ff3
Update Heroku deployment docs ( #1548 )
...
* Update Heroku deployment
Remove duplicate DJANGO_ADMIN_URL config, add SENTRY config
* Update deployment-on-heroku.rst
2018-03-06 12:44:44 +03:00
pyup.io bot
5a20dce431
Update pytest from 3.4.1 to 3.4.2 ( #1549 )
2018-03-06 11:22:44 +03:00
pyup.io bot
93ad8e6125
Update django-crispy-forms from 1.7.0 to 1.7.1 ( #1546 )
2018-03-06 06:13:20 +00:00
Melanie Crutchfield
9fca6019ec
Update project-generation-options.rst ( #1547 )
...
Change small typo. "ones" should be "once".
2018-03-05 23:55:15 +01:00
Bruno Alla
82dcd2d30c
Simplify Mailgun settings
...
When creating a Mailgun add-on on Heroku, the app gets some environment
variables by default:
MAILGUN_API_KEY
MAILGUN_DOMAIN
However, the cookiecutter names do not match and requires a manual step
from the user deploying. It's used elsewhere but shouldn't harm the
other deployment methods to rename these variables.
While updating the docs I noticed a variable that appear unused
DJANGO_MAILGUN_SERVER_NAME so this removes it from the documentation.
2018-03-05 17:56:45 +00:00
Bruno Alla
baf08b2f5f
Document Gunicorn worker concurrency
2018-03-05 17:30:13 +00:00
Nikita P. Shupeyko
5261956356
Refactor gunicorn -w to be set from WEB_CONCURRENCY env
...
Closes #1480 .
2018-03-05 14:26:43 +03:00
Nikita P. Shupeyko
20a43c2bc5
Simplify test_docker.sh
2018-03-05 14:26:12 +03:00
Nikita P. Shupeyko
70b56839c6
Simplify tox.ini
2018-03-05 14:25:55 +03:00
Nikita P. Shupeyko
d2964faa54
Re-order requirements.txt
2018-03-05 14:01:45 +03:00
Nikita P. Shupeyko
e4353a41ed
Update project generation options docs
2018-03-05 13:54:35 +03:00
Nikita P. Shupeyko
f582aa1a84
Opt for personal email by default
2018-03-05 13:53:38 +03:00
Nikita P. Shupeyko
00fbf63939
Document use_travisci cookiecutter option
2018-03-05 13:12:33 +03:00
Nikita P. Shupeyko
8dd9e691b1
Group requirements from requirements.txt
2018-03-04 17:52:48 +03:00
Nikita P. Shupeyko
64f2541743
Set ALLOWED_HOSTS in config.settings.local
2018-03-04 17:51:37 +03:00
Nikita P. Shupeyko
384f641ea5
Remove requirements_to_watch.txt
...
Closes #1495 .
2018-03-04 17:35:11 +03:00
Nikita P. Shupeyko
f4e217ed21
Simplify production databases section generation
2018-03-04 17:33:54 +03:00
Nikita P. Shupeyko
d0432316a8
Opt for no js_task_runner by default
2018-03-04 17:32:29 +03:00
Nikita P. Shupeyko
ea54bfe175
Opt PostgreSQL for minor versions as well
2018-03-04 17:28:42 +03:00
Nikita P. Shupeyko
6c26d39f65
Unconditionally connect to database from DATABASE_URL env when opting for Docker
...
Closes #1541 .
2018-03-04 17:24:06 +03:00
Nikita P. Shupeyko
0311732ce3
Temporarily opt for Sentry and WhiteNoise by default
2018-03-04 15:40:47 +03:00
Nikita P. Shupeyko
3132ce7ecf
Gitignore .pytest_cache/
2018-03-04 15:32:08 +03:00
Nikita P. Shupeyko
e3103d5f05
Fix default email
2018-03-04 15:27:12 +03:00
Nikita P. Shupeyko
fe6fe1cc76
Fix test_docker.sh
2018-03-04 15:18:27 +03:00
Nikita P. Shupeyko
0a69f19452
Opt for .travis.yml
...
Closes #1542 .
2018-03-04 15:11:54 +03:00
Nikita P. Shupeyko
afd3191038
Get rid of remove_file() from post hook
2018-03-04 15:07:49 +03:00
Nikita P. Shupeyko
9f2f3b455f
Opt out of WhiteNoise by default
2018-03-04 15:07:05 +03:00
Nikita P. Shupeyko
ccef0aaa89
Opt out of Celery by default
2018-03-04 15:06:50 +03:00
Nikita P. Shupeyko
a40c9a2255
Prettify cookiecutter.json
2018-03-04 15:05:56 +03:00
Nikita P. Shupeyko
438ec0c101
Remove .env when neither Docker nor Heroku are opted out for
2018-03-04 14:44:37 +03:00
Nikita P. Shupeyko
281dde1d1d
Simplify post hook
2018-03-04 14:43:54 +03:00
Nikita P. Shupeyko
4a1cdb5d25
Drop support for PostgreSQL 9.2
...
Closes #1493 .
2018-03-04 12:39:15 +03:00
Nikita P. Shupeyko
69ff5515c9
Fix GPLv3 files not being removed
2018-03-01 22:43:19 +03:00
adammsteele
ed2204ecba
Celery config - json serialization by default ( #1535 )
...
* Use json serialization in celery by default
* Added myself to CONTRIBUTORS.rst
2018-03-01 14:25:33 +03:00
Bruno Alla
f5341fcace
Use the default docker from Travis rather than installing a specific version ( #1502 )
2018-03-01 14:23:43 +03:00
Andy Woods
1afa2b4487
Update urls.py ( #1537 )
...
Elsewise, named url 'detail' matches regex of 'update'
2018-03-01 14:21:09 +03:00
pyup.io bot
fbdc3c930f
Update raven from 6.5.0 to 6.6.0 ( #1539 )
2018-03-01 14:20:25 +03:00
pyup.io bot
3084d9d5c1
Update django-redis from 4.8.0 to 4.9.0 ( #1540 )
2018-03-01 14:20:08 +03:00
pyup.io bot
a429a050c9
Update boto3 to 1.6.2 ( #1538 )
...
* Update boto3 from 1.6.1 to 1.6.2
* Update production.txt
2018-03-01 11:59:59 +01:00
Bruno Alla
607b1c1ab1
Merge pull request #1485 from sfdye/use-aws-roles
...
Use AWS IAM roles
2018-02-28 15:17:10 +00:00
pyup.io bot
496869164f
Update boto3 from 1.5.36 to 1.6.1 ( #1536 )
2018-02-28 12:42:47 +01:00
Wan Liuyang
5f068dd972
Revert environment variables and update docs
2018-02-28 11:33:39 +08:00
Wan Liuyang
39d2000856
Merge branch 'master' of github.com:sfdye/cookiecutter-django into use-aws-roles
2018-02-28 10:16:48 +08:00
Daniel Roy Greenfeld
ff92210573
Remove python_2_unicode_compatible
...
Python 3.6 or go home!
2018-02-27 17:03:02 -05:00
Bruno Alla
56bd2ca9a1
Merge pull request #1533 from browniebroke/bug-500-compressor
...
Link to unminified CSS if using django-compressor
2018-02-27 18:50:22 +00:00
pyup.io bot
48a6bf56a6
Update boto3 from 1.5.33 to 1.5.36 ( #1531 )
2018-02-26 16:35:01 +03:00
pyup.io bot
18509cb85b
Update sphinx from 1.7.0 to 1.7.1 ( #1532 )
2018-02-26 16:34:51 +03:00
Bruno Alla
01e598df79
Link to unminified CSS if using django-compressor
2018-02-24 10:14:41 +00:00
Bruno Alla
61559ccf06
Merge pull request #1503 from browniebroke/psycopg2-no-binary
...
Install psycopg2 with --no-binary option
2018-02-22 18:22:01 +00:00
