cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-12-02 22:44:09 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,773 Commits 13 Branches 587 Tags 25 MiB
ae27ef3fae
Commit Graph

2773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita P. Shupeyko
ac61117b59 Prevent AWS S3 bucket from being created automatically 
Rationale: most of the time you want to create a bucket yourself in order to assign/tweak polices etc.
 2018-06-28 16:35:35 +03:00
Fábio C. Barrionuevo da Luz
b8e5896133
Merge pull request #1698 from pydanny/remove-inline-comments 
remove inline comments of on heroku tutorial
 2018-06-28 09:23:13 -03:00
Fábio C. Barrionuevo da Luz
49c73feebb
remove inline comments of on heroku tutorial 2018-06-28 09:00:53 -03:00
Demetris Stavrou
2afc80ea2b Rebased 2018-06-28 00:39:12 +03:00
Demetris Stavrou
2c56b2e0e3 Added CELERY_BROKER_URL back to entrypoint and surrounded it with a conditional 2018-06-28 00:30:23 +03:00
Demetris Stavrou
7c69704f9f Moved CELERY_BROKER_URL definition to .django env file to resolve error when Celery is not used (PR #1693) 2018-06-28 00:30:23 +03:00
Demetris Stavrou
d79f122bc9 Redis config in local is now conditional on Celery. 2018-06-28 00:27:22 +03:00
Demetris Stavrou
c3026e7dfb Added CELERY_BROKER_URL back to entrypoint and surrounded it with a conditional 2018-06-27 23:36:06 +03:00
Nikita P. Shupeyko
3ac9902670 Rename project template Docker Compose volumes 
Rationale: consistent image, volume etc. naming conventions
 2018-06-27 19:52:06 +03:00
Nikita P. Shupeyko
0a9c0cb06a Upgrade Docker Compose project template configs to version 3 2018-06-27 19:45:36 +03:00
Nikita Shupeyko
8ad7adb11a
Re-write users app tests in pytest style & perform minor refactoring (#1680) 2018-06-27 19:33:38 +03:00
Nikita Shupeyko
275c13292c
Integrate Flower with Docker Compose setup (#1655) 
* Integrate Flower with Docker Compose setup locally

* Remove alien worker celeryd option

* Move Flower COPY section below the worker's

* Remove set -o pipefail command from Flower start script

* Flower client authentication

* Override flower service image name

* Move flower service to the end of local.yml

* Install flower==0.9.2 in all environments

* Introduce production flower service

* Fix local flower start script

* Document Flower integration

* Prettify *.django envs

Rationale: consistency.

* Reference local environment Flower docs from the production's

* 'two more services' -> 'three more services'
 2018-06-27 19:33:21 +03:00
Bruno Alla
a183a8181d
Merge pull request #1694 from delneg/patch-2 
Make 'duplicate_username' message translatable
 2018-06-26 10:20:27 +02:00
pyup.io bot
eb0297aeb3 Update django-environ from 0.4.4 to 0.4.5 (#1695) 2018-06-26 10:53:36 +03:00
Denis
2a7ab8be2f
Try to fix flake8 2018-06-25 21:08:33 +03:00
Denis
548a92a939
Update CONTRIBUTORS.rst 2018-06-24 02:36:43 +03:00
Denis
0d1cfe548c
Make 'duplicate_username' message translatable 
Added ugettext_lazy and used it on the 'duplicate_username' message
 2018-06-24 02:34:08 +03:00
Demetris Stavrou
184db8273f Rebased to resolve conficts 2018-06-22 17:55:09 +03:00
Demetris Stavrou
065becf277 Moved CELERY_BROKER_URL definition to .django env file to resolve error when Celery is not used (PR #1693) 2018-06-22 17:48:04 +03:00
Demetris Stavrou
72893b1d06 Redis config in local is now conditional on Celery. 2018-06-22 17:46:21 +03:00
Demetris Stavrou
6f638078eb Moved CELERY_BROKER_URL definition to .django env file to resolve error when Celery is not used (PR #1693) 2018-06-22 17:32:10 +03:00
pyup.io bot
ee2bb3f2ef Update pytest-django to 3.3.2 (#1692) 
This PR updates [pytest-django](https://pypi.org/project/pytest-django) from **3.3.0** to **3.3.2**.



<details>
  <summary>Changelog</summary>
  
  
   ### 3.3.1
   ```
   ------------------

Bug fixes
^^^^^^^^^

* Fixed test for classmethod with Django TestCases again (618,
  introduced in 598 (3.3.0)).

Compatibility
^^^^^^^^^^^^^

* Support Django 2.1 (no changes necessary) (614).
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/pytest-django
  - Changelog: https://pyup.io/changelogs/pytest-django/
  - Docs: https://pytest-django.readthedocs.io/
</details>
 2018-06-22 08:50:02 +08:00
Demetris Stavrou
867e2ad629 Redis config in local is now conditional on Celery. 2018-06-21 23:11:08 +03:00
Denis Orehovsky
83b5f00ac5 Add celery prefix for configuration (#1676) 
* Add celery prefix for configuration

* Update CONTRIBUTORS.rst
 2018-06-21 19:39:19 +00:00
Nikita Shupeyko
07060eaecc
Extend & enhance Celery configuration (#1679) 
* CELERY_TASK_TIME_LIMIT

* CELERY_TASK_SOFT_TIME_LIMIT

* CELERY_ALWAYS_EAGER -> CELERY_TASK_ALWAYS_EAGER

* CELERY_EAGER_PROPAGATES = CELERY_TASK_ALWAYS_EAGER

Addresses https://github.com/pydanny/cookiecutter-django/pull/1446/files#r167238808

* CELERY_RESULT_BACKEND = CELERY_BROKER_URL always

* CELERY_TIMEZONE = TIME_ZONE

* CELERY_TASK_EAGER_PROPAGATES = True

* Name task limit settings appropriately

CELERY_TASK_TIME_LIMIT -> CELERYD_TASK_TIME_LIMIT, CELERY_TASK_SOFT_TIME_LIMIT -> CELERYD_TASK_SOFT_TIME_LIMIT
 2018-06-21 19:38:48 +00:00
Wan Liuyang
5309fbf5e7
Upgrade celery to 4.2 (#1446) 
* Update celery to 4.1.0

* Re-add endif closing block

* Update local.py

* Update base.txt

* Update local.py
 2018-06-21 14:53:04 +08:00
pyup.io bot
75a0699848 Update pytest to 3.6.2 (#1690) 
This PR updates [pytest](https://pypi.org/project/pytest) from **3.6.1** to **3.6.2**.



*The bot wasn't able to find a changelog for this release. [Got an idea?](https://github.com/pyupio/changelogs/issues/new)*

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/pytest
  - Changelog: https://pyup.io/changelogs/pytest/
  - Repo: https://github.com/pytest-dev/pytest/issues
  - Homepage: http://pytest.org
</details>
 2018-06-21 11:00:47 +08:00
pyup.io bot
f3d76a4134 Update celery from 3.1.25 to 3.1.26.post2 (#1683) 2018-06-19 01:07:14 +03:00
Fábio C. Barrionuevo da Luz
a671f4bee3
Merge pull request #1688 from pydanny/pyup-update-psycopg2-binary-2.7.4-to-2.7.5 
Update psycopg2-binary to 2.7.5
 2018-06-17 19:31:54 -03:00
pyup-bot
24a7e535c6 Update psycopg2-binary from 2.7.4 to 2.7.5 2018-06-17 12:36:30 -07:00
Bruno Alla
c6c8ca953a Remove entry from other .gitignore causing compose/local to match 2018-06-16 15:07:40 +01:00
Bruno Alla
16c4e31d0e
Merge pull request #1684 from pydanny/pyup-update-django-test-plus-1.0.22-to-1.1.0 
Update django-test-plus to 1.1.0
 2018-06-15 22:44:30 +01:00
Bruno Alla
fa5c770920
Merge pull request #1685 from pydanny/pyup-update-pytest-django-3.2.1-to-3.3.0 
Update pytest-django to 3.3.0
 2018-06-15 22:44:03 +01:00
pyup-bot
cec06b2d81 Update pytest-django from 3.2.1 to 3.3.0 2018-06-15 14:20:32 -07:00
pyup-bot
a9db5b0982 Update django-test-plus from 1.0.22 to 1.1.0 2018-06-15 14:20:28 -07:00
Bruno Alla
ddfed26f3d
Merge pull request #1682 from pydanny/fix/gitignore-local-compose 
Remove entry from .gitignore causing compose/local to match
 2018-06-15 14:41:07 +01:00
Bruno Alla
636b5f361d Remove entry from .gitignore causing compose/local to match 2018-06-15 12:10:27 +01:00
Nikita P. Shupeyko
75c423c88e Update @pydanny and @webyneter bios 2018-06-12 13:56:23 +03:00
Nikita P. Shupeyko
7d7eb78773 Remove duplicate Docker Compose service configuration 
Rationale: those sections will always be there thanks to inheritance
 2018-06-09 14:59:30 +03:00
Nikita P. Shupeyko
911e822e85 Gitignore .pytest_cache/ in project template 2018-06-06 09:40:24 +03:00
pyup.io bot
0ff3236ce4 Update pytest to 3.6.1 (#1675) 
* Update pytest from 3.6.0 to 3.6.1

* Update pytest from 3.6.0 to 3.6.1
 2018-06-06 09:38:28 +03:00
Nikita P. Shupeyko
d8526d1b2d Unset -o xtrace in compose start scripts 2018-06-05 12:28:11 +03:00
Nikita P. Shupeyko
27cf4f01da Upgrade postgres to 10.4 
Closes #1669.
 2018-06-05 12:23:06 +03:00
Nikita P. Shupeyko
c812e01fc5 Rename UsersConfig to UsersAppConfig 2018-06-05 12:18:35 +03:00
Nikita P. Shupeyko
95d218e3e4 Rename CeleryConfig to CeleryAppConfig 2018-06-05 12:18:07 +03:00
Nikita P. Shupeyko
f25492d74f Clean up .travis.yml 2018-06-05 12:17:47 +03:00
Nikita P. Shupeyko
5b5ad0e4fc Fix Py.Test unittests fail on new cookie 
Fixes #1674
 2018-06-05 12:13:50 +03:00
Fábio C. Barrionuevo da Luz
c951ac6392
Merge pull request #1671 from pydanny/pyup-update-django-2.0.5-to-2.0.6 
Update django to 2.0.6
 2018-06-01 20:15:37 -03:00
pyup-bot
77f87c4532 Update django from 2.0.5 to 2.0.6 2018-06-01 15:16:03 -07:00
pyup.io bot
cff7111edb Update django-anymail from 2.2 to 3.0 (#1668) 2018-05-31 16:14:37 +03:00