Commit Graph

3843 Commits

Author SHA1 Message Date
Bruno Alla
d49fa9c879
Merge pull request #2454 from reyesvicente/patch-2
Update CONTRIBUTORS.rst
2020-02-19 23:42:26 +00:00
Cole Maclean
e8b36af72f Remove coreapi requirement 2020-02-19 13:13:10 -08:00
Vicente G. Reyes
161d8bcf9e
Update CONTRIBUTORS.rst
fixed conflict
2020-02-20 02:39:21 +08:00
Bruno Alla
41719fc061
Merge pull request #2453 from reyesvicente/patch-1
Update README.rst
2020-02-19 18:31:24 +00:00
Vicente G. Reyes
d1c417b63d
Update CONTRIBUTORS.rst
added myself
2020-02-20 02:06:20 +08:00
Vicente G. Reyes
2fb739fed2
Update README.rst
Update command $ pip install "cookiecutter>=1.7.0" on docs
2020-02-20 02:02:48 +08:00
Bruno Alla
9903eb3c3d
Merge pull request #2452 from pydanny/pyup-update-pre-commit-2.0.1-to-2.1.0
Update pre-commit to 2.1.0
2020-02-19 13:12:45 +00:00
Bruno Alla
3ffe1ec9b0
Merge pull request #2451 from pydanny/pyup-update-sphinx-2.4.1-to-2.4.2
Update sphinx to 2.4.2
2020-02-19 13:12:31 +00:00
Bruno Alla
77e5f38d5e
Merge pull request #2450 from pydanny/pyup-update-pytest_cases-1.12.1-to-1.12.2
Update pytest_cases to 1.12.2
2020-02-19 13:12:18 +00:00
browniebroke
d5edf1fa4d Update pre-commit from 2.0.1 to 2.1.0 2020-02-19 11:00:39 +00:00
browniebroke
15e8e667e5 Update sphinx from 2.4.1 to 2.4.2 2020-02-19 11:00:36 +00:00
browniebroke
b84017a8a8 Update pytest_cases from 1.12.1 to 1.12.2 2020-02-19 11:00:32 +00:00
Demetris Stavrou
c6026bbc4d Merge branch 'master' of github.com:demestav/cookiecutter-django 2020-02-18 11:01:59 +02:00
Demetris Stavrou
1a7bcccd94 Added celery cookiecutter condition in Traefik configuration 2020-02-18 11:01:56 +02:00
Bruno Alla
61786f12f9
Merge pull request #2448 from pydanny/pyup-update-collectfast-1.3.1-to-1.3.2
Update collectfast to 1.3.2
2020-02-17 11:54:20 +00:00
Bruno Alla
9478416143
Merge pull request #2447 from pydanny/pyup-update-tox-3.14.4-to-3.14.5
Update tox to 3.14.5
2020-02-17 11:53:35 +00:00
browniebroke
10be405c89 Update collectfast from 1.3.1 to 1.3.2 2020-02-17 11:00:34 +00:00
pyup-bot
a857038e13 Update tox from 3.14.4 to 3.14.5 2020-02-17 02:52:00 -08:00
Bruno Alla
39a5d2d58a
Merge pull request #2443 from pydanny/pyup-update-sphinx-2.4.0-to-2.4.1
Update sphinx to 2.4.1
2020-02-17 10:51:50 +00:00
Bruno Alla
438c95560c
Merge pull request #2446 from pydanny/pyup-update-pytest-cookies-0.5.0-to-0.5.1
Update pytest-cookies to 0.5.1
2020-02-14 17:04:26 +00:00
pyup-bot
8c945af82a Update pytest-cookies from 0.5.0 to 0.5.1 2020-02-14 08:34:04 -08:00
Bruno Alla
42f2da08d2
Merge pull request #2445 from pydanny/pyup-update-tox-3.14.3-to-3.14.4
Update tox to 3.14.4
2020-02-14 08:32:23 +00:00
pyup-bot
b64cb03b17 Update tox from 3.14.3 to 3.14.4 2020-02-13 16:59:38 -08:00
browniebroke
a8e668d659 Update sphinx from 2.4.0 to 2.4.1 2020-02-12 11:00:32 +00:00
Bruno Alla
03ce9ebf01
Merge pull request #2437 from pydanny/pyup-update-werkzeug-0.16.1-to-1.0.0
Update werkzeug to 1.0.0
2020-02-11 12:10:47 +00:00
Bruno Alla
8843d95485
Merge pull request #2441 from pydanny/pyup-update-django-extensions-2.2.6-to-2.2.8
Update django-extensions to 2.2.8
2020-02-11 11:54:06 +00:00
Bruno Alla
8643ebf1f0
Merge pull request #2439 from pydanny/pyup-update-sphinx-2.3.1-to-2.4.0
Update sphinx to 2.4.0
2020-02-11 11:13:27 +00:00
browniebroke
311e0dfc24 Update django-extensions from 2.2.6 to 2.2.8 2020-02-11 11:00:30 +00:00
browniebroke
be019ea54a Update sphinx from 2.3.1 to 2.4.0 2020-02-09 11:00:30 +00:00
browniebroke
816fb1c44b Update werkzeug from 0.16.1 to 1.0.0 2020-02-07 11:00:30 +00:00
Andrew-Chen-Wang
c839862aef Testing mail service does not raise KeyError
* KeyError raised when cloud_provider was used twice in mark parametrization.
* Tox isn't working properly for me (collecting 17,000 files; obviously neglecting tox.ini and/or pytest.ini)
2020-02-06 22:12:30 -05:00
Andrew-Chen-Wang
0df8cfdb90 Added mail service pytests in test_cookiecutter_generation.py 2020-02-06 21:03:49 -05:00
Andrew-Chen-Wang
ac884f3f75 Updated mail service docs
* Trying to appease the Black-linter god...
2020-02-06 20:18:49 -05:00
Andrew-Chen-Wang
0621929cd2 Removed None option for mail service
* This is necessary in order to be compatible with Django-allauth
2020-02-06 18:41:30 -05:00
Andrew-Chen-Wang
fecf9e0037 Add @Andrew-Chen-Wang to CONTRIBUTORS 2020-02-06 16:59:42 -05:00
Andrew-Chen-Wang
c8eb5462eb Configurations and Packages added
* Production settings updated for all
* Added env vars from production settings
* Added packages requirements.txt
2020-02-06 16:58:15 -05:00
Andrew-Chen-Wang
575dead7cb More concise cookiecutter.json; removed several if statements
* Unfortunately, with https://github.com/pydanny/cookiecutter-django/pull/2321#issuecomment-558796906, I don't think I am going to add AWS SES specifically if AWS is not chosen as cloud provider. In that case, we'll just deal with 2 None's when AWS is not selected.
* FIXME 2 Nones
2020-02-06 16:00:32 -05:00
Andrew-Chen-Wang
b7d3379f44 Fixes the duplicate None in cookiecutter.json
* The duplicate occurs if AWS is not the selected cloud provider
2020-02-06 15:36:51 -05:00
Andrew-Chen-Wang
6709fc64c9 Added all supported Anymail Providers in cookiecutter.json
* Utilizes {% if %} since it's financially more wise to use AWS SES only if AWS is the cloud provider.
* FIXME: If AWS is not cloud provider, there are two None options. This may require a little hack inside of cookiecutter that I may not be aware of.
2020-02-06 15:17:46 -05:00
Bruno Alla
642a92a9ae
Merge pull request #2434 from xpostudio4/patch-2
Include `use_drf` option on project generation Options
2020-02-06 10:40:12 +00:00
Leonardo
45c353241b
Include use_drf option on documentation 2020-02-06 05:37:31 -04:00
Demetris Stavrou
25a70c5b84 Added Flower access documentation for production. 2020-02-04 22:47:56 +02:00
Demetris Stavrou
86c9b3cb28 Flower now served by Traefik 2020-02-04 15:04:47 +02:00
Bruno Alla
db120ab3bd
Merge pull request #2432 from pydanny/pyup-update-django-storages-1.9-to-1.9.1
Update django-storages to 1.9.1
2020-02-04 12:04:41 +00:00
browniebroke
c7a6dbdd10 Update django-storages from 1.9 to 1.9.1 2020-02-04 11:00:31 +00:00
browniebroke
e9c6b3d9e9 Update django-storages from 1.9 to 1.9.1 2020-02-04 11:00:30 +00:00
Bruno Alla
8fd0d42de0 Don't include POSTGRES_... environment in the PyCharm start script when not using Docker 2020-02-03 14:29:20 +00:00
Bruno Alla
30f3f05a76
Merge pull request #2430 from pydanny/pyup-update-django-storages-1.8-to-1.9
Update django-storages to 1.9
2020-02-03 13:10:56 +00:00
Bruno Alla
434e95a8df Merge branch 'pytest-cases-fixture-plus' 2020-02-03 12:57:15 +00:00
Bruno Alla
37ec5a45bb Remove pyup filter 2020-02-03 12:56:37 +00:00