Commit Graph

128 Commits

Author SHA1 Message Date
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
keithjeb
aea5c807f6 Change eager celery setting in local Docker (#1945)
[//]: # (Thank you for helping us out: your efforts mean great deal to the project and the community as a whole!)

[//]: # (Before you proceed:)

[//]: # (1. Make sure to add yourself to `CONTRIBUTORS.rst` through this PR provided you're contributing here for the first time)
[//]: # (2. Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)


## Description

[//]: # (What's it you're proposing?)

Added a note around CELERY_TASK_ALWAYS_EAGER = True in docker config for local development. This causes tasks to be executed on the 'main' thread rather than by the workers. I understand why that might be desirable, but thought it worth calling out incase (like me) it makes people think something is broken.


## Rationale

[//]: # (Why does the project need that?)

Ease of use/troubleshooting


## Use case(s) / visualization(s)

[//]: # ("Better to see something once than to hear about it a thousand times.")
2019-03-02 13:51:30 +00:00
Anna Sidwell
17a9632031 Add my name to contributors 2019-02-23 18:57:42 +11:00
Anuj
e2a1189de1 Added to contributors.rst 2018-12-18 17:11:44 +05:30
Tubo Shi
d884f4540d added to contributor.rst 2018-11-30 18:23:07 +13:00
Bruno Alla
6e85ee4aa9
Merge pull request #1869 from Egregors/master
Pinning redis version to >=2.10.6, <3
2018-11-20 16:17:38 +00:00
Bruno Alla
5b60dd67d8
Merge pull request #1830 from cmackenzie1/patch-1
Remove requirements.txt file from delete list.
2018-11-19 18:59:16 +00:00
Vadim Iskuchekov
d1ee17afb9
Update CONTRIBUTORS.rst 2018-11-18 17:09:31 +01:00
canonnervio
197ab7f36e Modified command for Windows users (#1850)
* Modified command for Windows users

Added comment to use double quotes for heroku pg:backups setup under Windows.

* Added name to list
2018-11-17 09:59:38 +00:00
Peter Coles
4e39a9f8f0 strip dots in default project_slug (#1865)
This removes periods from the auto-generated project_slug (and also runs trim for good measure). Otherwise if you have a "." in your project name (e.g., you used a website domain name as your project name), you will encounter an error about it failing for a `project_slug.isidentifier()` check.

Update: changed "." to be replace with "_" instead of "", per request from @webyneter
2018-11-14 19:23:30 +00:00
Carl Johnson
65a506a945 Contributors: Add Carl Johnson 2018-11-12 15:09:04 -05:00
Leo Zhou
8217ea439b Config celery app immediately after the app being created, otherwise it is too late. 2018-11-12 17:59:26 +08:00
Davit Tovmasyan
6cb59c6ca4 Keep ipython history (#1836) 2018-10-24 13:37:15 +03:00
Jerome Leclanche
9d4566e52c Add Postgres 10.5 version support 2018-10-24 12:39:27 +03:00
Cole Mackenzie
00177b838f
Update CONTRIBUTORS.rst 2018-10-10 21:42:23 -06:00
Umair Ashraf
18ada469de added myself to contributors 2018-09-12 13:57:11 -04:00
Irfan
5427538dc7 Fix contributer github link 2018-09-01 11:55:31 +05:00
Irfan
27ae9c36e4 Fix #1771: Use full-fledge S3 Storage class in production settings
sorl-thumbnail serialized and deserializes the storage class and during this
process location parameter is lost if factory is used. Using a full-fledge
storage class fixes this issue.

See: https://stackoverflow.com/a/18046120/104731
2018-09-01 11:49:01 +05:00
Diane DeMers Chen
0a858bf512 Add note about using keep_local_envs_in_vcs (#1735)
* Add note about using keep_local_envs_in_vcs

As a newbie, I wasn't sure about `keep_local_envs_in_vcs`, so I said yes, and when CC was building, it gave me the message: 
"[INFO]: .env(s) are only utilized when Docker Compose and/or Heroku support is enabled so keeping them does not make sense given your current setup." 
Seems like it could go in this documentation, and make things easier for newbies.

* Add me to CONTRIBUTORS.RST
2018-08-13 15:57:28 +03:00
John Cass
61be16a867 Update test coverage command for usage with py.test. 2018-07-18 17:15:44 +02:00
Bruno Alla
95ee1f159d
Merge pull request #1717 from hendrikschneider/master
removed default action from project.js #1716
2018-07-17 15:47:22 +01:00
Mateusz Ostaszewski
80f6b1958e Update bootstrap to 4.1.1 (#1697)
* Update Bootstrap to 4.1.1

* Add myself to contributors
2018-07-12 12:35:28 +03:00
Hendrik Schneider
a03db9396c
Update CONTRIBUTORS.rst 2018-07-10 22:26:10 +00:00
Denis
548a92a939
Update CONTRIBUTORS.rst 2018-06-24 02:36:43 +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
msaizar
225aca189c Added articles to README.rst (#1659)
* Added articles to README.rst

* Updated CONTRIBUTORS.rst
2018-05-27 20:12:56 +03:00
saschalalala
6d4be405d8 Migrate to Django2 path urls (#1637)
* Change users urls to Django 2 paths

* Change config urls to Django 2 paths

* Change admin url setting to Django 2 path syntax

* Replace more admin urls

* Add myself to contributors.rst
2018-05-14 10:09:24 +03:00
Wan Liuyang
4191e85107
Add @sfdye to core team 2018-03-15 12:16:18 +08:00
Nikita P. Shupeyko
b15b63b67d Put @webyneter's first and last names in the proper order 2018-03-08 21:45:16 +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
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
adammsteele
ed2204ecba Celery config - json serialization by default (#1535)
* Use json serialization in celery by default

* Added myself to CONTRIBUTORS.rst
2018-03-01 14:25:33 +03:00
Bruno Alla
a191f54c9b Fix a few broken links in the contributors list 2018-02-02 19:18:06 +00:00
Bruno Alla
e0ac7f9b73 Adding myself to the core developers list (#1475) 2018-02-02 11:04:24 -08:00
Pierre Chiquet
d2dd265a99 Fix MediaRootS3BotoStorage: do not override existing files (#1367)
* Fix MediaRootS3BotoStorage: do not override existing files

see https://github.com/jschneier/django-storages/issues/50

* Update "other contributors"

* alphabetical order
2017-12-13 16:06:48 +03:00
Charlie Smith
cda6878486 More inline docs for DATABASES variable (#1350)
* More inline docs for DATABASES variable

Use of database url is not part of Django, but comes from django-environ. Was initially confusing where feature came from, as link points to offical django docs.

* Contributors update
2017-09-30 15:18:55 +03:00
Reggie Riser
874caee360 Removed references and old CSS specific to Bootstrap alpha. (#1333)
* Removed references and old CSS specific to Bootstrap alpha.

* Fixed Bootstrap alpha reference in README.
2017-09-18 10:44:16 +03:00
Arcuri Davide
433eef62e4 Update bootstrap to 4.0.0-beta (#1319)
* Update bootstrap to 4.0.0-beta

Update cdn link for js and css.
Fixed class names for navbar -https://medium.com/@lukaszholeczek/how-to-upgrade-bootstrap-4-alpha-6-to-bootstrap-4-beta-d43b4210f2a3

* Updated CONTRIBUTORS.rst

Updated CONTRIBUTORS.rst
2017-09-05 15:21:25 +03:00
Wan Liuyang
c50c6a73be Rename Dockerfile-dev to Dockerfile-local (#1305)
* Rename Dockerfile-dev to Dockerfile-local

* Add @sfdye to CONTRIBUTORS.rst
2017-08-28 11:00:59 +03:00
Bruno Alla
4e9f18b52d Add @browniebroke to CONTRIBUTORS.rst 2017-08-02 00:51:31 +01:00
Shupeyko Nikita
fe903e5c14 Fix docs erros/typos (#1264)
* Fix #.1

* Fix #.2

[Running management commands: "docker-compose -f production.yml run" to "docker-compose -f local.yml run'](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html#running-management-commands).

* Fix #.3

Designate @bertdemiranda as a contributor (#1242).
2017-07-31 13:27:58 +03:00
Hamish Durkin
afb6b79fc3 Updated idea run configurations to work as explained in the docs (#1223) 2017-07-09 16:04:27 +03:00
Ben Warren
4aff5971d1 Automatic recompilation of Bootstrap with user-defined variables (#1181)
Allow for dynamic bootstrap compilation

Exclude sublime artifacts

Make custom bootstrap vars file

Add custom bootstrap compilation

Add cookiecutter option

Use the right name for the file

Add explanation to generated README

Add self to contributors

Remove sublime exclusion
2017-06-12 19:38:00 +03:00
Daniel Roy Greenfeld
fc2b861f6c Update CONTRIBUTORS.rst 2017-04-17 10:07:32 -07:00
Daniel Roy Greenfeld
adc8912339 Added @webyneter as a core contributor 2017-04-17 10:07:13 -07:00
William Archinal
f3ea2570ab Use Argon2 password hashing algorithm by default (#1079) 2017-03-16 19:19:42 -07:00