From 1c1cc9ee9c29a858aaff9276486de3bef6b56068 Mon Sep 17 00:00:00 2001 From: Shupeyko Nikita Date: Thu, 13 Apr 2017 20:50:11 +0300 Subject: [PATCH 1/4] Prevent PyCharm from formatting raven and opbeat imports (#1063) * Prevent PyCharm from formatting raven and opbeat imports Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments. * Prevent PyCharm from formatting raven and opbeat imports Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments. * Fix line breaks and spaces * Fix linebreaks --- .../taskapp/celery.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py index 8346f837..bea9768a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py @@ -28,9 +28,19 @@ class CeleryConfig(AppConfig): {% if cookiecutter.use_sentry_for_error_reporting == 'y' -%} if hasattr(settings, 'RAVEN_CONFIG'): # Celery signal registration +{% if cookiecutter.use_pycharm == 'y' -%} + # Since raven is required in production only, + # imports might (most surely will) be wiped out + # during PyCharm code clean up started + # in other environments. + # @formatter:off +{%- endif %} from raven import Client as RavenClient from raven.contrib.celery import register_signal as raven_register_signal from raven.contrib.celery import register_logger_signal as raven_register_logger_signal +{% if cookiecutter.use_pycharm == 'y' -%} + # @formatter:on +{%- endif %} raven_client = RavenClient(dsn=settings.RAVEN_CONFIG['DSN']) raven_register_logger_signal(raven_client) @@ -39,10 +49,20 @@ class CeleryConfig(AppConfig): {% if cookiecutter.use_opbeat == 'y' -%} if hasattr(settings, 'OPBEAT'): +{% if cookiecutter.use_pycharm == 'y' -%} + # Since opbeat is required in production only, + # imports might (most surely will) be wiped out + # during PyCharm code clean up started + # in other environments. + # @formatter:off +{%- endif %} from opbeat.contrib.django.models import client as opbeat_client from opbeat.contrib.django.models import logger as opbeat_logger from opbeat.contrib.django.models import register_handlers as opbeat_register_handlers from opbeat.contrib.celery import register_signal as opbeat_register_signal +{% if cookiecutter.use_pycharm == 'y' -%} + # @formatter:on +{%- endif %} try: opbeat_register_signal(opbeat_client) From e9d94dbf5268f0a2241c8b60f8f5830b24566b7e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Apr 2017 19:50:34 +0200 Subject: [PATCH 2/4] Update sphinx from 1.5.3 to 1.5.5 (#1104) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 67233494..9589fd73 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.3 +Sphinx==1.5.5 django-extensions==1.7.8 Werkzeug==0.12.1 django-test-plus==1.0.17 From e365c39f2a0778a32d37fc1c59beee3df1924235 Mon Sep 17 00:00:00 2001 From: Shupeyko Nikita Date: Thu, 13 Apr 2017 20:50:56 +0300 Subject: [PATCH 3/4] gitignore generated project's .cache/ dir (#1061) --- {{cookiecutter.project_slug}}/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index 90ce80dc..6a0a3029 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -76,3 +76,6 @@ mailhog {% endif %} staticfiles/ + +.cache/ + From f7ca4d712ccaebba88c12c9aac0411bbcfdbbba7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 13 Apr 2017 19:54:18 +0200 Subject: [PATCH 4/4] Update tox from 2.6.0 to 2.7.0 (#1113) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 528f9d95..ebc61804 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ binaryornot==0.4.3 pytest==3.0.7 pep8==1.7.0 pyflakes==1.5.0 -tox==2.6.0 +tox==2.7.0 pytest-cookies==0.2.0