From 42101feef1eb1b4992e34d6635fabee582265df0 Mon Sep 17 00:00:00 2001 From: Yotam Tal Date: Tue, 21 Apr 2020 13:45:30 +0300 Subject: [PATCH 001/138] Add hot-reload support to celery worker --- .../compose/local/django/celery/worker/start | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++++ 2 files changed, 5 insertions(+), 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 acd6f157..ef32dd69 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -4,4 +4,4 @@ set -o errexit set -o nounset -celery -A config.celery_app worker -l INFO +watchmedo auto-restart --directory=./ --pattern="*tasks.py;*celery_app.py" --recursive -- celery -A config.celery_app worker -l INFO diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4b113507..0dc58b68 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,6 +5,10 @@ ipdb==0.13.2 # https://github.com/gotcha/ipdb Sphinx==3.0.1 # https://github.com/sphinx-doc/sphinx {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 +{%- if cookiecutter.use_celery == 'y' %} +argh==0.26.2 # http://github.com/neithere/argh/ +watchdog==0.10.2 # http://github.com/gorakhargosh/watchdog +{%- endif %} {%- else %} psycopg2-binary==2.8.5 # https://github.com/psycopg/psycopg2 {%- endif %} From 2bd95984d4fe813c74a4a7fd10f213258e4e7d72 Mon Sep 17 00:00:00 2001 From: Yotam Tal Date: Tue, 21 Apr 2020 13:49:13 +0300 Subject: [PATCH 002/138] add myself to contributors --- CONTRIBUTORS.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 280a9f4f..07e16cd2 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -226,6 +226,7 @@ Listed in alphabetical order. William Archinal `@archinal`_ Xaver Y.R. Chen `@yrchen`_ @yrchen Yaroslav Halchenko + Yotam Tal `@yotamtal`_ Yuchen Xie `@mapx`_ ========================== ============================ ============== @@ -395,6 +396,7 @@ Listed in alphabetical order. .. _@vladdoster: https://github.com/vladdoster .. _@xpostudio4: https://github.com/xpostudio4 .. _@yrchen: https://github.com/yrchen +.. _@yotamtal: https://github.com/yotamtal .. _@yunti: https://github.com/yunti .. _@zcho: https://github.com/zcho From 8d066b3ab4eb3779b76326d103e7a7c39db909b5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 29 Jun 2020 22:46:16 +0100 Subject: [PATCH 003/138] Use watchgod instead of watchdog --- .../compose/local/django/celery/worker/start | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start index ef32dd69..898dca5d 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -4,4 +4,4 @@ set -o errexit set -o nounset -watchmedo auto-restart --directory=./ --pattern="*tasks.py;*celery_app.py" --recursive -- celery -A config.celery_app worker -l INFO +watchgod celery.__main__.main --args -A config.celery_app beat -l INFO diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index a8e7e550..98bbbc5b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,14 +5,10 @@ ipdb==0.13.3 # https://github.com/gotcha/ipdb Sphinx==3.1.1 # https://github.com/sphinx-doc/sphinx {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 -{%- if cookiecutter.use_celery == 'y' %} -argh==0.26.2 # http://github.com/neithere/argh/ -watchdog==0.10.2 # http://github.com/gorakhargosh/watchdog -{%- endif %} {%- else %} psycopg2-binary==2.8.5 # https://github.com/psycopg/psycopg2 {%- endif %} -{%- if cookiecutter.use_async == 'y' %} +{%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchgod==0.6 # https://github.com/samuelcolvin/watchgod {%- endif %} From 8ebb464b33ab6aa3174bf03c06374894f9c7facc Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 7 Jul 2020 18:10:37 +0100 Subject: [PATCH 004/138] Fix beat -> worker --- .../compose/local/django/celery/worker/start | 2 +- 1 file changed, 1 insertion(+), 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 898dca5d..d7b63cd4 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start +++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start @@ -4,4 +4,4 @@ set -o errexit set -o nounset -watchgod celery.__main__.main --args -A config.celery_app beat -l INFO +watchgod celery.__main__.main --args -A config.celery_app worker -l INFO From 21c69c7d454f5ea4d7aaf218d7e7e27a7f626c51 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 12:09:05 -0700 Subject: [PATCH 005/138] Update mypy from 0.782 to 0.790 --- {{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 1b5467e6..27e0ea7a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.782 # https://github.com/python/mypy +mypy==0.790 # https://github.com/python/mypy django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs pytest==6.1.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 81c9a4a76ac2c201fa81393d89f70726bad76e88 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Oct 2020 09:13:14 -0700 Subject: [PATCH 006/138] Update uvicorn from 0.12.1 to 0.12.2 --- {{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 e0045f41..08f8894c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn==0.12.1 # https://github.com/encode/uvicorn +uvicorn==0.12.2 # https://github.com/encode/uvicorn wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} From 8e229ce0e02f7c15fb1fb9760a38adb2b82b6dc7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Oct 2020 23:39:07 -0700 Subject: [PATCH 007/138] Update django-celery-beat from 2.0.0 to 2.1.0 --- {{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 e0045f41..90661fd8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery -django-celery-beat==2.0.0 # https://github.com/celery/django-celery-beat +django-celery-beat==2.1.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==0.9.5 # https://github.com/mher/flower {%- endif %} From eb400e498034ec1fcb3d8eb8167851588d9cc1ec Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Oct 2020 15:52:32 -0700 Subject: [PATCH 008/138] Update pillow from 8.0.0 to 8.0.1 --- {{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 e0045f41..a0dc1aa9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2020.1 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify -Pillow==8.0.0 # https://github.com/python-pillow/Pillow +Pillow==8.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.0.6 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From edbc4d3a8c248ab802a34774ddc1c356a5687c35 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Oct 2020 15:52:35 -0700 Subject: [PATCH 009/138] Update pytest-django from 4.0.0 to 4.1.0 --- {{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 5aaf740b..e5d57932 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,4 +42,4 @@ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==4.0.0 # https://github.com/pytest-dev/pytest-django +pytest-django==4.1.0 # https://github.com/pytest-dev/pytest-django From f2d289588ba1bbe1caf9edfe0e9a7349240dd557 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 24 Oct 2020 11:04:52 -0700 Subject: [PATCH 010/138] Update sh from 1.14.0 to 1.14.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c04acb9..b53316a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==1.7.2 -sh==1.14.0 +sh==1.14.1 binaryornot==0.4.4 # Code quality From 2b3cd5178935a0534e5e6a8c82d8c5385b1e7b66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 07:10:28 +0000 Subject: [PATCH 011/138] Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.6.0 to v4.7.2. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.6.0...bbd291750d2526367d915d5197485331dc2d8dc7) Signed-off-by: dependabot[bot] --- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index b6e2f4be..0c72c781 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -28,7 +28,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.6.0 + uses: stefanzweifel/git-auto-commit-action@v4.7.2 with: commit_message: Update Changelog file_pattern: CHANGELOG.md diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index f3999157..4ce1c76f 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -24,7 +24,7 @@ jobs: run: python scripts/update_contributors.py - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.6.0 + uses: stefanzweifel/git-auto-commit-action@v4.7.2 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 9c0f056817bf51b975e3264dbbed12e3af36324c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Oct 2020 02:10:16 -0700 Subject: [PATCH 012/138] Update django-stubs from 1.6.0 to 1.7.0 --- {{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 5aaf740b..5ca2dcdc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ mypy==0.782 # https://github.com/python/mypy -django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.7.0 # https://github.com/typeddjango/django-stubs pytest==6.1.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 21d8bf5fc3b39a4cd723c526b197e123244581fe Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Oct 2020 23:59:02 -0700 Subject: [PATCH 013/138] Update pytest from 6.1.1 to 6.1.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c04acb9..beb02824 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.1 -pytest==6.1.1 +pytest==6.1.2 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From 5224641a16797cfb469416f5e96c82612a11239c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Oct 2020 23:59:03 -0700 Subject: [PATCH 014/138] Update pytest from 6.1.1 to 6.1.2 --- {{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 5aaf740b..be0063ee 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.782 # https://github.com/python/mypy django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs -pytest==6.1.1 # https://github.com/pytest-dev/pytest +pytest==6.1.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From b14a033c8b295dd15085025beebb91a5710ff31f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Oct 2020 15:44:46 -0700 Subject: [PATCH 015/138] Update pre-commit from 2.7.1 to 2.8.2 --- {{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 5aaf740b..17d28c4d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit +pre-commit==2.8.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From b86ede6079abeb7adf228b5191526dd38807ae96 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 06:37:16 -0800 Subject: [PATCH 016/138] Update pytz from 2020.1 to 2020.4 --- {{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 e0045f41..8dcf820f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2020.1 # https://github.com/stub42/pytz +pytz==2020.4 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify Pillow==8.0.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} From 510ba4ca8a0e2e0537689d9260e61b98afa0abf5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 06:37:19 -0800 Subject: [PATCH 017/138] Update django from 3.0.10 to 3.0.11 --- {{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 e0045f41..39b3fc2a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -30,7 +30,7 @@ wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ # Django # ------------------------------------------------------------------------------ -django==3.0.10 # pyup: < 3.1 # https://www.djangoproject.com/ +django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils django-allauth==0.43.0 # https://github.com/pennersr/django-allauth From 2bd2e4a8fccb6265be6978e4d27831beeab52009 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 06:37:22 -0800 Subject: [PATCH 018/138] Update sphinx from 3.2.1 to 3.3.0 --- {{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 5aaf740b..7cce652c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx +sphinx==3.3.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 4a5717c831db7e5731a9b7dda938b25b775df660 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 15:47:08 -0800 Subject: [PATCH 019/138] Update sentry-sdk from 0.19.1 to 0.19.2 --- {{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 58714e5c..157ac92a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.19.1 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.2 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==1.1.0 # https://github.com/redis/hiredis-py From b40a76eb13c88ebfb064db0352cd98ed099889a4 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 3 Nov 2020 23:35:24 +0000 Subject: [PATCH 020/138] Bump template version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8a5b0b8c..c72ba1c9 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ except ImportError: # Our version ALWAYS matches the version of Django we support # If Django has a new release, we branch, tag, then update this setting after the tag. -version = "3.0.10" +version = "3.0.11" if sys.argv[-1] == "tag": os.system(f'git tag -a {version} -m "version {version}"') From 63ea6bca763a2fc272a58e75bea3d07f5c188eba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2020 00:19:56 +0000 Subject: [PATCH 021/138] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5dc5c1c4..55368bb7 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -4,7 +4,7 @@ fail_fast: true repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v3.3.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From f99a0af4c0618d774cd7d83e7498a5f8cba11a4d Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 4 Nov 2020 02:14:42 +0000 Subject: [PATCH 022/138] Update Changelog --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccb84bd8..2e802de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-03] +### Updated +- Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926)) +- Update sphinx to 3.3.0 ([#2925](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2925)) +- Update django to 3.0.11 ([#2924](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2924)) +- Update pytz to 2020.4 ([#2923](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2923)) +- Update pre-commit to 2.8.2 ([#2919](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2919)) +- Update pytest to 6.1.2 ([#2917](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2917)) +- Update sh to 1.14.1 ([#2912](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2912)) +- Update pytest-django to 4.1.0 ([#2911](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2911)) +- Update pillow to 8.0.1 ([#2910](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2910)) +- Update django-celery-beat to 2.1.0 ([#2907](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2907)) +- Update uvicorn to 0.12.2 ([#2906](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2906)) + ## [2020-10-19] ### Updated - Update sentry-sdk to 0.19.1 ([#2905](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2905)) From 72da0bfa9cb7897b03a5ebaef3f2ece3d31247db Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Wed, 4 Nov 2020 12:17:02 -0500 Subject: [PATCH 023/138] Fix docs service and add RTD support (#2920) Co-authored-by: Andrew-Chen-Wang Co-authored-by: Bruno Alla --- docs/document.rst | 19 ++++++++++++++++-- .../.readthedocs.yml | 9 +++++++++ .../compose/local/docs/Dockerfile | 6 ++++-- .../compose/local/docs/start | 7 +++++++ {{cookiecutter.project_slug}}/docs/Makefile | 2 +- {{cookiecutter.project_slug}}/docs/conf.py | 18 ++++++++++++----- .../docs/{_source => }/howto.rst | 0 .../docs/{_source => }/index.rst | 0 .../{_source => }/pycharm/configuration.rst | 0 .../docs/{_source => }/pycharm/images/1.png | Bin .../docs/{_source => }/pycharm/images/2.png | Bin .../docs/{_source => }/pycharm/images/3.png | Bin .../docs/{_source => }/pycharm/images/4.png | Bin .../docs/{_source => }/pycharm/images/7.png | Bin .../docs/{_source => }/pycharm/images/8.png | Bin .../docs/{_source => }/pycharm/images/f1.png | Bin .../docs/{_source => }/pycharm/images/f2.png | Bin .../docs/{_source => }/pycharm/images/f3.png | Bin .../docs/{_source => }/pycharm/images/f4.png | Bin .../{_source => }/pycharm/images/issue1.png | Bin .../{_source => }/pycharm/images/issue2.png | Bin .../docs/{_source => }/users.rst | 0 {{cookiecutter.project_slug}}/local.yml | 3 ++- 23 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/.readthedocs.yml create mode 100644 {{cookiecutter.project_slug}}/compose/local/docs/start rename {{cookiecutter.project_slug}}/docs/{_source => }/howto.rst (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/index.rst (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/configuration.rst (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/1.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/2.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/3.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/4.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/7.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/8.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f1.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f2.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f3.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f4.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/issue1.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/issue2.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/users.rst (100%) diff --git a/docs/document.rst b/docs/document.rst index 15a5396e..a3097909 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -15,15 +15,30 @@ If you set up your project to `develop locally with docker`_, run the following Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. +Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL. + Generate API documentation ---------------------------- -Edit the ``docs/_source`` files and project application docstrings to create your documentation. +Edit the ``docs`` files and project application docstrings to create your documentation. -Sphinx can automatically include class and function signatures and docstrings in generated documentation. +Sphinx can automatically include class and function signatures and docstrings in generated documentation. See the generated project documentation for more examples. +Setting up ReadTheDocs +---------------------- + +To setup your documentation on `ReadTheDocs`_, you must + +1. Go to `ReadTheDocs`_ and login/create an account +2. Add your GitHub repository +3. Trigger a build + +Additionally, you can auto-build Pull Request previews, but `you must enable it`_. + .. _localhost: http://localhost:7000/ .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html .. _develop locally: ./developing-locally.html .. _develop locally with docker: ./developing-locally-docker.html +.. _ReadTheDocs: https://readthedocs.org/ +.. _you must enable it: https://docs.readthedocs.io/en/latest/guides/autobuild-docs-for-pull-requests.html#autobuild-documentation-for-pull-requests diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml new file mode 100644 index 00000000..b193a85e --- /dev/null +++ b/{{cookiecutter.project_slug}}/.readthedocs.yml @@ -0,0 +1,9 @@ +version: 2 + +sphinx: + configuration: docs/conf.py + +python: + version: 3.8 + install: + - requirements: requirements/local.txt diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 7736777b..315fdd40 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -24,6 +24,8 @@ COPY ./requirements /requirements # All imports needed for autodoc. RUN pip install -r /requirements/local.txt -r /requirements/production.txt -WORKDIR /docs +COPY ./compose/local/docs/start /start-docs +RUN sed -i 's/\r$//g' /start-docs +RUN chmod +x /start-docs -CMD make livehtml +WORKDIR /docs diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start new file mode 100644 index 00000000..fd2e0de6 --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/docs/start @@ -0,0 +1,7 @@ +#!/bin/bash + +set -o errexit +set -o pipefail +set -o nounset + +make livehtml diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index 4f772cad..0b56e1f8 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -5,7 +5,7 @@ # from the environment for the first two. SPHINXOPTS ?= SPHINXBUILD ?= sphinx-build -c . -SOURCEDIR = ./_source +SOURCEDIR = . BUILDDIR = ./_build {%- if cookiecutter.use_docker == 'y' %} APP = /app diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py index 691f351e..c640e1c6 100644 --- a/{{cookiecutter.project_slug}}/docs/conf.py +++ b/{{cookiecutter.project_slug}}/docs/conf.py @@ -14,11 +14,19 @@ import os import sys import django -{% if cookiecutter.use_docker == 'y' %} -sys.path.insert(0, os.path.abspath("/app")) -os.environ.setdefault("DATABASE_URL", "") -{% else %} -sys.path.insert(0, os.path.abspath("..")) +if os.getenv("READTHEDOCS", default=False) == "True": + sys.path.insert(0, os.path.abspath("..")) + os.environ["DJANGO_READ_DOT_ENV_FILE"] = "True" + os.environ["USE_DOCKER"] = "no" +else: +{%- if cookiecutter.use_docker == 'y' %} + sys.path.insert(0, os.path.abspath("/app")) +{%- else %} + sys.path.insert(0, os.path.abspath("..")) +{%- endif %} +os.environ["DATABASE_URL"] = "sqlite:///readthedocs.db" +{%- if cookiecutter.use_celery == 'y' %} +os.environ["CELERY_BROKER_URL"] = os.getenv("REDIS_URL", "redis://redis:6379") {%- endif %} os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") django.setup() diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/howto.rst rename to {{cookiecutter.project_slug}}/docs/howto.rst diff --git a/{{cookiecutter.project_slug}}/docs/_source/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/index.rst rename to {{cookiecutter.project_slug}}/docs/index.rst diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst rename to {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/1.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/3.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/3.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/4.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/4.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/7.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/7.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/8.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/8.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f1.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f3.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f3.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f4.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f4.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/users.rst b/{{cookiecutter.project_slug}}/docs/users.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/users.rst rename to {{cookiecutter.project_slug}}/docs/users.rst diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index a6cbe543..e285f349 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -51,7 +51,8 @@ services: - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z ports: - "7000:7000" - + command: /start-docs + {%- if cookiecutter.use_mailhog == 'y' %} mailhog: From f8a239d4f9844031792993c085be2e13b67dbb10 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 5 Nov 2020 02:15:30 +0000 Subject: [PATCH 024/138] Update Changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e802de1..3748e8c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-04] +### Changed +- Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920)) +- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2914)) +### Updated +- Auto-update pre-commit hooks ([#2908](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2908)) +- Update mypy to 0.790 ([#2886](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2886)) +- Update django-stubs to 1.7.0 ([#2916](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2916)) + ## [2020-11-03] ### Updated - Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926)) From 3750aff3949eb2b77cf41dfd37978623863bd619 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 5 Nov 2020 17:50:07 -0800 Subject: [PATCH 025/138] Update djangorestframework from 3.12.1 to 3.12.2 --- {{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 8b9af7a2..ca92f81a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,6 +41,6 @@ django-compressor==2.4 # https://github.com/django-compressor/django-compressor django-redis==4.12.1 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework -djangorestframework==3.12.1 # https://github.com/encode/django-rest-framework +djangorestframework==3.12.2 # https://github.com/encode/django-rest-framework django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers {%- endif %} From 041ecb0fc648378fd4570e6cb02f9800efb6845f Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 7 Nov 2020 02:15:42 +0000 Subject: [PATCH 026/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3748e8c1..ffc571c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-06] +### Updated +- Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930)) + ## [2020-11-04] ### Changed - Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920)) From 1abfd539e398516130944891660eb8959c22e7b7 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 18:46:19 +0000 Subject: [PATCH 027/138] Basic CI workflow using github actions --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++ .travis.yml | 36 ------------------------------------ 2 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..eb1aeec4 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: CI + +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + script: + - name: Test results + run: tox -e py38 + - name: Black template + run: tox -e black-template + - name: Basic Docker + run: sh tests/test_docker.sh + - name: Extended Docker + run: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp + - name: Bare metal + run: sh tests/test_bare.sh use_celery=y use_compressor=y + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install -U pip + python -m pip install -U tox + - name: ${{ matrix.script.name }} + run: ${{ matrix.script.run }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bfd008e7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -services: - - docker - -language: python - -python: 3.8 - -before_install: - - docker-compose -v - - docker -v - -matrix: - include: - - name: Test results - script: tox -e py38 - - name: Black template - script: tox -e black-template - - name: Basic Docker - script: sh tests/test_docker.sh - - name: Extended Docker - script: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp - - name: Bare metal - script: sh tests/test_bare.sh use_celery=y use_compressor=y - services: - - postgresql - - redis-server - env: - - CELERY_BROKER_URL=redis://localhost:6379/0 - -install: - - pip install tox - -notifications: - email: - on_success: change - on_failure: always From 0a56c9c9b9157db28dbe2427dd7a85acebe8e260 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:01:29 +0000 Subject: [PATCH 028/138] Split out workflow to add services for bare metal tests --- .github/workflows/ci.yml | 69 ++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb1aeec4..3785ec7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,22 +3,14 @@ name: CI on: [push, pull_request] jobs: - test: + tox: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - script: - - name: Test results - run: tox -e py38 - - name: Black template - run: tox -e black-template - - name: Basic Docker - run: sh tests/test_docker.sh - - name: Extended Docker - run: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp - - name: Bare metal - run: sh tests/test_bare.sh use_celery=y use_compressor=y + tox-env: + - py38 + - black-template steps: - uses: actions/checkout@v2 @@ -29,5 +21,54 @@ jobs: run: | python -m pip install -U pip python -m pip install -U tox - - name: ${{ matrix.script.name }} - run: ${{ matrix.script.run }} + - name: Tox ${{ matrix.tox-env }} + run: tox -e ${{ matrix.tox-env }} + + docker: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + script: + - name: Basic + args: "" + - name: Extended + args: "use_celery=y use_drf=y js_task_runner=Gulp" + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Docker ${{ matrix.script.name }} + run: sh tests/test_docker.sh ${{ matrix.script.args }} + + bare: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + script: + - name: With Celery + args: "use_celery=y use_compressor=y" + + services: + redis: + image: redis + ports: + - 6379:6379 + postgres: + image: postgres + env: + POSTGRES_PASSWORD: postgres + + env: + CELERY_BROKER_URL: "redis://localhost:6379/0" + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Bare Metal ${{ matrix.script.name }} + run: sh tests/test_bare.sh ${{ matrix.script.args }} From 56268ec82c4b8969cefd2a87511fbfb15483ec4d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:06:49 +0000 Subject: [PATCH 029/138] Pin service images, expose DB ports and don't set PG password --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3785ec7c..32eaa054 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,13 +54,13 @@ jobs: services: redis: - image: redis + image: redis:5.0 ports: - 6379:6379 postgres: - image: postgres - env: - POSTGRES_PASSWORD: postgres + image: postgres:12 + ports: + - 5432:5432 env: CELERY_BROKER_URL: "redis://localhost:6379/0" From a625327226e77839b39865e484c8b2ce5a02f55e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:18:38 +0000 Subject: [PATCH 030/138] Set some environment variables --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32eaa054..6bc0966b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,10 @@ jobs: - name: Extended args: "use_celery=y use_drf=y js_task_runner=Gulp" + env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -64,6 +68,7 @@ jobs: env: CELERY_BROKER_URL: "redis://localhost:6379/0" + DATABASE_URL: "postgres://postgres" steps: - uses: actions/checkout@v2 From c3d644083052025d05f27f8e786296349990dbc5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:23:48 +0000 Subject: [PATCH 031/138] Explicit DATABASE_URL --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bc0966b..a943bfba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,10 +65,13 @@ jobs: image: postgres:12 ports: - 5432:5432 + env: + POSTGRES_PASSWORD: postgres env: CELERY_BROKER_URL: "redis://localhost:6379/0" - DATABASE_URL: "postgres://postgres" + # postgres://user:password@host:port/database + DATABASE_URL: "postgres://postgres:postgres@postgres:5432/postgres" steps: - uses: actions/checkout@v2 From 2233de8566830bbca8d02a5fe20a183831801823 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:28:09 +0000 Subject: [PATCH 032/138] Connect to PG on localhost --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a943bfba..fb26dd8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: env: CELERY_BROKER_URL: "redis://localhost:6379/0" # postgres://user:password@host:port/database - DATABASE_URL: "postgres://postgres:postgres@postgres:5432/postgres" + DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres" steps: - uses: actions/checkout@v2 From 1e6104ce723809ff758a4b24967bb20dca75f762 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:31:40 +0000 Subject: [PATCH 033/138] Update badge --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index f964635f..dbc510a4 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,8 @@ Cookiecutter Django -======================= +=================== -.. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master - :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master +.. image:: https://img.shields.io/github/workflow/status/pydanny/cookiecutter-django/CI/master + :target: https://github.com/pydanny/cookiecutter-django/actions?query=workflow%3ACI :alt: Build Status .. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest From 46a0b60a29d34d3b8654382408541a0c52b890e6 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:38:16 +0000 Subject: [PATCH 034/138] Ignore pushes to non-master branch to avoid double builds --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb26dd8e..fd966845 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,9 @@ name: CI -on: [push, pull_request] +on: + push: + branches: [ master ] + pull_request: jobs: tox: From 9f3117c61579a6413fc272ddd450a02d79467e2a Mon Sep 17 00:00:00 2001 From: umgelurgel Date: Thu, 12 Nov 2020 18:53:29 +0100 Subject: [PATCH 035/138] Upgrade factory-boy to 3.1.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b57268c7..ccde790a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==2.8.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ -factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy +factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index 1a78f132..05b3ae0b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -23,7 +23,7 @@ class UserFactory(DjangoModelFactory): digits=True, upper_case=True, lower_case=True, - ).generate(extra_kwargs={}) + ).generate(params={"locale": None}) ) self.set_password(password) From aaaa26494a0ed546d6a8e87e86b3e75f1177eab9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 12 Nov 2020 13:10:42 -0800 Subject: [PATCH 036/138] Update sentry-sdk from 0.19.2 to 0.19.3 --- {{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 157ac92a..12e4bd85 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.19.2 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.3 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==1.1.0 # https://github.com/redis/hiredis-py From eca1f45564cc58cdc19cb813b551776fa765e0f2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 12 Nov 2020 13:10:45 -0800 Subject: [PATCH 037/138] Update sphinx from 3.3.0 to 3.3.1 --- {{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 b57268c7..cf505bb4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.3.0 # https://github.com/sphinx-doc/sphinx +sphinx==3.3.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 22ad82b24e29fc3cbcbdca20168b6fecde246313 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 13 Nov 2020 02:15:12 +0000 Subject: [PATCH 038/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffc571c7..51a6149a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-12] +### Changed +- Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931)) + ## [2020-11-06] ### Updated - Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930)) From 94130f9c56a5eea22a5d0f7653cb88a64fb50eeb Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 13 Nov 2020 10:00:15 +0000 Subject: [PATCH 039/138] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 4f2f96df..3ecf0223 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1037,5 +1037,10 @@ "name": "Wes Turner", "github_login": "westurner", "twitter_username": "westurner" + }, + { + "name": "Jakub Musko", + "github_login": "umgelurgel", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e0fda25e..642a6ba9 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -796,6 +796,13 @@ Listed in alphabetical order. + + Jakub Musko + + umgelurgel + + + James Williams From 23b6c0d61f3417688b8a8dc278d2a2f339d20901 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 14 Nov 2020 02:15:20 +0000 Subject: [PATCH 040/138] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51a6149a..da70c8c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-13] +### Changed +- Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932)) +### Updated +- Update sentry-sdk to 0.19.3 ([#2933](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2933)) +- Update sphinx to 3.3.1 ([#2934](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2934)) + ## [2020-11-12] ### Changed - Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931)) From 4b9002d7db8d278f455b1b7915febf0bdfd6dc9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Nov 2020 22:10:36 +0100 Subject: [PATCH 041/138] Fix formatting --- docs/developing-locally.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 0da26548..2b7806ce 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -34,10 +34,10 @@ First things first. $ git init # A git repo is required for pre-commit to install $ pre-commit install - .. note:: + .. note:: - the `pre-commit` exists in the generated project as default. - for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/). + the `pre-commit` exists in the generated project as default. + for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/). #. Create a new PostgreSQL database using createdb_: :: From 4ffa344592c4c76fc959d0de69b307a8dfcf3fc5 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 15 Nov 2020 00:30:23 +0000 Subject: [PATCH 042/138] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 3ecf0223..38ab437e 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1042,5 +1042,10 @@ "name": "Jakub Musko", "github_login": "umgelurgel", "twitter_username": "" + }, + { + "name": "Fabian Affolter", + "github_login": "fabaff", + "twitter_username": "fabaff" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 642a6ba9..8ccbf18e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -656,6 +656,13 @@ Listed in alphabetical order. + + Fabian Affolter + + fabaff + + fabaff + Felipe Arruda From ecc46a36c43b475801d421821feb5b725c9c2697 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 16 Nov 2020 02:15:38 +0000 Subject: [PATCH 043/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da70c8c6..66876897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-15] +### Changed +- Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935)) + ## [2020-11-13] ### Changed - Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932)) From 1ab82a0e33d591cf23855984cd3253f0b756a07a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2020 06:16:21 +0000 Subject: [PATCH 044/138] Bump peter-evans/create-pull-request from v2 to v3.5.0 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v2 to v3.5.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v2...ff0beed1b2103611f5bdb7dfb1b23956763bf79a) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 9937cdeb..c81a25a7 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v2 + uses: peter-evans/create-pull-request@v3.5.0 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 9439c82e60f178b4bafb3f6b920ad9be8c0f9168 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 18 Nov 2020 02:16:09 +0000 Subject: [PATCH 045/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66876897..2e6d7c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-17] +### Changed +- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936)) + ## [2020-11-15] ### Changed - Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935)) From e649b76ec9d045f288e08ac751b501e72c856c77 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 18 Nov 2020 13:53:32 -0800 Subject: [PATCH 046/138] Update django-crispy-forms from 1.9.2 to 1.10.0 --- {{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 ca92f81a..a65825f2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -34,7 +34,7 @@ django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils django-allauth==0.43.0 # https://github.com/pennersr/django-allauth -django-crispy-forms==1.9.2 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4 # https://github.com/django-compressor/django-compressor {%- endif %} From a02aba44e7683a0852f03e28b01aeeb1ce8d7207 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 19 Nov 2020 10:39:39 -0800 Subject: [PATCH 047/138] Update sentry-sdk from 0.19.3 to 0.19.4 --- {{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 12e4bd85..38e5ec86 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.19.3 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.4 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==1.1.0 # https://github.com/redis/hiredis-py From 88f6150c5d1a40c0a119f3909339bc9f3d9481df Mon Sep 17 00:00:00 2001 From: Simon Rey <51708585+eqqe@users.noreply.github.com> Date: Thu, 19 Nov 2020 20:16:56 +0100 Subject: [PATCH 048/138] Fix after uvicorn 0.12.0 - Ship extra dependencies Uvicorn no longer ships extra dependencies uvloop, websockets and httptools as default. To install these dependencies use uvicorn[standard]. cf https://github.com/encode/uvicorn/blob/master/CHANGELOG.md --- {{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 a65825f2..d0630a6d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn==0.12.2 # https://github.com/encode/uvicorn +uvicorn[standard]==0.12.2 # https://github.com/encode/uvicorn wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} From a6b637841665daff0d00e384febbf14210c9c2c1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 20 Nov 2020 02:16:46 +0000 Subject: [PATCH 049/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e6d7c37..c0636762 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-19] +### Updated +- Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937)) + ## [2020-11-17] ### Changed - Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936)) From a30b604a25b9fc32976b31473faeaa764c8342f5 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 21 Nov 2020 02:16:33 +0000 Subject: [PATCH 050/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0636762..3dbb31b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-20] +### Updated +- Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938)) + ## [2020-11-19] ### Updated - Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937)) From f02c57bf3ebba0647c7fe8ca35aaf54867c7f402 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 21 Nov 2020 11:44:46 +0000 Subject: [PATCH 051/138] Remove wsproto --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index d0630a6d..64cb3e0f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,7 +25,6 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- if cookiecutter.use_async == 'y' %} uvicorn[standard]==0.12.2 # https://github.com/encode/uvicorn -wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} # Django From 6e932a48b82c34cd7bbf0d40074bc5bc6286d5d8 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 21 Nov 2020 11:49:57 +0000 Subject: [PATCH 052/138] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 38ab437e..25a33ed5 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1047,5 +1047,10 @@ "name": "Fabian Affolter", "github_login": "fabaff", "twitter_username": "fabaff" + }, + { + "name": "Simon Rey", + "github_login": "eqqe", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8ccbf18e..6649f3fd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1286,6 +1286,13 @@ Listed in alphabetical order. saschalalala + + Simon Rey + + eqqe + + + Sorasful From 132a6f0be2a8b66677809bef25e550531d011ec7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 21 Nov 2020 15:37:47 -0800 Subject: [PATCH 053/138] Update pre-commit from 2.8.2 to 2.9.0 --- {{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 0847e6b2..368dc5bd 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.8.2 # https://github.com/pre-commit/pre-commit +pre-commit==2.9.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 4d6a2b9a1746b4cab0fd20c4cb40f07561858945 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 22 Nov 2020 02:16:48 +0000 Subject: [PATCH 054/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dbb31b1..800de5fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-21] +### Changed +- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939)) + ## [2020-11-20] ### Updated - Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938)) From 90d71f424d0333c2847d21b1bff8b59bbdf0ea13 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 22 Nov 2020 02:00:45 -0800 Subject: [PATCH 055/138] Update uvicorn from 0.12.2 to 0.12.3 --- {{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 64cb3e0f..eea7fe65 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.12.2 # https://github.com/encode/uvicorn +uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn {%- endif %} # Django From 48011f7422d26e1561e59156960c87a0806f0227 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 24 Nov 2020 02:17:31 +0000 Subject: [PATCH 056/138] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 800de5fd..faa102b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-23] +### Updated +- Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943)) +- Update pre-commit to 2.9.0 ([#2942](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2942)) + ## [2020-11-21] ### Changed - Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939)) From b47678a2e84774d9834c103dab49278888ffb568 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 05:47:41 +0000 Subject: [PATCH 057/138] Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.0 to v3.5.1. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.0...ce699aa2d108e9d04fde047a71e44b2bf444b6dc) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index c81a25a7..f471eacf 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.5.0 + uses: peter-evans/create-pull-request@v3.5.1 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 4e978361097c652e8089b3c45e0bb8f88be4f106 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 25 Nov 2020 11:27:41 -0800 Subject: [PATCH 058/138] Update django-allauth from 0.43.0 to 0.44.0 --- {{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 eea7fe65..502928f6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils -django-allauth==0.43.0 # https://github.com/pennersr/django-allauth +django-allauth==0.44.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4 # https://github.com/django-compressor/django-compressor From c33d0f278c0bcd8271927184e5fe0a7e2aa4c4ed Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 25 Nov 2020 15:33:56 -0800 Subject: [PATCH 059/138] Update django-extensions from 3.0.9 to 3.1.0 --- {{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 368dc5bd..5df8e4ae 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,6 +40,6 @@ pre-commit==2.9.0 # https://github.com/pre-commit/pre-commit factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions +django-extensions==3.1.0 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.1.0 # https://github.com/pytest-dev/pytest-django From 3335ee70b451d968ca487cf4707740619bc6574b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 26 Nov 2020 02:17:43 +0000 Subject: [PATCH 060/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index faa102b0..fc617aa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-25] +### Changed +- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944)) + ## [2020-11-23] ### Updated - Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943)) From f63a434d727627af7bfdc622ce538cb12d810891 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 25 Nov 2020 20:33:51 -0800 Subject: [PATCH 061/138] Update pre-commit from 2.9.0 to 2.9.2 --- {{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 368dc5bd..464dc80e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.9.0 # https://github.com/pre-commit/pre-commit +pre-commit==2.9.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From d2ec1eca12ee2f6356a96009e65f60b1975f9ecd Mon Sep 17 00:00:00 2001 From: Thorrak Date: Thu, 26 Nov 2020 10:15:04 -0500 Subject: [PATCH 062/138] Fix typo in message --- .../{{cookiecutter.project_slug}}/users/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 520b1e52..fe41938d 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -31,7 +31,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): def form_valid(self, form): messages.add_message( - self.request, messages.INFO, _("Infos successfully updated") + self.request, messages.INFO, _("Information successfully updated") ) return super().form_valid(form) From 894dbce6459d5aa63f83f71bffaca12708b739c3 Mon Sep 17 00:00:00 2001 From: Thorrak Date: Thu, 26 Nov 2020 10:17:20 -0500 Subject: [PATCH 063/138] Add test for users.form_valid Ensures that the message is added to the request when a form is submitted --- .../users/tests/test_views.py | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 3638c8f6..23d4ab3c 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -1,8 +1,12 @@ import pytest +from django.contrib import messages from django.contrib.auth.models import AnonymousUser +from django.contrib.messages.middleware import MessageMiddleware +from django.contrib.sessions.middleware import SessionMiddleware from django.http.response import Http404 from django.test import RequestFactory +from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm from {{ cookiecutter.project_slug }}.users.models import User from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory from {{ cookiecutter.project_slug }}.users.views import ( @@ -41,6 +45,24 @@ class TestUserUpdateView: assert view.get_object() == user + def test_form_valid(self, user: User, rf: RequestFactory): + view = UserUpdateView() + request = rf.get("/fake-url/") + + # Add the session/message middleware to the request + SessionMiddleware().process_request(request) + MessageMiddleware().process_request(request) + request.user = user + + view.request = request + + # Initialize the form + form = UserChangeForm() + form.cleaned_data = [] + view.form_valid(form) + + assert messages.get_messages(request)._queued_messages[0].message == "Information successfully updated" + class TestUserRedirectView: def test_get_redirect_url(self, user: User, rf: RequestFactory): From ed69df44032c5b9911640e25ec3b30f238d3b46e Mon Sep 17 00:00:00 2001 From: Thorrak Date: Thu, 26 Nov 2020 11:23:46 -0500 Subject: [PATCH 064/138] Change test to iterate through messages instead of accessing _queued_messages directly --- .../{{cookiecutter.project_slug}}/users/tests/test_views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 23d4ab3c..52d14606 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -61,7 +61,11 @@ class TestUserUpdateView: form.cleaned_data = [] view.form_valid(form) - assert messages.get_messages(request)._queued_messages[0].message == "Information successfully updated" + found_message = False + for message in messages.get_messages(request): + assert message.message == "Information successfully updated" + found_message = True + assert found_message class TestUserRedirectView: From bb0c68317cb71bf0ce8095452d815c04fbd1db34 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 27 Nov 2020 02:17:48 +0000 Subject: [PATCH 065/138] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc617aa7..c203da3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-26] +### Updated +- Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947)) +- Update pre-commit to 2.9.2 ([#2948](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2948)) +- Update django-allauth to 0.44.0 ([#2945](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2945)) + ## [2020-11-25] ### Changed - Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944)) From 5ad419e3223fb0b2b4c8e14d80297d521ff92dea Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Dec 2020 13:58:05 +0000 Subject: [PATCH 066/138] Fixes for pip 20.3 --- requirements.txt | 2 +- tests/test_bare.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9f5d0365..f65d4563 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.1 -pytest==6.1.2 +pytest==5.4.3 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 diff --git a/tests/test_bare.sh b/tests/test_bare.sh index 61a66239..eae09dc7 100755 --- a/tests/test_bare.sh +++ b/tests/test_bare.sh @@ -6,9 +6,9 @@ set -o errexit set -x -# Install modern pip to use new resolver: -# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html -pip install 'pip>=20.2' +# Install modern pip with new resolver: +# https://blog.python.org/2020/11/pip-20-3-release-new-resolver.html +pip install 'pip>=20.3' # install test requirements pip install -r requirements.txt @@ -25,7 +25,7 @@ cd my_awesome_project sudo utility/install_os_dependencies.sh install # Install Python deps -pip install --use-feature=2020-resolver -r requirements/local.txt +pip install -r requirements/local.txt # run the project's tests pytest From 092416147ca3c6c9f3e3a3e924a1a44867cde076 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Dec 2020 14:02:54 +0000 Subject: [PATCH 067/138] Pin django-timezone-field==4.0 refs #2950 --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 502928f6..8e870184 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -19,6 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.use_celery == "y" %} celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery django-celery-beat==2.1.0 # https://github.com/celery/django-celery-beat +django-timezone-field==4.0 # https://github.com/celery/django-celery-beat/pull/378 {%- if cookiecutter.use_docker == 'y' %} flower==0.9.5 # https://github.com/mher/flower {%- endif %} From 549274d699dca42125a3f9538fd99378cb30e0b5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Dec 2020 06:09:49 -0800 Subject: [PATCH 068/138] Update django-model-utils from 4.0.0 to 4.1.1 --- {{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 8e870184..9b090069 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn # ------------------------------------------------------------------------------ django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ -django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils +django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} From 1b02e8c90ddcf766b937172fac613ce5e380a150 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Dec 2020 14:14:34 +0000 Subject: [PATCH 069/138] PyUP filter for pytest <6 in template --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f65d4563..02842d2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.1 -pytest==5.4.3 +pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From b2a34f57cdc9e42d68620dd29e2fc177e73a367d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Dec 2020 06:17:15 -0800 Subject: [PATCH 070/138] Update pygithub from 1.53 to 1.54 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 02842d2d..482b0076 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,5 +19,5 @@ pyyaml==5.3.1 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.53 +PyGithub==1.54 jinja2==2.11.2 From 1164d9cbcb5960046d1dce4331912f58c9b6d3d6 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 3 Dec 2020 02:18:33 +0000 Subject: [PATCH 071/138] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c203da3b..ed700575 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-02] +### Updated +- Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957)) +- Update pygithub to 1.54 ([#2958](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2958)) + ## [2020-11-26] ### Updated - Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947)) From 9d6f661d4042b3f3c355f7c559f45bb7c62fa2d1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 3 Dec 2020 03:59:51 -0800 Subject: [PATCH 072/138] Update django-debug-toolbar from 3.1.1 to 3.2 --- {{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 466bef14..8eea2149 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -39,7 +39,7 @@ pre-commit==2.9.2 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.2 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.0 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.1.0 # https://github.com/pytest-dev/pytest-django From 3d9b9dc3047a663ceba1eda66bdf1092114b904b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 5 Dec 2020 02:18:58 +0000 Subject: [PATCH 073/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed700575..056feb7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-04] +### Updated +- Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959)) + ## [2020-12-02] ### Updated - Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957)) From a72e597338f601a22b7d11937cca5b2f86040f47 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Dec 2020 17:14:50 -0800 Subject: [PATCH 074/138] Update pre-commit from 2.9.2 to 2.9.3 --- {{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 8eea2149..ea8f38c3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.9.2 # https://github.com/pre-commit/pre-commit +pre-commit==2.9.3 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From f727c21d087792fb77daea8cd324e4d5bac6eed4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 8 Dec 2020 08:38:13 -0800 Subject: [PATCH 075/138] Update uvicorn from 0.12.3 to 0.13.0 --- {{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 9b090069..ec1a7b90 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,7 +25,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn +uvicorn[standard]==0.13.0 # https://github.com/encode/uvicorn {%- endif %} # Django From 41d760ddd8a49d31340d3f8af487a3a05d8a7f5a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 9 Dec 2020 02:23:26 +0000 Subject: [PATCH 076/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 056feb7e..13725c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-08] +### Updated +- Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961)) + ## [2020-12-04] ### Updated - Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959)) From c1b9c2acc5d7f8f94238284df4533c7e304973b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Dec 2020 06:18:22 +0000 Subject: [PATCH 077/138] Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.1 to v3.5.2. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.1...8c603dbb04b917a9fc2dd991dc54fef54b640b43) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index f471eacf..2b5bb09b 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.5.1 + uses: peter-evans/create-pull-request@v3.5.2 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From dde36972acc994dab08162b941a67fe38381fe12 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 10 Dec 2020 02:25:51 +0000 Subject: [PATCH 078/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13725c12..68f29a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-09] +### Changed +- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2964)) + ## [2020-12-08] ### Updated - Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961)) From 633739d19d87a083fe275a482d6fc158edbe6b26 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 10 Dec 2020 05:17:51 -0800 Subject: [PATCH 079/138] Update sentry-sdk from 0.19.4 to 0.19.5 --- {{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 38e5ec86..eed4477e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.19.4 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.5 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==1.1.0 # https://github.com/redis/hiredis-py From f058c53aa76e0de2a6f5861e4bd9cc08791dd1a6 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 10 Dec 2020 19:54:31 +0000 Subject: [PATCH 080/138] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 25a33ed5..99fd084f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1052,5 +1052,10 @@ "name": "Simon Rey", "github_login": "eqqe", "twitter_username": "" + }, + { + "name": "Yotam Tal", + "github_login": "yotamtal", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6649f3fd..75f0efd2 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1482,6 +1482,13 @@ Listed in alphabetical order. + + Yotam Tal + + yotamtal + + + Yuchen Xie From 9ea6ec46bd711661a9d8732d2b1f81baa784b5e7 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 11 Dec 2020 02:26:26 +0000 Subject: [PATCH 081/138] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68f29a1f..ace31092 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-10] +### Changed +- Hot-reload support to celery ([#2554](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2554)) +### Updated +- Update uvicorn to 0.13.0 ([#2962](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2962)) +- Update sentry-sdk to 0.19.5 ([#2965](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2965)) + ## [2020-12-09] ### Changed - Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2964)) From 5d8908673d4d0844513c5e95c2dea10984a147d1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 12 Dec 2020 04:22:50 -0800 Subject: [PATCH 082/138] Update uvicorn from 0.13.0 to 0.13.1 --- {{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 ec1a7b90..5085f9d5 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,7 +25,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.13.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.13.1 # https://github.com/encode/uvicorn {%- endif %} # Django From 56a3b3d8a5007b80046f163cdd1fd2f19f9e9b26 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 13 Dec 2020 03:32:59 -0800 Subject: [PATCH 083/138] Update django-cors-headers from 3.5.0 to 3.6.0 --- {{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 ec1a7b90..1aa4a296 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -42,5 +42,5 @@ django-redis==4.12.1 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework djangorestframework==3.12.2 # https://github.com/encode/django-rest-framework -django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==3.6.0 # https://github.com/adamchainz/django-cors-headers {%- endif %} From 0d96660e9451bc29f573cfa54041339b4f7df393 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 13 Dec 2020 03:33:02 -0800 Subject: [PATCH 084/138] Update pytest from 6.1.2 to 6.2.0 --- {{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 70e9090f..fe7001c6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.790 # https://github.com/python/mypy django-stubs==1.7.0 # https://github.com/typeddjango/django-stubs -pytest==6.1.2 # https://github.com/pytest-dev/pytest +pytest==6.2.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From 840530ae7df15ab4c725af4297d6bbf34f33397c Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 15 Dec 2020 02:29:03 +0000 Subject: [PATCH 085/138] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ace31092..d98a0b91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-14] +### Updated +- Update pytest to 6.2.0 ([#2968](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2968)) +- Update django-cors-headers to 3.6.0 ([#2967](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2967)) +- Update uvicorn to 0.13.1 ([#2966](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2966)) + ## [2020-12-10] ### Changed - Hot-reload support to celery ([#2554](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2554)) From 1caced19c7284aa0529aa76416c2e6f2b01c2e3b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 16 Dec 2020 00:27:10 +0000 Subject: [PATCH 086/138] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 55368bb7..3fd2b622 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -4,7 +4,7 @@ fail_fast: true repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.3.0 + rev: v3.4.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From 2b023d186db737ff97dae26df401faafe1d60149 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 15 Dec 2020 16:27:21 -0800 Subject: [PATCH 087/138] Update pytest from 6.2.0 to 6.2.1 --- {{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 fe7001c6..bd61be56 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.790 # https://github.com/python/mypy django-stubs==1.7.0 # https://github.com/typeddjango/django-stubs -pytest==6.2.0 # https://github.com/pytest-dev/pytest +pytest==6.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From 20fb67cc0bb450dfdcc1ea103f54654a365de87b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Dec 2020 06:14:37 +0000 Subject: [PATCH 088/138] Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.7.2 to v4.8.0. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.7.2...75802d269e7721b5146d08f6063ba3097c55ad2b) Signed-off-by: dependabot[bot] --- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 0c72c781..ea4ddf61 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -28,7 +28,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.7.2 + uses: stefanzweifel/git-auto-commit-action@v4.8.0 with: commit_message: Update Changelog file_pattern: CHANGELOG.md diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 4ce1c76f..f849484f 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -24,7 +24,7 @@ jobs: run: python scripts/update_contributors.py - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.7.2 + uses: stefanzweifel/git-auto-commit-action@v4.8.0 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 73c10348e49ef4a8a5f758d524e11cedc99e8bf9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Dec 2020 18:22:57 -0800 Subject: [PATCH 089/138] Update django-storages from 1.10.1 to 1.11 --- {{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 eed4477e..7f8c9eae 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,7 +17,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.11 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages {%- endif %} From 6110904fc20a38a8ea70989098260a3af7a88846 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Dec 2020 18:22:57 -0800 Subject: [PATCH 090/138] Update django-storages from 1.10.1 to 1.11 --- {{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 7f8c9eae..cfb5ec68 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.cloud_provider == 'AWS' %} django-storages[boto3]==1.11 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages +django-storages[google]==1.11 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==8.1 # https://github.com/anymail/django-anymail From bdd1345a9785a648585b7b55132f191aab6b1f90 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 19 Dec 2020 02:33:21 +0000 Subject: [PATCH 091/138] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d98a0b91..a7ba2e99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-18] +### Changed +- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2972)) +### Updated +- Update django-storages to 1.11 ([#2973](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2973)) +- Update pytest to 6.2.1 ([#2971](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2971)) +- Auto-update pre-commit hooks ([#2970](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2970)) + ## [2020-12-14] ### Updated - Update pytest to 6.2.0 ([#2968](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2968)) From cf6935b0a28f1df7510540eaee6305f4deea20cb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Dec 2020 01:02:40 -0800 Subject: [PATCH 092/138] Update uvicorn from 0.13.1 to 0.13.2 --- {{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 6ebbdb47..e6f8c808 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,7 +25,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.13.1 # https://github.com/encode/uvicorn +uvicorn[standard]==0.13.2 # https://github.com/encode/uvicorn {%- endif %} # Django From 1532af099f34672b545c36f1b74aea484be040d1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Dec 2020 01:02:43 -0800 Subject: [PATCH 093/138] Update coverage from 5.3 to 5.3.1 --- {{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 bd61be56..1fa22dc2 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==3.8.4 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort -coverage==5.3 # https://github.com/nedbat/coveragepy +coverage==5.3.1 # https://github.com/nedbat/coveragepy black==20.8b1 # https://github.com/ambv/black pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 0b0d713d4f1a0d4bc682ca50a124647aef97b854 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Dec 2020 09:49:47 -0800 Subject: [PATCH 094/138] Update sphinx from 3.3.1 to 3.4.0 --- {{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 bd61be56..45147dc3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.3.1 # https://github.com/sphinx-doc/sphinx +sphinx==3.4.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 6a948603596ffadc7d2424f2a7f9fdb4ac17cc0f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Dec 2020 10:32:44 -0800 Subject: [PATCH 095/138] Update flower from 0.9.5 to 0.9.7 --- {{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 6ebbdb47..b994c30e 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -21,7 +21,7 @@ celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery django-celery-beat==2.1.0 # https://github.com/celery/django-celery-beat django-timezone-field==4.0 # https://github.com/celery/django-celery-beat/pull/378 {%- if cookiecutter.use_docker == 'y' %} -flower==0.9.5 # https://github.com/mher/flower +flower==0.9.7 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} From 5e41838b391d3cb1cb99bc31bf2ca9b50042c48c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Dec 2020 06:12:42 +0000 Subject: [PATCH 096/138] Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.2 to v3.6.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.2...45c510e1f68ba052e3cd911f661a799cfb9ba3a3) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 2b5bb09b..c76a501b 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.5.2 + uses: peter-evans/create-pull-request@v3.6.0 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 53bbbb8e177eb0f502f82f064e48ea36f32eb423 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 24 Dec 2020 02:42:38 +0000 Subject: [PATCH 097/138] Update Changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7ba2e99..5a53d671 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-23] +### Changed +- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2980)) +### Updated +- Update flower to 0.9.7 ([#2979](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2979)) +- Update sphinx to 3.4.0 ([#2978](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2978)) +- Update coverage to 5.3.1 ([#2977](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2977)) +- Update uvicorn to 0.13.2 ([#2976](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2976)) + ## [2020-12-18] ### Changed - Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2972)) From 5061f2a69f2f731be7e7ec3c70deffbdfee4abee Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 23 Dec 2020 18:42:45 -0800 Subject: [PATCH 098/138] Update django-storages from 1.11 to 1.11.1 --- {{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 cfb5ec68..02dfe19f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,7 +17,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.11 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.11.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} django-storages[google]==1.11 # https://github.com/jschneier/django-storages {%- endif %} From 3827d742f3b9caeea6eeb137623e25adfa4002cc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 23 Dec 2020 18:42:46 -0800 Subject: [PATCH 099/138] Update django-storages from 1.11 to 1.11.1 --- {{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 02dfe19f..4a610d0c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.cloud_provider == 'AWS' %} django-storages[boto3]==1.11.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.11 # https://github.com/jschneier/django-storages +django-storages[google]==1.11.1 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==8.1 # https://github.com/anymail/django-anymail From af30966400f95dc9e95dfe07ad2c40da097a78ba Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 23 Dec 2020 22:19:17 -0800 Subject: [PATCH 100/138] Update pygithub from 1.54 to 1.54.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 482b0076..90003188 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,5 +19,5 @@ pyyaml==5.3.1 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.54 +PyGithub==1.54.1 jinja2==2.11.2 From c122de1068fceba94b72d48c035e0ae072c4b775 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 24 Dec 2020 20:52:28 -0800 Subject: [PATCH 101/138] Update pytz from 2020.4 to 2020.5 --- {{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 cbad7d14..fb347973 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2020.4 # https://github.com/stub42/pytz +pytz==2020.5 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify Pillow==8.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} From f3dc0dbc6df032ec69a77a3998bb8051c9fa49cc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 24 Dec 2020 20:52:31 -0800 Subject: [PATCH 102/138] Update sphinx from 3.4.0 to 3.4.1 --- {{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 7ce64023..718242b8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.4.0 # https://github.com/sphinx-doc/sphinx +sphinx==3.4.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From eeae7e5f24467316b5df9d2ec45faef50340a450 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 27 Dec 2020 02:40:39 +0000 Subject: [PATCH 103/138] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a53d671..6527d6c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-26] +### Updated +- Update sphinx to 3.4.1 ([#2985](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2985)) +- Update pytz to 2020.5 ([#2984](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2984)) + ## [2020-12-23] ### Changed - Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2980)) From c077028310ec8196a070fc7e05816493173d28c4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 28 Dec 2020 02:41:37 -0800 Subject: [PATCH 104/138] Update factory-boy from 3.1.0 to 3.2.0 --- {{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 718242b8..b831b46a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==2.9.3 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ -factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy +factory-boy==3.2.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.2 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.0 # https://github.com/django-extensions/django-extensions From 3950f2e504c14c23cb70eda36805a865c9f3d97e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 29 Dec 2020 09:14:44 -0800 Subject: [PATCH 105/138] Update uvicorn from 0.13.2 to 0.13.3 --- {{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 fb347973..eae4ac89 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,7 +25,7 @@ flower==0.9.7 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.13.2 # https://github.com/encode/uvicorn +uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn {%- endif %} # Django From 86a388b7a4bf3196cb9f2c44667ee095a5d08106 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 30 Dec 2020 02:43:05 +0000 Subject: [PATCH 106/138] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6527d6c2..7a643436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-29] +### Updated +- Update pygithub to 1.54.1 ([#2982](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2982)) +- Update django-storages to 1.11.1 ([#2981](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2981)) + ## [2020-12-26] ### Updated - Update sphinx to 3.4.1 ([#2985](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2985)) From a511e3dd94821832dcb1f8282e49d8451e356d30 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 30 Dec 2020 20:16:52 -0800 Subject: [PATCH 107/138] Update isort from 5.6.4 to 5.7.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 90003188..b4134946 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.6.4 +isort==5.7.0 flake8==3.8.4 flake8-isort==4.0.0 From 06bd13a191b3415465fdb3891e61b4b0d1883720 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 1 Jan 2021 00:39:49 +0000 Subject: [PATCH 108/138] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 3fd2b622..5a5b58a6 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.6.4 + rev: 5.7.0 hooks: - id: isort From 64a1c46cf4c3dacffdc95d9d10243538112e3f8f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 2 Jan 2021 16:48:49 -0800 Subject: [PATCH 109/138] Update pillow from 8.0.1 to 8.1.0 --- {{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 fb347973..bf152e07 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2020.5 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify -Pillow==8.0.1 # https://github.com/python-pillow/Pillow +Pillow==8.1.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.0.6 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From 91b543228648376d8d20ea6fdb9b3644e7d8be5f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 4 Jan 2021 08:45:17 -0800 Subject: [PATCH 110/138] Update sphinx from 3.4.1 to 3.4.2 --- {{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 718242b8..3917c86c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.4.1 # https://github.com/sphinx-doc/sphinx +sphinx==3.4.2 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From e071a6d66b2728d4eefb5395ac4ee7ddca49caf2 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 5 Jan 2021 02:51:26 +0000 Subject: [PATCH 111/138] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a643436..9d2b4ba4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-01-04] +### Updated +- Update isort to 5.7.0 ([#2988](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2988)) +- Update uvicorn to 0.13.3 ([#2987](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2987)) +- Auto-update pre-commit hooks ([#2990](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2990)) +- Update sphinx to 3.4.2 ([#2995](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2995)) +- Update pillow to 8.1.0 ([#2993](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2993)) + ## [2020-12-29] ### Updated - Update pygithub to 1.54.1 ([#2982](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2982)) From a395383256018ce56b5f77fa346cf2a5d15f5563 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 6 Jan 2021 02:17:12 -0800 Subject: [PATCH 112/138] Update pylint-django from 2.3.0 to 2.4.0 --- {{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 3917c86c..f6f1f019 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ flake8==3.8.4 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.3.1 # https://github.com/nedbat/coveragepy black==20.8b1 # https://github.com/ambv/black -pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django +pylint-django==2.4.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} From dce3144b3989f5634a38e1c9d2b5cd128d1266c1 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:27:50 -0500 Subject: [PATCH 113/138] Omit first_name and last_name in User model --- .../{{cookiecutter.project_slug}}/users/models.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 8391bc03..712a355b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -9,6 +9,8 @@ class User(AbstractUser): #: First and last name do not cover name patterns around the globe name = CharField(_("Name of User"), blank=True, max_length=255) + first_name = None + last_name = None def get_absolute_url(self): """Get url for user's detail view. From 2f416f90574fbfc60e1e7c5db0e2cb22dfd42b7a Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:30:27 -0500 Subject: [PATCH 114/138] Remove first_name and last_name from migrations --- .../users/migrations/0001_initial.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py index c9d89056..ef2c2d94 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py @@ -53,18 +53,6 @@ class Migration(migrations.Migration): verbose_name="username", ), ), - ( - "first_name", - models.CharField( - blank=True, max_length=30, verbose_name="first name" - ), - ), - ( - "last_name", - models.CharField( - blank=True, max_length=150, verbose_name="last name" - ), - ), ( "email", models.EmailField( From e83933ae7a251938001497da5da37bf229a99ee8 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:34:39 -0500 Subject: [PATCH 115/138] Upgrade Travis to Focal --- {{cookiecutter.project_slug}}/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml index 24f9f24a..f478685e 100644 --- a/{{cookiecutter.project_slug}}/.travis.yml +++ b/{{cookiecutter.project_slug}}/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: focal language: python python: From 5809eabb31543e518eb7eaffca08e793b65b7a78 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:39:18 -0500 Subject: [PATCH 116/138] Ignore typing override in name removals --- .../{{cookiecutter.project_slug}}/users/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 712a355b..935eee9a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -9,8 +9,8 @@ class User(AbstractUser): #: First and last name do not cover name patterns around the globe name = CharField(_("Name of User"), blank=True, max_length=255) - first_name = None - last_name = None + first_name = None # type: ignore + last_name = None # type: ignore def get_absolute_url(self): """Get url for user's detail view. From 305347e7c7ad157a418c4ca64db65644592c08a7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 7 Jan 2021 22:04:13 -0800 Subject: [PATCH 117/138] Update sphinx from 3.4.2 to 3.4.3 --- {{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 3917c86c..20ffbc5d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.4.2 # https://github.com/sphinx-doc/sphinx +sphinx==3.4.3 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 42f6b1c3a5b86fe52dbc20c5212b372a93bd4083 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 8 Jan 2021 02:34:59 -0800 Subject: [PATCH 118/138] Update pylint-django from 2.4.0 to 2.4.1 --- {{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 c5cdb64e..4c957fd5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ flake8==3.8.4 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.3.1 # https://github.com/nedbat/coveragepy black==20.8b1 # https://github.com/ambv/black -pylint-django==2.4.0 # https://github.com/PyCQA/pylint-django +pylint-django==2.4.1 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} From 85e846a2c6d1a2b90db8e15f092e71f95f47421a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 9 Jan 2021 02:57:06 +0000 Subject: [PATCH 119/138] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d2b4ba4..e4bf44c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-01-08] +### Changed +- Upgrade Travis to Focal ([#2999](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2999)) +### Updated +- Update pylint-django to 2.4.1 ([#3001](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3001)) +- Update sphinx to 3.4.3 ([#3000](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3000)) +- Update pylint-django to 2.4.0 ([#2996](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2996)) + ## [2021-01-04] ### Updated - Update isort to 5.7.0 ([#2988](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2988)) From d25dcfe1931dfb72f559d135ed0767fc4d9ebb90 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 8 Jan 2021 18:57:23 -0800 Subject: [PATCH 120/138] Update tox from 3.20.1 to 3.21.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b4134946..ded1ebc4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ -tox==3.20.1 +tox==3.21.0 pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 pytest-cookies==0.5.1 pytest-instafail==0.4.2 From a99833e8c673987fd3a215b530de715266a0c37f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 10 Jan 2021 05:14:01 -0800 Subject: [PATCH 121/138] Update pylint-django from 2.4.1 to 2.4.2 --- {{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 4c957fd5..349442ac 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ flake8==3.8.4 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.3.1 # https://github.com/nedbat/coveragepy black==20.8b1 # https://github.com/ambv/black -pylint-django==2.4.1 # https://github.com/PyCQA/pylint-django +pylint-django==2.4.2 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} From 4958941810400b878145fd3fdfa41e32de8cb482 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 11 Jan 2021 03:01:51 +0000 Subject: [PATCH 122/138] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4bf44c0..476dd4ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-01-10] +### Updated +- Update pylint-django to 2.4.2 ([#3003](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3003)) +- Update tox to 3.21.0 ([#3002](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3002)) + ## [2021-01-08] ### Changed - Upgrade Travis to Focal ([#2999](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2999)) From 1872bc65f4b144e036a3f4ee188f42035d161c64 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 13 Jan 2021 12:05:30 -0800 Subject: [PATCH 123/138] Update tox from 3.21.0 to 3.21.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ded1ebc4..375d6345 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ -tox==3.21.0 +tox==3.21.1 pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 pytest-cookies==0.5.1 pytest-instafail==0.4.2 From adb8abe040d0d93396324036c9ba1b69437b50fd Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 15 Jan 2021 03:12:42 +0000 Subject: [PATCH 124/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 476dd4ad..13531da5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-01-14] +### Updated +- Update tox to 3.21.1 ([#3006](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3006)) + ## [2021-01-10] ### Updated - Update pylint-django to 2.4.2 ([#3003](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3003)) From 2d84fe89dd44cf5abf85ce6285fa130ad5e951e2 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Mon, 18 Jan 2021 16:06:31 -0300 Subject: [PATCH 125/138] Move sentry-sdk requirement to base.txt --- {{cookiecutter.project_slug}}/requirements/base.txt | 3 +++ {{cookiecutter.project_slug}}/requirements/production.txt | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 41ba12b7..36c18edf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -27,6 +27,9 @@ flower==0.9.7 # https://github.com/mher/flower {%- if cookiecutter.use_async == 'y' %} uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn {%- endif %} +{%- if cookiecutter.use_sentry == "y" %} +sentry-sdk==0.19.5 # https://github.com/getsentry/sentry-python +{%- endif %} # Django # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4a610d0c..fed43ceb 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -7,9 +7,6 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} -{%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.19.5 # https://github.com/getsentry/sentry-python -{%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- endif %} From 1858fc2be83a54110d287df7d983f18aa03dbc70 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Mon, 18 Jan 2021 17:58:00 -0300 Subject: [PATCH 126/138] Revert "Move sentry-sdk requirement to base.txt" This reverts commit 2d84fe89dd44cf5abf85ce6285fa130ad5e951e2. --- {{cookiecutter.project_slug}}/requirements/base.txt | 3 --- {{cookiecutter.project_slug}}/requirements/production.txt | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 36c18edf..41ba12b7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -27,9 +27,6 @@ flower==0.9.7 # https://github.com/mher/flower {%- if cookiecutter.use_async == 'y' %} uvicorn[standard]==0.13.3 # https://github.com/encode/uvicorn {%- endif %} -{%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.19.5 # https://github.com/getsentry/sentry-python -{%- endif %} # Django # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index fed43ceb..4a610d0c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -7,6 +7,9 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} +{%- if cookiecutter.use_sentry == "y" %} +sentry-sdk==0.19.5 # https://github.com/getsentry/sentry-python +{%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- endif %} From af1cfc82c6aff6a71efc4bdc3a3ec75a7525144f Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Mon, 18 Jan 2021 18:05:22 -0300 Subject: [PATCH 127/138] Fix docker container stop command on github action --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 52818e18..57add2c0 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: run: docker-compose -f local.yml exec -T django pytest - name: Tear down the Stack - run: docker-compose down + run: docker-compose -f local.yml down {%- else %} From ea57990b06903de589f5bbba7c19b4bbe4d37469 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Mon, 18 Jan 2021 19:38:53 -0300 Subject: [PATCH 128/138] Update Heroku runtime to python3.8.7 --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 43b47fb4..3e4835ce 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.8.5 +python-3.8.7 From 3e0c40f5b6cd0e975b21e333e605fc71368f9849 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 19 Jan 2021 20:45:44 -0800 Subject: [PATCH 129/138] Update django-celery-beat from 2.1.0 to 2.2.0 --- {{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 41ba12b7..d8904d69 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery -django-celery-beat==2.1.0 # https://github.com/celery/django-celery-beat +django-celery-beat==2.2.0 # https://github.com/celery/django-celery-beat django-timezone-field==4.0 # https://github.com/celery/django-celery-beat/pull/378 {%- if cookiecutter.use_docker == 'y' %} flower==0.9.7 # https://github.com/mher/flower From 30d8498a79d3e02fecbb8cb03ee92208c2d7a72d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 20 Jan 2021 13:31:41 -0800 Subject: [PATCH 130/138] Update tox from 3.21.1 to 3.21.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 375d6345..55182fa3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ -tox==3.21.1 +tox==3.21.2 pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 pytest-cookies==0.5.1 pytest-instafail==0.4.2 From d72c311e9b3c92942075135cbf51b9300e6413d1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 20 Jan 2021 14:54:34 -0800 Subject: [PATCH 131/138] Update pyyaml from 5.3.1 to 5.4.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 375d6345..88f09127 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ tox==3.21.1 pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 pytest-cookies==0.5.1 pytest-instafail==0.4.2 -pyyaml==5.3.1 +pyyaml==5.4.1 # Scripting # ------------------------------------------------------------------------------ From 3cbd840a96628282e8ab99c2dc2cf4e7e711fa82 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 21 Jan 2021 19:02:01 -0500 Subject: [PATCH 132/138] Use self.request.user instead of second query --- .../{{cookiecutter.project_slug}}/users/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py index 520b1e52..f3a240d8 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py @@ -27,7 +27,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): return reverse("users:detail", kwargs={"username": self.request.user.username}) def get_object(self): - return User.objects.get(username=self.request.user.username) + return self.request.user def form_valid(self, form): messages.add_message( From 4f52366a9149aa4d752295d40d4c609ebc1bb97a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 22 Jan 2021 13:28:28 -0800 Subject: [PATCH 133/138] Update mypy from 0.790 to 0.800 --- {{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 349442ac..ca677877 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.790 # https://github.com/python/mypy +mypy==0.800 # https://github.com/python/mypy django-stubs==1.7.0 # https://github.com/typeddjango/django-stubs pytest==6.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 5a8a86ec44ba5c018e5630370fc23d3c69f72d39 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 23 Jan 2021 03:15:12 +0000 Subject: [PATCH 134/138] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13531da5..1b47539f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-01-22] +### Changed +- Use self.request.user instead of second query ([#3012](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3012)) + ## [2021-01-14] ### Updated - Update tox to 3.21.1 ([#3006](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3006)) From b7c95f6eed786000278f5719fbf4ac037af20e50 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 24 Jan 2021 14:20:39 +0000 Subject: [PATCH 135/138] Update factory-boy's .generate to evaluate Co-Authored-By: Timo Halbesma --- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index 05b3ae0b..edd306cb 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -23,7 +23,7 @@ class UserFactory(DjangoModelFactory): digits=True, upper_case=True, lower_case=True, - ).generate(params={"locale": None}) + ).evaluate(None, None, extra={"locale": None}) ) self.set_password(password) From 99f6cf35bb9cf3f5f4dad0db4d077ff3bea78fb1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 24 Jan 2021 15:08:56 +0000 Subject: [PATCH 136/138] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 99fd084f..7976ce1d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1057,5 +1057,10 @@ "name": "Yotam Tal", "github_login": "yotamtal", "twitter_username": "" + }, + { + "name": "John", + "github_login": "thorrak", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 75f0efd2..dd66bd95 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -866,6 +866,13 @@ Listed in alphabetical order. afrowave + + John + + thorrak + + + John Cass From 42f33527c51effce8ad39e8b7d7f94a6a642d736 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 24 Jan 2021 15:11:15 +0000 Subject: [PATCH 137/138] Refactor test --- .../users/tests/test_views.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 52d14606..c2fe8b51 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -61,11 +61,8 @@ class TestUserUpdateView: form.cleaned_data = [] view.form_valid(form) - found_message = False - for message in messages.get_messages(request): - assert message.message == "Information successfully updated" - found_message = True - assert found_message + messages_sent = [m.message for m in messages.get_messages(request)] + assert messages_sent == ["Information successfully updated"] class TestUserRedirectView: From eb6fad5f3299c9dadf0fc7e844c651bf37541631 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 24 Jan 2021 15:23:56 +0000 Subject: [PATCH 138/138] Remove pinning of django-timezone-field fixes #2950 --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index d8904d69..475ac186 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -19,7 +19,6 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.use_celery == "y" %} celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery django-celery-beat==2.2.0 # https://github.com/celery/django-celery-beat -django-timezone-field==4.0 # https://github.com/celery/django-celery-beat/pull/378 {%- if cookiecutter.use_docker == 'y' %} flower==0.9.7 # https://github.com/mher/flower {%- endif %}