Commit Graph

3849 Commits

Author SHA1 Message Date
Bruno Alla
ae27ef3fae Merge branch 'master' into conditional-redis-merge 2019-03-11 20:53:36 +00:00
Trung Dong Huynh
a7079a8b13 Merge commit '6e72169ffe3022b54db3d44297226226cf86c1e8' 2019-03-09 14:22:47 +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
Trung Dong Huynh
b41d570714 Merge commit '4c7cb50ace1492220c9d58fba607bd04e84e1666' 2019-02-11 11:25:02 +00: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
Bruno Alla
57c3991d0c
Merge pull request #1919 from pydanny/pyup-update-pytest-4.1.1-to-4.2.0
Update pytest to 4.2.0
2019-01-31 16:49:42 +01:00
pyup-bot
43bfd66aa0 Update flake8 from 3.6.0 to 3.7.3 2019-01-31 05:23:23 -08:00
pyup-bot
12777d06c9 Update flake8 from 3.6.0 to 3.7.3 2019-01-31 05:23:22 -08:00
pyup-bot
8c7a3613ba Update pytest from 4.1.1 to 4.2.0 2019-01-30 16:40:23 -08:00
pyup-bot
75837bac65 Update pytest from 4.1.1 to 4.2.0 2019-01-30 16:40:22 -08:00
Fábio C. Barrionuevo da Luz
156afe675b
Merge pull request #1907 from pydanny/pyup-update-djangorestframework-3.9.0-to-3.9.1
Update djangorestframework to 3.9.1
2019-01-30 17:08:42 -03:00
pyup-bot
0ef965cbfd Update django-extensions from 2.1.4 to 2.1.5 2019-01-30 11:53:28 -08:00
Fábio C. Barrionuevo da Luz
66b1468fda
Merge pull request #1911 from pydanny/pyup-update-psycopg2-binary-2.7.6.1-to-2.7.7
Update psycopg2-binary to 2.7.7
2019-01-22 17:34:14 -03:00
pyup-bot
a7af2d5153 Update psycopg2-binary from 2.7.6.1 to 2.7.7 2019-01-22 11:58:06 -08:00
pyup.io bot
563ca77480 Update mypy from 0.650 to 0.660 (#1908) 2019-01-22 14:30:50 +03:00
pyup.io bot
e2f46e392e Update argon2-cffi from 18.3.0 to 19.1.0 (#1909) 2019-01-22 14:30:37 +03:00
pyup-bot
cf88911c36 Update djangorestframework from 3.9.0 to 3.9.1 2019-01-16 09:20:56 -08:00
pyup.io bot
b0380da4c0 Update pytz from 2018.7 to 2018.9 (#1902) 2019-01-13 16:48:23 +03:00
pyup.io bot
e5f779c9cc Update pytest-django from 3.4.4 to 3.4.5 (#1903) 2019-01-13 16:48:11 +03:00
Bruno Alla
0635c713b4
Merge pull request #1906 from pydanny/pyup-update-pytest-4.1.0-to-4.1.1
Update pytest to 4.1.1
2019-01-13 13:43:42 +00:00
pyup-bot
33d03e06ab Update pytest from 4.1.0 to 4.1.1 2019-01-12 23:34:49 -08:00
pyup-bot
922d3824c0 Update pytest from 4.1.0 to 4.1.1 2019-01-12 23:34:48 -08:00
Trung Dong Huynh
f97c740983 Merge commit '34620a1c5757b69b9315df5fccc6a7313fb66e29' 2019-01-08 20:18:08 +00:00
pyup.io bot
34620a1c57 Update pillow from 5.3.0 to 5.4.1 (#1901) 2019-01-07 02:04:50 +03:00
pyup.io bot
2bf8f286e4 Update pytest to 4.1.0 (#1900)
* Update pytest from 4.0.2 to 4.1.0

* Update pytest from 4.0.2 to 4.1.0
2019-01-07 02:04:14 +03:00
Fábio C. Barrionuevo da Luz
e5ab791c0b
Merge pull request #1899 from pydanny/pyup-update-django-2.0.9-to-2.0.10
Update django to 2.0.10
2019-01-04 22:06:57 -03:00
pyup-bot
530e94d30e Update django from 2.0.9 to 2.0.10 2019-01-04 13:34:34 -08:00