Commit Graph

173 Commits

Author SHA1 Message Date
Bruno Alla
3d58ffd4e7 Merge branch 'master' into drf-option-with-tests 2020-01-24 17:23:07 +00:00
Bruno Alla
f109e65816 Update list of contributors 2020-01-24 15:28:03 +00:00
Bruno Alla
e8fcf9ed60 Update list of contributors and changelog 2020-01-23 18:53:03 +00:00
Bruno Alla
949d8b684c Merge branch 'master' into drf-option-with-tests
# Conflicts:
#	hooks/post_gen_project.py
2020-01-23 14:41:42 +00:00
Bo
43601d805a
Update CONTRIBUTORS.rst 2020-01-14 08:49:33 -06:00
Bruno Alla
463c1f83e6
Update CONTRIBUTORS.rst 2020-01-13 17:51:50 +00:00
Bruno Alla
60bf49a10c
Update CONTRIBUTORS.rst 2020-01-13 12:40:32 +00:00
Bruno Alla
5d0b0a7fe3
Upgrade to Traefik v2 (#2338)
Upgrade to Traefik v2
2020-01-11 14:18:30 +00:00
Bruno Alla
3814fc7a3f Update contributors list 2020-01-11 13:45:37 +00:00
Denis Savran
c76b3066d6 Upgrade to Traefik v2 2019-11-29 21:35:40 +03:00
Harry Moreno
2a25e523e5 Add self to contributors.rst 2019-11-26 14:51:48 -05:00
Bruno Alla
d68db825e2
Add pre-commit for the generated project. (#2171) (#2295)
Add pre-commit for the generated project. (#2171)
2019-11-04 13:38:02 +01:00
Bruno Alla
cbbbf351d0
Update CONTRIBUTORS.rst 2019-11-04 12:34:43 +00:00
Bruce Olivier
04f3ae75dc Added more settings to .editorconfig to run isort and have black compatibility. 2019-11-02 16:55:18 -05:00
leollon
4a194c6966 Add pre-commit for the generated project. (#2171) 2019-10-29 22:48:39 +08:00
Yuchen Xie
400fcc4030 Prevent collectfast from guessing a wrong strategy
If `COLLECTFAST_STRATEGY` is not provided in `settings`, `collectfast` has to guess a "strategy". For the case with AWS, it guesses `BotoStrategy` in stead of `S3Boto3Storage`, which is a wrong decision as we `pip install django-storages[boto3]` (`boto3` in favor of `boto`).

Setting `COLLECTFAST_STRATEGY` is also encouraged as `collectfast` is not going to guess the strategy in the future.

Ref:
* f37dd1faa2/collectfast/management/commands/collectstatic.py (L33)
* f37dd1faa2/collectfast/strategies/base.py (L170)
2019-10-22 10:42:32 +08:00
Bruno Alla
703e8509aa Fix broken link in list of contributors 2019-10-06 11:09:13 +01:00
Bruno Alla
6a9feea2fe
Support python 3.7 (#2240)
Support python 3.7
2019-10-06 11:06:03 +01:00
Bruno Alla
99ccd314d0
Add missing link 2019-10-04 14:48:02 +01:00
Caio Ariede
f3b46ec425 Add to CONTRIBUTORS 2019-10-02 10:12:31 -03:00
Nicolas Stefani
51bf90cdca add name to contributors 2019-09-29 22:17:06 -03:00
Jerome Caisip
548417612f Additonal option to setup DRF. 2019-09-17 23:24:09 +08:00
Bruno Alla
eac8ae626a
Fix broken link 2019-07-17 15:52:46 +01:00
step21
525739dcb5
Update CONTRIBUTORS.rst 2019-07-17 16:19:11 +02:00
Bruno Alla
28ddd76b25 Fix missing link in contributors list 2019-07-12 12:06:19 +01:00
Bruno Alla
2c3ce19f4b Add 2O4 to list of contributors 2019-07-12 11:52:32 +01:00
Dani Hodovic
87a8acbae2
Remove redundant template debug setting
> 'debug': a boolean that turns on/off template debug mode. If it is
> True, the fancy error page will display a detailed report for any
> exception raised during template rendering. This report contains the
> relevant snippet of the template with the appropriate line highlighted.

> It defaults to the value of the DEBUG setting.

https://docs.djangoproject.com/en/2.2/topics/templates/#module-django.template.backends.django

I could be wrong about this, but it seems like setting the template
DEBUG setting is redundant, since it should follow whatever the DEBUG
variable is set to.
2019-06-20 23:41:31 +08:00
Tim Claessens
fe49871dc8 Fix link 2019-06-19 14:24:46 +02:00
Tim Claessens
07f9256a8b Sorting the links 2019-06-19 14:24:31 +02:00
Tim Claessens
b1135ccb25 Sorting the names (firstname, lastname) 2019-06-19 14:23:51 +02:00
Tim Claessens
13868c42c8 Add name to contributors 2019-06-19 09:46:24 +02:00
Bruno Alla
f3b85708c3
Sort contributors list 2019-06-15 11:31:13 +01:00
Bruno Alla
69fa490364
Add minho42 to contributors 2019-06-14 23:18:20 +01:00
Xaver Y.R. Chen
ef59ffad94 Update Travis config, using new xenial distribution to support the newer version of SQLite to satisfy the requirement of Django 2.2 2019-06-05 20:21:37 +08:00
Keyvan Mosharraf
915848e279 Add name to CONTRIBUTORS.rst 2019-05-30 03:34:57 -07:00
Curtis St Pierre
4bf795a908 1989 - reworked postgres version options 2019-05-20 08:53:07 -07:00
Matt Knapper
98012829f3 storageFile is deprecated, use storage instead 2019-05-18 10:10:45 -04:00
Tano Abeleyra
dc55a3cdd4 Add missing link in CONTRIBUTORS (#2058) 2019-05-17 08:18:41 +08:00
Tano Abeleyra
6d0d33865c Add myself as contributor and sort the list 2019-05-15 20:11:04 -03:00
Craig Margieson
1646daa277 Added link in contributors. 2019-05-06 15:30:02 +09:30
Craig Margieson
964662742a Add to contributors. 2019-05-06 15:10:18 +09:30
Vlad
c041453bef Updated project-generation-options.rst to provide helpful links in case a user needs to decide between AWS s3 and GCS and added myself to contributors.rst 2019-04-14 12:07:37 -05:00
Jelmert
d8271fae21 Added myself to CONTRIBUTORS.rst 2019-04-02 15:47:18 +02:00
hanasuhail
b261ce27c4 update restructured text link; add condition for celery linter 2019-03-25 15:52:49 -04:00
Hana Quadara
015319ca3f add username to contributors 2019-03-23 00:26:13 -04:00
Bruno Alla
f1def67b6d Fix broken links in list of contributors 2019-03-20 12:12:32 +00:00
Bruno Alla
b0cb86f282
Merge pull request #1958 from rolep/kombu-update
Redis and Kombu update
2019-03-20 12:08:41 +00:00
Demetris
b312d516a4 Replace Caddy with Traefik (#1714)
## Description

Replace Caddy with Traefik

## Rationale

There is some trouble with the Caddy license (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-329617536) 

@drdaeman suggested using Traefik (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-353655273) which supports ACME and also plays very nice with Docker.

## Comments

I am currently using the proposed setup on a live site and it working great so far. If this PR is of interest to the maintainers, then I could commit more changes and take care of the documentation. Of course, any suggestions by the more experienced people around here, are welcome!
2019-03-19 09:32:45 +00:00
Oleg Russkin
8ab63940ec Contributors: Add Oleg Russkin 2019-03-12 16:49:24 +02:00
btknu
6e72169ffe Add missing script key to Travis CI config (#1950)
* Add failing test for travis.yml

I see three options to test travis.yml :

1. Testing that the YAML contains relevant value. Least useful and least
reliable, but simplest to implement.

2. Testing that the YAML is valid TravisCI YAML. Unfortunately this is
difficult / impossible. Doing 'travis lint' would succeed, this command
does not check for 'script' key presence and wouldn't be useful for us.

We could use 'travis-build' to verify that the YAML can be converted to
a worker config, but as of now 'travis-build' doesn't work out of the
box.

There is a new tool for validating travis YAML files 'travis-yml', but
as of now it's a ruby-only library and it's still a work in progress.

3. Running Travis CI task based on the generated YAML. This seems the
best approach, however since cookiecutter-django itself uses Travis CI,
that would require running Travis CI from within Travis CI.

Scheduling Travis CI job without a github push still requires a public
github repo, which is something that we can't generate on demand.

Given that I'm opting to use approach 1.

* Adds missing config to generated .travis.yml

The keys added are as follows:

1. 'script'

Required by Travis, cookiecutter-django used to provide it until it has
been removed together with hitch.

I'm assuming hitch has been replaced with pytest, I'm setting pytest as
the new value for the 'script' key.

2. 'install'

Not required by Travis, but necessary in our case; installs test
libraries, mostly pytest.

As of now this points to 'local.txt' requirements file. There used to be
a separate 'test.txt' requirements file but it has been decided to merge
it with 'local.txt', see discussion in
https://github.com/pydanny/cookiecutter-django/pull/1557 .

* Update CONTRIBUTORS.rst
2019-03-05 22:10:45 -03:00