Commit Graph

2848 Commits

Author SHA1 Message Date
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
0ab499c2fe
Merge pull request #1967 from pydanny/bugfix/windows-docker
Fix build error with windows=y and docker=y combination
2019-03-18 21:08:09 +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
43a6f5d854
Update .pyup.yml 2019-03-18 10:03:32 +00:00
Bruno Alla
135c6d7f59
Fix syntax error in PyUP config - take 2 2019-03-18 09:59:13 +00:00
Bruno Alla
a4a7c6488f
Fix syntax in PyUP config file 2019-03-18 09:56:20 +00:00
Bruno Alla
02c19193a0
Specify requirements file in Pyup config 2019-03-18 09:54:39 +00:00
Bruno Alla
d299e1d354
Merge pull request #1963 from pydanny/pyup-update-pyyaml-3.13-to-5.1
Update pyyaml to 5.1
2019-03-13 14:46:47 -03:00
pyup-bot
aee746b5a2 Update pyyaml from 3.13 to 5.1 2019-03-13 10:40:27 -07: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
Bruno Alla
b142713ec6 Remove running collectstatic from Heroku docs, it's done during deployments 2019-03-13 14:31:17 +00:00
Bruno Alla
593c08348e
Merge pull request #1962 from pydanny/pyup-update-pytest-4.3.0-to-4.3.1
Update pytest to 4.3.1
2019-03-13 06:55:51 -03:00
Bruno Alla
b615d671cb
Merge pull request #1961 from ahhda/remove_link
Remove link that does not exist
2019-03-13 06:55:22 -03:00
Bruno Alla
2f903659b9
Merge pull request #1960 from ahhda/add_cloud_article
Added link for Google Cloud storage blog
2019-03-13 06:53:03 -03:00
pyup-bot
2edd51aa77 Update pytest from 4.3.0 to 4.3.1 2019-03-13 05:37:54 -04:00
anuj
4550e4aa37 Remove link that does not exist 2019-03-13 14:31:35 +05:30
anuj
8ce3e6605b Added link for Google Cloud storage blog 2019-03-13 14:22:36 +05:30
Oleg Russkin
8ab63940ec Contributors: Add Oleg Russkin 2019-03-12 16:49:24 +02: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
Bruno Alla
0c1ad30073
Merge pull request #1946 from takkaria/master
Update Gulp & other NPM dependencies
2019-03-01 14:42:40 +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
Anna Sidwell
17a9632031 Add my name to contributors 2019-02-23 18:57:42 +11:00
Anna Sidwell
2676401ed7 Update Gulp & other dependencies 2019-02-23 18:47:30 +11:00
pyup.io bot
b09d840b54 Update flake8 from 3.7.5 to 3.7.6 (#1943) 2019-02-20 20:10:52 +03:00
pyup.io bot
407ccb64ba Update pytest from 4.2.1 to 4.3.0 (#1944) 2019-02-20 20:10:41 +03:00
Bruno Alla
4913c941a3
Merge pull request #1941 from pydanny/pyup-update-pytest-4.2.0-to-4.2.1
Update pytest to 4.2.1
2019-02-16 12:56:54 +00:00
pyup-bot
0f8275911b Update pytest from 4.2.0 to 4.2.1 2019-02-16 03:34:22 -08:00
pyup.io bot
1c11f0950f Update django from 2.0.10 to 2.0.13 (#1936) 2019-02-16 14:34:11 +03:00
Bruno Alla
4c7cb50ace
Merge pull request #1932 from pydanny/pyup-update-mypy-0.660-to-0.670
Update mypy to 0.670
2019-02-09 12:35:20 +00:00
pyup-bot
9e2d335ed3 Update mypy from 0.660 to 0.670 2019-02-08 16:28:37 -08:00
Bruno Alla
7fe87d9c97
Merge pull request #1925 from pydanny/pyup-update-pytest-django-3.4.5-to-3.4.7
Update pytest-django to 3.4.7
2019-02-05 10:26:10 +01:00
Bruno Alla
ca528c482c
Merge pull request #1926 from pydanny/pyup-update-flake8-3.7.4-to-3.7.5
Update flake8 to 3.7.5
2019-02-05 10:25:50 +01:00
Bruno Alla
894b98ce84
Merge pull request #1927 from pydanny/pyup-update-sphinx-1.8.3-to-1.8.4
Update sphinx to 1.8.4
2019-02-05 10:25:41 +01:00
pyup-bot
06a96b68dc Update sphinx from 1.8.3 to 1.8.4 2019-02-04 18:46:40 -08:00
pyup-bot
fe81992501 Update flake8 from 3.7.4 to 3.7.5 2019-02-04 18:46:34 -08:00
pyup-bot
ce23247401 Update flake8 from 3.7.4 to 3.7.5 2019-02-04 18:46:33 -08:00
Bruno Alla
29b91eeee8
Merge pull request #1923 from pydanny/pyup-update-flake8-3.7.3-to-3.7.4
Update flake8 to 3.7.4
2019-02-04 14:57:06 +01:00
pyup-bot
6050368df0 Update pytest-django from 3.4.5 to 3.4.7 2019-02-03 13:54:30 -08:00
pyup-bot
8774ede3b0 Update flake8 from 3.7.3 to 3.7.4 2019-02-01 06:53:37 -08:00
pyup-bot
57c18bb2a0 Update flake8 from 3.7.3 to 3.7.4 2019-02-01 06:53:35 -08:00
Bruno Alla
65d2ce07fb
Merge pull request #1916 from pydanny/pyup-update-django-extensions-2.1.4-to-2.1.5
Update django-extensions to 2.1.5
2019-01-31 16:53:04 +01:00
Bruno Alla
11e7adfbd4
Merge pull request #1920 from pydanny/pyup-update-flake8-3.6.0-to-3.7.3
Update flake8 to 3.7.3
2019-01-31 16:52:30 +01:00