Merge branch 'master' into upgrade/django-2.1

CONTRIBUTORS.rst

@@ -84,6 +84,7 @@ Listed in alphabetical order.
   Christopher Clarke       `@chrisdev`_
   Cole Mackenzie           `@cmackenzie1`_
   Collederas               `@Collederas`_
+  Craig Margieson          `@cmargieson`_
   Cristian Vargas          `@cdvv7788`_
   Cullen Rhodes            `@c-rhodes`_
   Dan Shultz               `@shultz`_
@@ -317,6 +318,7 @@ Listed in alphabetical order.
 .. _@ericgroom: https://github.com/ericgroom
 .. _@hanaquadara: https://github.com/hanaquadara
 .. _@vladdoster: https://github.com/vladdoster
+.. _@cmargieson: https://github.com/cmargieson
 
 Special Thanks
 ~~~~~~~~~~~~~~

requirements.txt

@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.8.6
+tox==3.9.0
 pytest==4.4.1
 pytest_cases==1.6.2
 pytest-cookies==0.3.0

{{cookiecutter.project_slug}}/config/settings/production.py

@@ -104,7 +104,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-STATIC_URL = "https://storage.googleapis.com/{}/static".format(GS_BUCKET_NAME)
+STATIC_URL = "https://storage.googleapis.com/{}/static/".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # MEDIA
@@ -128,8 +128,8 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-MEDIA_URL = "https://storage.googleapis.com/{}/media".format(GS_BUCKET_NAME)
+MEDIA_URL = "https://storage.googleapis.com/{}/media/".format(GS_BUCKET_NAME)
-MEDIA_ROOT = "https://storage.googleapis.com/{}/media".format(GS_BUCKET_NAME)
+MEDIA_ROOT = "https://storage.googleapis.com/{}/media/".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # TEMPLATES

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

@@ -29,5 +29,5 @@ django-compressor==2.2  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.9.2  # https://github.com/encode/django-rest-framework
+djangorestframework==3.9.3  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

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

@@ -6,12 +6,12 @@ Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.700  # https://github.com/python/mypy
+mypy==0.701  # https://github.com/python/mypy
 pytest==4.4.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
@@ -20,7 +20,7 @@ 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==2.0.6  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.9  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

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

@@ -8,7 +8,7 @@ psycopg2==2.8 --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.10  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.14  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django