diff --git a/README.rst b/README.rst index 3660b4d32..f1b12122c 100644 --- a/README.rst +++ b/README.rst @@ -141,8 +141,7 @@ Answer the prompts with your own desired options_. For example:: Select js_task_runner: 1 - Gulp 2 - Grunt - 3 - Webpack - 4 - None + 3 - None Choose from 1, 2, 3, 4 [1]: 1 use_lets_encrypt [n]: n Select open_source_license: diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst index 93f189601..661170722 100644 --- a/docs/deployment-on-pythonanywhere.rst +++ b/docs/deployment-on-pythonanywhere.rst @@ -140,6 +140,7 @@ Click through to the **WSGI configuration file** link (near the top) and edit th os.environ['DJANGO_ADMIN_URL'] = '' os.environ['DJANGO_MAILGUN_API_KEY'] = '' os.environ['DJANGO_MAILGUN_SERVER_NAME'] = '' + os.environ['MAILGUN_SENDER_DOMAIN'] = '' os.environ['DJANGO_AWS_ACCESS_KEY_ID'] = '' os.environ['DJANGO_AWS_SECRET_ACCESS_KEY'] = '' os.environ['DJANGO_AWS_STORAGE_BUCKET_NAME'] = '' diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index abedb4aa5..835d40f28 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -74,8 +74,7 @@ js_task_runner [1] 1. Gulp_ 2. Grunt_ - 3. Webpack_ - 4. None + 3. None use_lets_encrypt [n] Use `Let's Encrypt`_ as the certificate authority for this project. diff --git a/requirements.txt b/requirements.txt index 0e5486874..cac458b5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.5.1 -flake8==3.2.1 # pyup: != 2.6.0 -sh==1.12.9 +flake8==3.3.0 # pyup: != 2.6.0 +sh==1.12.10 binaryornot==0.4.0 # Testing diff --git a/{{cookiecutter.project_slug}}/.ebextensions/20_elasticcache.config b/{{cookiecutter.project_slug}}/.ebextensions/20_elasticcache.config index 539f55094..26c059e30 100644 --- a/{{cookiecutter.project_slug}}/.ebextensions/20_elasticcache.config +++ b/{{cookiecutter.project_slug}}/.ebextensions/20_elasticcache.config @@ -24,7 +24,7 @@ Resources: CacheNodeType: Fn::GetOptionSetting: OptionName : "CacheNodeType" - DefaultValue : "cache.t1.micro" + DefaultValue : "cache.t2.micro" NumCacheNodes: Fn::GetOptionSetting: OptionName : "NumCacheNodes" diff --git a/{{cookiecutter.project_slug}}/.ebextensions/30_options.config b/{{cookiecutter.project_slug}}/.ebextensions/30_options.config index d7135c3f9..fefec489d 100644 --- a/{{cookiecutter.project_slug}}/.ebextensions/30_options.config +++ b/{{cookiecutter.project_slug}}/.ebextensions/30_options.config @@ -1,6 +1,6 @@ option_settings: "aws:elasticbeanstalk:customoption": - CacheNodeType : cache.t1.micro + CacheNodeType : cache.t2.micro NumCacheNodes : 1 Engine : redis CachePort : 6379 diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 055da6f52..efab0578e 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -260,8 +260,6 @@ AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify' {% if cookiecutter.use_celery == 'y' %} ########## CELERY INSTALLED_APPS += ['{{cookiecutter.project_slug}}.taskapp.celery.CeleryConfig'] -# if you are not using the django database broker (e.g. rabbitmq, redis, memcached), you can remove the next line. -INSTALLED_APPS += ['kombu.transport.django'] BROKER_URL = env('CELERY_BROKER_URL', default='django://') if BROKER_URL == 'django://': CELERY_RESULT_BACKEND = 'redis://' diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 49e5ed18d..eceb87bbf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.10.5 +django==1.10.6 # Configuration django-environ==0.4.1 @@ -28,14 +28,14 @@ Pillow==4.0.0 # For user registration, either via email or social # Well-built with regular release cycles! -django-allauth==0.30.0 +django-allauth==0.31.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.6.2 +psycopg2==2.7 {%- endif %} # Unicode slugification @@ -49,7 +49,7 @@ django-redis==4.7.0 redis>=2.10.5 {% if cookiecutter.use_celery == "y" %} -celery==3.1.24 +celery==4.0.2 {% endif %} {% if cookiecutter.use_compressor == "y" %} diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 25755ad69..6b4b9ca1e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,7 +4,7 @@ coverage==4.3.4 django-coverage-plugin==1.5.0 -Sphinx==1.5.2 +Sphinx==1.5.3 django-extensions==1.7.7 Werkzeug==0.11.15 django-test-plus==1.0.17 diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index fbc3a62d6..9a860f877 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -6,7 +6,7 @@ # Python-PostgreSQL Database Adapter # If using Win for dev, this assumes Unix in prod # ------------------------------------------------ -psycopg2==2.6.2 +psycopg2==2.7 {%- endif %} # WSGI Handler diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index afb97ded8..78fec9422 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -4,7 +4,7 @@ {% if cookiecutter.windows == 'y' -%} # Python-PostgreSQL Database Adapter # If using Win for dev, this assumes Unix in test/prod -psycopg2==2.6.2 +psycopg2==2.7 {%- endif %} coverage==4.3.4