Merge branch 'master' into test/all-combinations

.travis.yml

@@ -13,9 +13,9 @@ before_install:
 
 matrix:
   include:
-    - name: Test
+    - name: Tox Test
       script: tox -e py36
-    - name: Black
+    - name: Black template
       script: tox -e black
     - name: Basic Docker
       script: sh tests/test_docker.sh

CONTRIBUTORS.rst

@@ -106,6 +106,7 @@ Listed in alphabetical order.
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Hamish Durkin            `@durkode`_
+  Hana Quadara             `@hanaquadara`_
   Harry Percival           `@hjwp`_
   Hendrik Schneider        `@hendrikschneider`_
   Henrique G. G. Pereira   `@ikkebr`_
@@ -311,6 +312,7 @@ Listed in alphabetical order.
 .. _@saschalalala: https://github.com/saschalalala
 .. _@mrcoles: https://github.com/mrcoles
 .. _@ericgroom: https://github.com/ericgroom
+.. _@hanaquadara: https://github.com/hanaquadara
 
 Special Thanks
 ~~~~~~~~~~~~~~

docs/linters.rst

@@ -25,7 +25,7 @@ This is included in flake8's checks, but you can also run it separately to see a
 
 The config for pylint is located in .pylintrc. It specifies:
 
-* Use the pylint_common and pylint_django plugins. If using Celery, also use pylint_celery.
+* Use the pylint_django plugin. If using Celery, also use pylint_celery.
 * Set max line length to 120 chars
 * Disable linting messages for missing docstring and invalid name
 * max-parents=13

{{cookiecutter.project_slug}}/.pylintrc

@@ -1,5 +1,5 @@
 [MASTER]
-load-plugins=pylint_common, pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery {% endif %}
+load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery {% endif %}
 
 [FORMAT]
 max-line-length=120

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -1,5 +1,5 @@
 pytz==2018.9  # https://github.com/stub42/pytz
-python-slugify==3.0.0  # https://github.com/un33k/python-slugify
+python-slugify==3.0.1  # https://github.com/un33k/python-slugify
 Pillow==5.4.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

{{cookiecutter.project_slug}}/requirements/local.txt

@@ -20,6 +20,10 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
+pylint-django==0.9.4  # https://github.com/PyCQA/pylint-django
+{%- if cookiecutter.use_celery == 'y' %}
+pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
+{%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -8,7 +8,7 @@ psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.7  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.8  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django