Commit Graph

6675 Commits

Author SHA1 Message Date
Bruno Alla
020f69c410
Merge pull request #1574 from joseGabriel06/patch-1
Local
2018-03-16 21:07:34 +00:00
jose Gabriel Guzman Lopez
0601a1b858
Local
add  "127.0.0.1"
2018-03-16 11:35:39 -05:00
Fábio C. Barrionuevo da Luz
7100cff18a
Merge pull request #1572 from pydanny/pyup-update-django-extensions-2.0.5-to-2.0.6
Update django-extensions to 2.0.6
2018-03-15 18:44:13 -03:00
pyup-bot
f3d0c6baf0 Update django-extensions from 2.0.5 to 2.0.6 2018-03-15 16:28:44 -05:00
Wan Liuyang
4191e85107
Add @sfdye to core team 2018-03-15 12:16:18 +08:00
Nikita Shupeyko
bcd0a8c46e
Fix & improve PostgreSQL backup/restore scripts (#1571)
* Fix & imporve postgres backup/restore scripts

* Update PostgreSQL backup/restore docs

* Fix postgres Dockerfile regression

* Extend error messages in PostgreSQL maintenance scipts
2018-03-14 13:44:16 +03:00
Daniel Roy Greenfeld
b32fd78012
Update base.py 2018-03-13 22:21:01 -05:00
Daniel Roy Greenfeld
19501ef26b
Adding DRF 2018-03-13 22:17:46 -05:00
Daniel Roy Greenfeld
c06ce847b3
Added DRF 2018-03-13 22:13:36 -05:00
Nikita P. Shupeyko
edef0167fe Gitignore MailHog in template 2018-03-11 12:21:49 +03:00
pyup.io bot
09af25547b Update django-extensions from 2.0.3 to 2.0.5 (#1568) 2018-03-11 11:33:10 +03:00
Nikita P. Shupeyko
a31f5090d1 Update the docs 2018-03-09 21:55:30 +03:00
pyup.io bot
05e97777e2 Update django-crispy-forms from 1.7.1 to 1.7.2 (#1567) 2018-03-09 19:21:40 +03:00
Nikita P. Shupeyko
57761e77b3 Fix .envs in template's .gitignore
Fix #1565.
2018-03-09 17:36:11 +03:00
Nikita P. Shupeyko
9cd0ee0272 Document merge_production_dotenvs_in_dotenv.py usage 2018-03-09 13:16:56 +03:00
Nikita P. Shupeyko
3e2bf3f701 Prettify template's pytest.ini 2018-03-09 13:06:45 +03:00
Nikita Shupeyko
b2a6b9a511
Prettify generated project requirements (#1557)
* Prettify base.txt

* Prettify local.txt

* Get rid of test.txt

Rationale: it effectively a duplicate of what's in local.txt

* Prettify production.txt
2018-03-09 12:57:32 +03:00
Nikita P. Shupeyko
e1bce92ad9 apk add postgresql-client with django Dockerfile 2018-03-09 11:41:02 +03:00
pyup.io bot
f3dc7898e9 Update django-anymail from 1.4 to 2.0 (#1564) 2018-03-09 10:54:56 +03:00
Nikita P. Shupeyko
a72383a851 FIx WEB_CONCURRENCY environment variable missing
Fixes #1562.
2018-03-08 22:40:22 +03:00
Nikita P. Shupeyko
b15b63b67d Put @webyneter's first and last names in the proper order 2018-03-08 21:45:16 +03:00
Nikita P. Shupeyko
03ee6c78d6 Fix CELERY_BROKER_URL overriden in entrypoint.sh
Closes #1235.
2018-03-08 19:04:10 +03:00
Nikita P. Shupeyko
5543359382 Distinguish between POSTGRES_DB and POSTGRES_USER
Closes #1301.
2018-03-08 19:04:10 +03:00
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