diff --git a/requirements.txt b/requirements.txt index 90064660..5e6edecd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -cookiecutter==1.5.1 -flake8==3.4.1 # pyup: != 2.6.0 +cookiecutter==1.6.0 +flake8==3.5.0 # pyup: != 2.6.0 sh==1.12.14 binaryornot==0.4.4 @@ -8,4 +8,4 @@ pytest==3.2.3 pycodestyle==2.3.1 pyflakes==1.6.0 tox==2.9.1 -pytest-cookies==0.2.0 +pytest-cookies==0.3.0 diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 10261781..2ce69767 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -1,5 +1,5 @@ """ -Django settings for {{cookiecutter.project_name}} project. +Base settings for {{cookiecutter.project_name}} project. For more information on this file, see https://docs.djangoproject.com/en/dev/topics/settings/ diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index efbaf30b..67a7074a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -1,9 +1,9 @@ """ -Local settings +Local settings for {{cookiecutter.project_name}} project. - Run in Debug mode {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %} -- Use mailhog for emails +- Use mailhog for emails via Docker {% elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} - Use mailhog for emails {% else %} diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 7ea188ce..cc518644 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -1,5 +1,5 @@ """ -Production Configurations +Production settings for {{cookiecutter.project_name}} project. {% if cookiecutter.use_whitenoise == 'y' -%} - Use WhiteNoise for serving static files{% endif %} @@ -119,8 +119,8 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' {% else %} # See:http://stackoverflow.com/questions/10390244/ from storages.backends.s3boto3 import S3Boto3Storage -StaticRootS3BotoStorage = lambda: S3Boto3Storage(location='static') -MediaRootS3BotoStorage = lambda: S3Boto3Storage(location='media') +StaticRootS3BotoStorage = lambda: S3Boto3Storage(location='static') # noqa +MediaRootS3BotoStorage = lambda: S3Boto3Storage(location='media') # noqa DEFAULT_FILE_STORAGE = 'config.settings.production.MediaRootS3BotoStorage' MEDIA_URL = 'https://s3.amazonaws.com/%s/media/' % AWS_STORAGE_BUCKET_NAME diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 0cd3e665..d973428d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -1,8 +1,8 @@ -''' -Test settings +""" +Test settings for {{cookiecutter.project_name}} project. - Used to run tests fast on the continuous integration server and locally -''' +""" from .base import * # noqa diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 960522a8..00e86bf4 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,34 +16,34 @@ whitenoise==3.3.1 # Forms -django-crispy-forms==1.6.1 +django-crispy-forms==1.7.0 # Models django-model-utils==3.0.0 # Images -Pillow==4.2.1 +Pillow==4.3.0 # Password storage argon2-cffi==16.3.0 # For user registration, either via email or social # Well-built with regular release cycles! -django-allauth==0.33.0 +django-allauth==0.34.0 {% if cookiecutter.windows == 'y' -%} # On Windows, you must download/install psycopg2 manually # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg {% else %} # Python-PostgreSQL Database Adapter -psycopg2==2.7.3.1 +psycopg2==2.7.3.2 {%- endif %} # Unicode slugification awesome-slugify==1.6.5 # Time zones support -pytz==2017.2 +pytz==2017.3 # Redis support django-redis==4.8.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 015a8235..cd89783b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,10 +4,10 @@ coverage==4.4.1 django-coverage-plugin==1.5.0 -Sphinx==1.6.4 -django-extensions==1.9.1 +Sphinx==1.6.5 +django-extensions==1.9.7 Werkzeug==0.12.2 -django-test-plus==1.0.18 +django-test-plus==1.0.20 factory-boy==2.9.2 django-debug-toolbar==1.8 diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index e6496cb2..4ba9d6e0 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -6,7 +6,7 @@ # Python-PostgreSQL Database Adapter # Assuming Windows is used locally, and *nix -- in production. # ------------------------------------------------------------ -psycopg2==2.7.3.1 +psycopg2==2.7.3.2 {%- endif %} # WSGI Handler @@ -24,16 +24,16 @@ Collectfast==0.5.2 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==1.0 +django-anymail==1.2 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client # -------------------------- -raven==6.2.1 +raven==6.3.0 {%- endif %} {% if cookiecutter.use_opbeat == "y" -%} # Opbeat agent for performance monitoring # ----------------------------------------- -opbeat==3.5.2 +opbeat==3.5.3 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 8d21ed8b..063d3f63 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -4,12 +4,12 @@ {% if cookiecutter.windows == 'y' -%} # Python-PostgreSQL Database Adapter # If using Win for dev, this assumes Unix in test/prod -psycopg2==2.7.3.1 +psycopg2==2.7.3.2 {%- endif %} coverage==4.4.1 -flake8==3.4.1 # pyup: != 2.6.0 -django-test-plus==1.0.18 +flake8==3.5.0 # pyup: != 2.6.0 +django-test-plus==1.0.20 factory-boy==2.9.2 django-coverage-plugin==1.5.0