Commit Graph

7502 Commits

Author SHA1 Message Date
pyup.io bot
dd0a73a985 Update django-extensions from 2.0.2 to 2.0.3 (#1561) 2018-03-08 19:03:18 +03:00
Nikita Shupeyko
3f8aa26d0f
Group environment variables by the corresponding directories (#1295)
* Update generated project's .gitignore

* Post-gen gitignore .env/ and .env

* Fix linesep between gitignored entries

* Persist `.env/**/*` files into cookiecutter-django's VCS

* Rename .env/ to .envs/

* Reference the newly created .envs/**/.* files in local.yml

* Reference the newly created .envs/**/.* files in production.yml

* Delete .env.example

* Refactor post-gen-project.py

Closes #1299.

* Implement production-dotenv-files-to-dotenv-file merge script

* Create shared PyCharm Run Configuration for the automation script

* Randomize POSTGRES_PASSWORD in ./envs/(.local|.production)/.postgres

* Default POSTGRES_PASSWORD and POSTGRES_USER to random values

* Fix jinja linebreaks in local.yml

* Spaces in production.yml

* Fix post-merge leftovers & set DJANGO_ADMIN_URL automatically

* Prettify here and there

* Fix FileNotFoundError

* Leave a TODO in post_gen_hook.py

* Introduce keep_local_envs_in_vcs option

* Remove envs when not opted for

* Inline pre_gen_project.py if-condition

* Get rid of PROJECT_DIR_PATH in post_gen_project.py

* Clean up the docs

* Match copyright notices

* Document envs ins and outs
2018-03-08 15:56:15 +03:00
Malik S
6c8538abfe Add all internal IPs for multiple docker networks (#1520)
* Add all internal IPs for multiple docker networks

When developing with modified docker-compose.yml that contains multiple
network definitions, all networks gateways of the created container
should be added to INTERNAL_IPS, otherwise Django-Debug-Toolbar will not
work.

* Add @flyudvik to contributors
2018-03-08 15:54:24 +03:00
pyup.io bot
0bd019deb0 Update django-extensions from 2.0.0 to 2.0.2 (#1556) 2018-03-07 17:15:15 +03:00
Nikita P. Shupeyko
6574abb141 Clean up requirements.txt 2018-03-07 17:06:29 +03:00
Wan Liuyang
9cb7e50b8e Convert old-styled string formatting to f-string (#1528)
* Convert old-styled string formatting to f-string

* Update flake8 explicit version to 3.5.0

* Make tox.ini in sync with requirements.txt

* Fix annoying flake8 F405
2018-03-06 19:56:27 +03:00
Nikita P. Shupeyko
ee04c5cf09 noqa F401 in users apps.py 2018-03-06 19:54:20 +03:00
Eric Groom
f67f37a463 update grunt-sass to latest version (#1544)
* update grunt-sass

* add to contributors

* update gulp deps

* update grunt deps

* add convenience run script to grunt and gulp configurations
2018-03-06 19:46:21 +03:00
pyup.io bot
218a79e16a Update django from 2.0.2 to 2.0.3 (#1551) 2018-03-06 19:44:43 +03:00
Daniel Roy Greenfeld
7bc5d1408c
Make registration of signals easier for users 2018-03-06 10:52:45 -05:00
Nikita Shupeyko
d2791b019a
Prettify and re-order settings entries (#1550)
* Prettify and re-order settings entries

* Use old-style .format() for the time being

* Remove redundant linebreaks at the settings files' beginning

* Fix E303 too many blank lines

* Remove a redundant linebreak from requirements.txt

* Some linebreake juggling in config.settings.base
2018-03-06 14:28:25 +03:00
Nikita P. Shupeyko
5380117181 Uninstall wheel
Closes #1095.
2018-03-06 14:27:13 +03:00
Bruno Alla
078041cdb1
Merge pull request #1545 from browniebroke/simplify-environment
Simplify Mailgun settings
2018-03-06 10:30:42 +00:00
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