Commit Graph

950 Commits

Author SHA1 Message Date
browniebroke
7f3aa6cebb Update werkzeug from 0.15.0 to 0.15.1 2019-03-22 11:00:31 +00:00
Bruno Alla
9f9e2344b4
Merge branch 'master' into pyup-update-ipdb-0.11-to-0.12 2019-03-21 18:30:13 +00:00
Bruno Alla
cd4d70573b
Merge pull request #1985 from pydanny/pyup-update-black-18.9b0-to-19.3b0
Update black to 19.3b0
2019-03-21 18:29:33 +00:00
Bruno Alla
b9a9726e0f
Merge pull request #1987 from pydanny/pyup-update-pytest-django-3.4.7-to-3.4.8
Update pytest-django to 3.4.8
2019-03-21 17:59:18 +00:00
Bruno Alla
8901e70a2f
Merge pull request #1986 from pydanny/pyup-update-django-extensions-2.1.5-to-2.1.6
Update django-extensions to 2.1.6
2019-03-21 17:58:53 +00:00
Bruno Alla
bd57ab615f
Merge branch 'master' into pyup-update-black-18.9b0-to-19.3b0 2019-03-21 17:38:56 +00:00
Bruno Alla
5e90722341
Merge pull request #1984 from pydanny/pyup-update-coverage-4.5.2-to-4.5.3
Update coverage to 4.5.3
2019-03-21 17:38:13 +00:00
Bruno Alla
0126cebd07
Merge pull request #1983 from pydanny/pyup-update-pytest-4.2.0-to-4.3.1
Update pytest to 4.3.1
2019-03-21 17:37:52 +00:00
Bruno Alla
3afdde4934
Merge pull request #1982 from pydanny/pyup-update-sphinx-1.8.4-to-1.8.5
Update sphinx to 1.8.5
2019-03-21 17:12:52 +00:00
Bruno Alla
78b735bd68
Merge pull request #1979 from pydanny/pyup-update-djangorestframework-3.9.1-to-3.9.2
Update djangorestframework to 3.9.2
2019-03-21 17:12:29 +00:00
Bruno Alla
31d53c75f2
Merge branch 'master' into pyup-update-ipdb-0.11-to-0.12 2019-03-21 17:04:48 +00:00
Bruno Alla
6c6aa7c215
Merge pull request #1980 from pydanny/pyup-update-werkzeug-0.14.1-to-0.15.0
Update werkzeug to 0.15.0
2019-03-21 17:03:53 +00:00
Bruno Alla
85dea50436
Merge pull request #1978 from pydanny/pyup-update-django-allauth-0.38.0-to-0.39.1
Update django-allauth to 0.39.1
2019-03-21 16:45:47 +00:00
Bruno Alla
cfc82a668f
Merge pull request #1976 from pydanny/pyup-update-python-slugify-2.0.1-to-3.0.0
Update python-slugify to 3.0.0
2019-03-21 16:39:37 +00:00
Bruno Alla
6e53dcaa30
Merge pull request #1975 from pydanny/pyup-update-django-anymail-5.0-to-6.0
Update django-anymail to 6.0
2019-03-21 16:26:40 +00:00
browniebroke
65d315ed29 Update pytest-django from 3.4.7 to 3.4.8 2019-03-21 16:01:31 +00:00
browniebroke
a8c52e2d45 Update django-extensions from 2.1.5 to 2.1.6 2019-03-21 16:01:28 +00:00
browniebroke
d92754684f Update black from 18.9b0 to 19.3b0 2019-03-21 16:01:24 +00:00
browniebroke
3995e9e807 Update coverage from 4.5.2 to 4.5.3 2019-03-21 16:01:21 +00:00
browniebroke
a7163b9409 Update pytest from 4.2.0 to 4.3.1 2019-03-21 16:01:18 +00:00
browniebroke
b5ab945ca2 Update sphinx from 1.8.4 to 1.8.5 2019-03-21 16:01:14 +00:00
browniebroke
f67a78903e Update ipdb from 0.11 to 0.12 2019-03-21 16:01:08 +00:00
browniebroke
7b83d47e2b Update werkzeug from 0.14.1 to 0.15.0 2019-03-21 16:01:05 +00:00
browniebroke
f04e96e30f Update djangorestframework from 3.9.1 to 3.9.2 2019-03-21 16:01:00 +00:00
browniebroke
dd85d6df39 Update django-allauth from 0.38.0 to 0.39.1 2019-03-21 16:00:57 +00:00
browniebroke
bb26ed565b Update python-slugify from 2.0.1 to 3.0.0 2019-03-21 16:00:50 +00:00
browniebroke
4cd30e4657 Update django-anymail from 5.0 to 6.0 2019-03-21 16:00:47 +00:00
browniebroke
1ed1e6ac47 Update sentry-sdk from 0.7.6 to 0.7.7 2019-03-21 16:00:43 +00:00
Bruno Alla
91585a0eb2 Add OS requirements for Ubuntu Bionic 18.04
Fixes #1973
2019-03-20 12:54:58 +00:00
Bruno Alla
823ee637d1 Remove dead link in .gitignore
Fixes #1972
2019-03-20 12:16:43 +00:00
Bruno Alla
5bf0a397ac Pin redis version 2019-03-20 12:09:43 +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
Guilherme Fabrizio
7d1e90bdf5 Migrate to unified Sentry SDK (#1820)
The raven library is deprecated. Replace it by the new sentry-sdk library:

https://docs.sentry.io/error-reporting/quickstart/?platform=python

fixes #1818
2019-03-20 10:04:44 +00:00
Bruno Alla
997b22e4ce Merge branch 'fix/default-acl' 2019-03-19 20:02:41 +00:00
Bruno Alla
b594a15847 Add code style black to the generated README 2019-03-19 20:02:26 +00:00
Bruno Alla
6e9f87fced Set AWS_DEFAULT_ACL to None as per django-storages documentation
fixes #1885
2019-03-19 19:57:31 +00:00
Bruno Alla
e740a54da6
Update Flower version 2019-03-19 12:30:19 +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
Bruno Alla
3bd7aa4e1a Fix build error with windows=y and docker=y combination
Fixes #1917
2019-03-18 20:55:47 +00:00
Bruno Alla
68f7268770
Run Black on Travis (#1957)
* Create a test matrix on Travis CI to help testing multiple options

* Change test_docker.sh to fail if any command in it fails

* Run black on the CI with --check option

* Fix formatting of project files using black

* Install black in the docker container

* Exclude migrations in black checks

* Fix Black formatting violations

* Run black on the whole generated project & fix issues
2019-03-18 17:49:43 +00:00
Bruno Alla
563e0938a8
Merge pull request #1664 from pydanny/clean-up-project-docs
Remove project doc files likely to remain unused
2019-03-13 14:40:18 -03:00
Oleg Russkin
638c93d1df Add kombu to base (celery) dependencies
Using latest version 4.4.0, previous suitable 4.3.0
also had bug: kombu/issues#1006
2019-03-12 16:38:43 +02:00
Oleg Russkin
6213af4b56 Update redis to 3.2.0
Related bug was fixed: celery/kombu#947
Moreover, recent kombu versiones demand
such redis version.
2019-03-12 16:35:03 +02:00
Bruno Alla
eb85627d1a Update to latest bug fix for Python 3.6 to fix Heroku warning when deploying
Python has released a security update! Please consider upgrading to python-3.6.8
Learn More: https://devcenter.heroku.com/articles/python-runtimes
2019-03-11 22:02:11 +00:00
Bruno Alla
9eab0b9365
Merge pull request #1956 from pydanny/conditional-redis-merge
## Description

This is the same as the pull request #1693 with the master branch merged into it to avoid all the extra unrelated commits which are already in master. Looks like Github is getting confused due to a rebase on that branch, which make that PR hard to review...

## Rationale

See #1693 - Locally, Redis is necessary only if Celery is used, while in Production it's also used for Caching.

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

Fixes #1691
2019-03-11 21:12:58 +00:00
yunti
1c5c4e52c0 Add automatic migrations to heroku deploys (#1951)
heroku now has a new feature for running tasks as part of deployment. Perfect for automatic migrations.
https://devcenter.heroku.com/articles/release-phase#specifying-release-phase-tasks
2019-03-11 21:05:31 +00:00
Bruno Alla
ae27ef3fae Merge branch 'master' into conditional-redis-merge 2019-03-11 20:53:36 +00: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
b6b7176d02 Make requested changes:
* Reorder meta tasks to the bottom
* Fix JS compilation issue
* Replace strings concatenation with templates
2019-02-27 10:11:20 +11:00