From e08b6ab6f81c106097d347867e4274b8c9e8593a Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 28 May 2018 12:50:37 +0300 Subject: [PATCH 01/15] Remove set -o pipefail command from celeryworker start script --- .../compose/local/django/celery/worker/start | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index 4335340de..ecc032504 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -1,7 +1,6 @@ #!/bin/sh set -o errexit -set -o pipefail set -o nounset set -o xtrace From b8c7ae8b4bf65bca8530814f7dcaee0a31421352 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Mon, 28 May 2018 12:50:57 +0300 Subject: [PATCH 02/15] Remove set -o pipefail command from celerybeat start script --- .../compose/local/django/celery/beat/start | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start index 0ca8bb507..d1c9db455 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start @@ -1,7 +1,6 @@ #!/bin/sh set -o errexit -set -o pipefail set -o nounset set -o xtrace From a4240bcf085625c9b084eec5511a3a6cf53f9fb5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 28 May 2018 21:18:55 -0700 Subject: [PATCH 03/15] Update sphinx from 1.7.4 to 1.7.5 --- {{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 4dee0421f..be108fa88 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,7 @@ Werkzeug==0.14.1 # https://github.com/pallets/werkzeug ipdb==0.11 # https://github.com/gotcha/ipdb -Sphinx==1.7.4 # https://github.com/sphinx-doc/sphinx +Sphinx==1.7.5 # https://github.com/sphinx-doc/sphinx {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- else %} From eea6cc94de48102a235533fa76dca4a4c2d561df Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 31 May 2018 06:55:38 +0200 Subject: [PATCH 04/15] Update raven to 6.9.0 (#1667) This PR updates [raven](https://pypi.org/project/raven) from **6.8.0** to **6.9.0**.
Changelog ### 6.9.0 ``` ------------------ * [Core] Switched from culprit to transaction for automatic transaction reporting. * [CI] Removed py3.3 from build * [Django] resolved an issue where the log integration would override the user. ```
Links - PyPI: https://pypi.org/project/raven - Changelog: https://pyup.io/changelogs/raven/ - Repo: https://github.com/getsentry/raven-python
--- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 9ddb7d15f..59a028a14 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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" %} -raven==6.8.0 # https://github.com/getsentry/raven-python +raven==6.9.0 # https://github.com/getsentry/raven-python {%- endif %} # Django From cff7111edbdaf773641624320b6bb25c466ccdd6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 31 May 2018 15:14:37 +0200 Subject: [PATCH 05/15] Update django-anymail from 2.2 to 3.0 (#1668) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 59a028a14..d3b18ed92 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -14,4 +14,4 @@ raven==6.9.0 # https://github.com/getsentry/raven-python # Django # ------------------------------------------------------------------------------ django-storages[boto3]==1.6.6 # https://github.com/jschneier/django-storages -django-anymail[mailgun]==2.2 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==3.0 # https://github.com/anymail/django-anymail From 77f87c453253c03cd76e04ec351e45acc3032e0a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 1 Jun 2018 15:16:03 -0700 Subject: [PATCH 06/15] Update django from 2.0.5 to 2.0.6 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index bd7e051bb..6b2ec4b55 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -15,7 +15,7 @@ celery==3.1.25 # pyup: <4.0 # https://github.com/celery/celery # Django # ------------------------------------------------------------------------------ -django==2.0.5 # pyup: < 2.1 # https://www.djangoproject.com/ +django==2.0.6 # pyup: < 2.1 # https://www.djangoproject.com/ django-environ==0.4.4 # https://github.com/joke2k/django-environ django-model-utils==3.1.2 # https://github.com/jazzband/django-model-utils django-allauth==0.36.0 # https://github.com/pennersr/django-allauth From 5b5ad0e4fc97f540fdbda459adaa1ccc68cf6712 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 5 Jun 2018 12:13:50 +0300 Subject: [PATCH 07/15] Fix Py.Test unittests fail on new cookie Fixes #1674 --- .../{{cookiecutter.project_slug}}/users/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py index a98e63b84..fef93ad58 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py @@ -8,7 +8,7 @@ urlpatterns = [ path("~redirect/", view=views.UserRedirectView.as_view(), name="redirect"), path("~update/", view=views.UserUpdateView.as_view(), name="update"), path( - "", + "/", view=views.UserDetailView.as_view(), name="detail", ), From f25492d74f13d1f6a87ebbe0b9ad5f7223715b95 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 5 Jun 2018 12:17:47 +0300 Subject: [PATCH 08/15] Clean up .travis.yml --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8be8bc440..a46726d6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -# Config file for automatic testing at travis-ci.org - sudo: required services: @@ -10,18 +8,18 @@ language: python python: 3.6 env: - - TOX_ENV=py36 + - TOX_ENV=py36 before_install: - docker-compose -v - docker -v script: - - tox -e $TOX_ENV - - sh tests/test_docker.sh + - tox -e $TOX_ENV + - sh tests/test_docker.sh install: - - pip install tox + - pip install tox notifications: email: From 95d218e3e4de0ffda03245bba79d807f02679251 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 5 Jun 2018 12:18:07 +0300 Subject: [PATCH 09/15] Rename CeleryConfig to CeleryAppConfig --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- .../{{cookiecutter.project_slug}}/taskapp/celery.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index e767d5dff..f0fb81c2f 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -228,7 +228,7 @@ MANAGERS = ADMINS {% if cookiecutter.use_celery == 'y' -%} # Celery # ------------------------------------------------------------------------------ -INSTALLED_APPS += ['{{cookiecutter.project_slug}}.taskapp.celery.CeleryConfig'] +INSTALLED_APPS += ['{{cookiecutter.project_slug}}.taskapp.celery.CeleryAppConfig'] # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url CELERY_BROKER_URL = env('CELERY_BROKER_URL', default='django://') # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py index 3c5d0e9cd..ed5c71760 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py @@ -13,7 +13,7 @@ if not settings.configured: app = Celery('{{cookiecutter.project_slug}}') -class CeleryConfig(AppConfig): +class CeleryAppConfig(AppConfig): name = '{{cookiecutter.project_slug}}.taskapp' verbose_name = 'Celery Config' From c812e01fc5968a33871ba0ff4742bf7f9e9f04c6 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 5 Jun 2018 12:18:35 +0300 Subject: [PATCH 10/15] Rename UsersConfig to UsersAppConfig --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- .../{{cookiecutter.project_slug}}/users/apps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index f0fb81c2f..26bbd479a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -75,7 +75,7 @@ THIRD_PARTY_APPS = [ 'rest_framework', ] LOCAL_APPS = [ - '{{ cookiecutter.project_slug }}.users.apps.UsersConfig', + '{{ cookiecutter.project_slug }}.users.apps.UsersAppConfig', # Your stuff: custom apps go here ] # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py index 118bfda91..32fab76d7 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py @@ -1,7 +1,7 @@ from django.apps import AppConfig -class UsersConfig(AppConfig): +class UsersAppConfig(AppConfig): name = "{{cookiecutter.project_slug}}.users" verbose_name = "Users" From 27cf4f01da7f578edcb4d44386c980f95cb85804 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 5 Jun 2018 12:23:06 +0300 Subject: [PATCH 11/15] Upgrade postgres to 10.4 Closes #1669. --- cookiecutter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/cookiecutter.json b/cookiecutter.json index bd7ee7222..21a639a3a 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,6 +18,7 @@ "use_pycharm": "n", "use_docker": "n", "postgresql_version": [ + "10.4", "10.3", "10.2", "10.1", From d8526d1b2d0e6d8b97a1a8b2183d295cbc91f0b4 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Tue, 5 Jun 2018 12:28:11 +0300 Subject: [PATCH 12/15] Unset -o xtrace in compose start scripts --- .../compose/local/django/celery/beat/start | 1 - .../compose/local/django/celery/worker/start | 1 - {{cookiecutter.project_slug}}/compose/local/django/start | 1 - 3 files changed, 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start index d1c9db455..4e2493f3b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start @@ -2,7 +2,6 @@ set -o errexit set -o nounset -set -o xtrace rm -f './celerybeat.pid' diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index ecc032504..c8bc31d3a 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -2,7 +2,6 @@ set -o errexit set -o nounset -set -o xtrace celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start index 50227e19e..921604dcb 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/start @@ -3,7 +3,6 @@ set -o errexit set -o pipefail set -o nounset -set -o xtrace python manage.py migrate From 0ff3236ce4e3560b93e729ed5251cebe6ac46dde Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 6 Jun 2018 08:38:28 +0200 Subject: [PATCH 13/15] Update pytest to 3.6.1 (#1675) * Update pytest from 3.6.0 to 3.6.1 * Update pytest from 3.6.0 to 3.6.1 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b428b6cb0..9f378fdaa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ flake8==3.5.0 # Testing # ------------------------------------------------------------------------------ tox==3.0.0 -pytest==3.6.0 +pytest==3.6.1 pytest-cookies==0.3.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index be108fa88..c67276107 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -11,7 +11,7 @@ psycopg2-binary==2.7.4 # https://github.com/psycopg/psycopg2 # Testing # ------------------------------------------------------------------------------ -pytest==3.6.0 # https://github.com/pytest-dev/pytest +pytest==3.6.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar # Code quality From 911e822e8559af56d5067a4e0db9d92debb9f401 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Wed, 6 Jun 2018 09:40:19 +0300 Subject: [PATCH 14/15] Gitignore .pytest_cache/ in project template --- {{cookiecutter.project_slug}}/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index 3cabaac22..c6273596b 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -341,3 +341,5 @@ pip-selfcheck.json MailHog {%- endif %} {{ cookiecutter.project_slug }}/media/ + +.pytest_cache/ From 7d7eb787732762d693e9956d082d99c3bf2399a0 Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Sat, 9 Jun 2018 14:51:54 +0300 Subject: [PATCH 15/15] Remove duplicate Docker Compose service configuration Rationale: those sections will always be there thanks to inheritance --- {{cookiecutter.project_slug}}/local.yml | 6 ------ {{cookiecutter.project_slug}}/production.yml | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index c725fff79..5ad26dfd0 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -56,9 +56,6 @@ services: {% if cookiecutter.use_mailhog == 'y' -%} - mailhog {%- endif %} - env_file: - - ./.envs/.local/.django - - ./.envs/.local/.postgres ports: [] command: /start-celeryworker @@ -71,9 +68,6 @@ services: {% if cookiecutter.use_mailhog == 'y' -%} - mailhog {%- endif %} - env_file: - - ./.envs/.local/.django - - ./.envs/.local/.postgres ports: [] command: /start-celerybeat diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index c76197513..4ee178d82 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -52,23 +52,11 @@ services: celeryworker: <<: *django image: {{ cookiecutter.project_slug }}_production_celeryworker - depends_on: - - postgres - - redis - env_file: - - ./.envs/.production/.django - - ./.envs/.production/.postgres command: /start-celeryworker celerybeat: <<: *django image: {{ cookiecutter.project_slug }}_production_celerybeat - depends_on: - - postgres - - redis - env_file: - - ./.envs/.production/.django - - ./.envs/.production/.postgres command: /start-celerybeat {%- endif %}