cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-20 08:36:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,344 Commits 14 Branches 579 Tags 24 MiB
d8ade3be0d
Commit Graph

7344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita P. Shupeyko
ae9dc2e782 Distinguish between local and production compose services 
Rationale: 
1. building production stack on the same machine with local doesn't lead to conflicts anymore;
2. production and local service images are now clearly distinguished by name.
 2018-04-04 13:38:57 +03:00
Nikita P. Shupeyko
2fa5adc2b0 Designate 'postgres' as a variable in entrypoint.sh 
Rationale: clarity.
 2018-04-04 11:43:39 +03:00
Nikita P. Shupeyko
897d54b690 Alter Dockerfile comment url to point at dev Django 2018-04-04 11:16:11 +03:00
Nikita P. Shupeyko
34673ff686 Merge .celery envs file with .django 
Rationale: workflow simplification.
 2018-04-04 10:52:16 +03:00
Nikita P. Shupeyko
418b53bf77 Rename use_sentry_for_error_reporting to use_sentry 
Rationale: consistency
 2018-04-03 12:12:26 +03:00
pyup.io bot
53186d2697 Update django from 2.0.3 to 2.0.4 (#1593) 2018-04-03 10:46:34 +03:00
pyup.io bot
7465c3a8a8 Update tox from 2.9.1 to 3.0.0 (#1591) 2018-04-03 09:51:17 +08:00
pyup.io bot
3c3d5914d2 Update pillow to 5.1.0 (#1592) 2018-04-03 09:50:34 +08:00
Nikita P. Shupeyko
bf089fd2b6 Fix celery services exit with status code 2 
Fixes #1588.
 2018-03-28 18:18:26 +03:00
Nikita Shupeyko
59cd5b4849
Celery code blocks are still generated even though Celery is not opted out for (#1587) 
* Celery jinja condition in .gitignore

* Celery jinja conditions in Django Dockerfiles

* Re-phrase Django Dockerfile requirements comments

* Remove celery compose dirs through post_gen_project.py
 2018-03-27 18:40:44 +03:00
Bruno Alla
80ae32259c
Merge pull request #1584 from browniebroke/doc-mailgun-500 
Document server error when missing Mailgun config
 2018-03-27 10:04:56 +01:00
pyup.io bot
9c09675cb8 Update django-storages from 1.6.5 to 1.6.6 (#1585) 2018-03-27 11:43:29 +08:00
Bruno Alla
53623ae1fe Document server error when missing Mailgun config 
Fixes #789
 2018-03-26 23:31:10 +01:00
pyup.io bot
60ebda8bf7 Update sphinx from 1.7.1 to 1.7.2 (#1579) 2018-03-25 15:45:00 +03:00
pyup.io bot
3264e77696 Update pytest to 3.5.0 (#1580) 
* Update pytest from 3.4.2 to 3.5.0

* Update pytest from 3.4.2 to 3.5.0
 2018-03-25 15:30:58 +03:00
Wan Liuyang
d1198f63b1
Drop Opbeat (#1578) 2018-03-21 19:54:27 +08:00
pyup.io bot
f0175aa9be Update collectfast to 0.6.2 (#1575) 2018-03-17 22:29:44 +08:00
Daniel Roy Greenfeld
d6e0b95d81
Adding coreapi and moving DRF to end of base.txt 2018-03-17 06:58:16 -05:00
Bruno Alla
80618f0ace Install psycopg2-binary when not using docker locally (#1569) 
- The binary package should be installable on Windows locally
- The binary package is not recommended for Production, compile from
  source
 2018-03-16 16:32:43 -05:00
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