From 405e2623225b479427234591d8ae118363c69036 Mon Sep 17 00:00:00 2001 From: Andrew-Chen-Wang Date: Tue, 4 May 2021 11:34:25 -0400 Subject: [PATCH 001/100] Update PG versions. Drop PG 9 Signed-off-by: Andrew-Chen-Wang --- README.rst | 9 ++++----- cookiecutter.json | 9 ++++----- tests/test_cookiecutter_generation.py | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index ae869950..3a9d931a 100644 --- a/README.rst +++ b/README.rst @@ -177,11 +177,10 @@ Answer the prompts with your own desired options_. For example:: use_heroku [n]: y use_compressor [n]: y Select postgresql_version: - 1 - 12.3 - 2 - 11.8 - 3 - 10.8 - 4 - 9.6 - 5 - 9.5 + 1 - 13.2 + 2 - 12.6 + 3 - 11.11 + 4 - 10.16 Choose from 1, 2, 3, 4, 5 [1]: 1 Select js_task_runner: 1 - None diff --git a/cookiecutter.json b/cookiecutter.json index 4a580036..0f9a2c76 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,11 +18,10 @@ "use_pycharm": "n", "use_docker": "n", "postgresql_version": [ - "12.3", - "11.8", - "10.8", - "9.6", - "9.5" + "13.2", + "12.6", + "11.11", + "10.16" ], "js_task_runner": [ "None", diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index c8514493..ed993206 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -37,11 +37,10 @@ SUPPORTED_COMBINATIONS = [ {"use_pycharm": "n"}, {"use_docker": "y"}, {"use_docker": "n"}, - {"postgresql_version": "12.3"}, - {"postgresql_version": "11.8"}, - {"postgresql_version": "10.8"}, - {"postgresql_version": "9.6"}, - {"postgresql_version": "9.5"}, + {"postgresql_version": "13.2"}, + {"postgresql_version": "12.6"}, + {"postgresql_version": "11.11"}, + {"postgresql_version": "10.16"}, {"cloud_provider": "AWS", "use_whitenoise": "y"}, {"cloud_provider": "AWS", "use_whitenoise": "n"}, {"cloud_provider": "GCP", "use_whitenoise": "y"}, From 460e4aa3041f45ac0ceecbb35339d7b0aa9cb7e1 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Tue, 4 May 2021 11:39:03 -0400 Subject: [PATCH 002/100] Update README with PG version constraint --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 3a9d931a..cf6778e0 100644 --- a/README.rst +++ b/README.rst @@ -96,7 +96,7 @@ Constraints ----------- * Only maintained 3rd party libraries are used. -* Uses PostgreSQL everywhere (9.4 - 12.3) +* Uses PostgreSQL everywhere (10.16 - 13.2) * Environment variables for configuration (This won't work with Apache/mod_wsgi). Support this Project! From d0470348328f77676ea805174fadc50861ea71a7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 4 May 2021 14:13:38 -0700 Subject: [PATCH 003/100] Update pytest from 6.2.3 to 6.2.4 --- {{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 528ab0bd..43d1d966 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.812 # https://github.com/python/mypy django-stubs==1.8.0 # https://github.com/typeddjango/django-stubs -pytest==6.2.3 # https://github.com/pytest-dev/pytest +pytest==6.2.4 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From 1c901f1ba516b123f28f5b64600fd794d0b0c181 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 5 May 2021 11:18:47 -0700 Subject: [PATCH 004/100] Update tox from 3.23.0 to 3.23.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9b2477c7..a39a96ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.12.1 # Testing # ------------------------------------------------------------------------------ -tox==3.23.0 +tox==3.23.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 5368d63dc0f38f441a8f3b7d94dcf441769aa111 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 5 May 2021 18:17:39 -0700 Subject: [PATCH 005/100] Update python-slugify from 4.0.1 to 5.0.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 4c66854a..0347ef08 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ pytz==2021.1 # https://github.com/stub42/pytz -python-slugify==4.0.1 # https://github.com/un33k/python-slugify +python-slugify==5.0.2 # https://github.com/un33k/python-slugify Pillow==8.2.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} From 2aa0c3e5757cd3196abc753515222fadd1424b82 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 7 May 2021 07:38:30 -0700 Subject: [PATCH 006/100] Update sentry-sdk from 1.0.0 to 1.1.0 --- {{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 6e566ecc..3df7c566 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==1.0.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.1.0 # 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 46be2df79ea4652b345604da216be2ef3f1603b5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 8 May 2021 17:03:14 -0700 Subject: [PATCH 007/100] Update flake8 from 3.9.1 to 3.9.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9b2477c7..4baa7567 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ black==21.4b2 isort==5.8.0 -flake8==3.9.1 +flake8==3.9.2 flake8-isort==4.0.0 pre-commit==2.12.1 From fffe0d74e54b60a3a96cceda595b67e8c7970a3d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 8 May 2021 17:03:14 -0700 Subject: [PATCH 008/100] Update flake8 from 3.9.1 to 3.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 528ab0bd..99e3c878 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -25,7 +25,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -flake8==3.9.1 # https://github.com/PyCQA/flake8 +flake8==3.9.2 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.5 # https://github.com/nedbat/coveragepy black==21.4b2 # https://github.com/ambv/black From 20ea166732e87d258b7e15e6b7edaabceb80e1c5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 10 May 2021 11:42:15 -0700 Subject: [PATCH 009/100] Update black from 21.4b2 to 21.5b1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9b2477c7..06ce4255 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==21.4b2 +black==21.5b1 isort==5.8.0 flake8==3.9.1 flake8-isort==4.0.0 From f37e472c35811bcd5559741f9c77264affae8903 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 10 May 2021 11:42:15 -0700 Subject: [PATCH 010/100] Update black from 21.4b2 to 21.5b1 --- {{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 528ab0bd..366f9780 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==3.9.1 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.5 # https://github.com/nedbat/coveragepy -black==21.4b2 # https://github.com/ambv/black +black==21.5b1 # https://github.com/ambv/black pylint-django==2.4.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From 5d665bbc7142f5844f578f1df171832e3e616b27 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 11 May 2021 00:04:21 +0000 Subject: [PATCH 011/100] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ffad2893..e21ebc1f 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: check-yaml - repo: https://github.com/psf/black - rev: 21.4b2 + rev: 21.5b1 hooks: - id: black @@ -21,7 +21,7 @@ repos: - id: isort - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.1 + rev: 3.9.2 hooks: - id: flake8 args: ['--config=setup.cfg'] From f42dc4bdbcc22b1405ab4a26cc04a4af73235bf7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 11 May 2021 11:31:39 -0700 Subject: [PATCH 012/100] Update sphinx from 3.5.4 to 4.0.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 528ab0bd..0be52c4a 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.5.4 # https://github.com/sphinx-doc/sphinx +sphinx==4.0.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From f75de19e26d74291d0847289b9067fe06e3daeb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 05:11:28 +0000 Subject: [PATCH 013/100] Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.10.0 to 4.11.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.10.0...v4.11.0) 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 62079f3d..5a9c6bd0 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.10.0 + uses: stefanzweifel/git-auto-commit-action@v4.11.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 e416e961..4a110959 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.10.0 + uses: stefanzweifel/git-auto-commit-action@v4.11.0 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 05ac73b7b91a5da0e09f86b92bdaaf7cdbf7763e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 05:12:25 +0000 Subject: [PATCH 014/100] Bump actions/setup-python from 2 to 2.2.2 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 2.2.2. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v2.2.2) Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd1389c0..a1b63595 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.2.2 with: python-version: 3.9 - name: Install dependencies @@ -44,7 +44,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.2.2 with: python-version: 3.9 - name: Docker ${{ matrix.script.name }} @@ -78,7 +78,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.2.2 with: python-version: 3.9 - name: Bare Metal ${{ matrix.script.name }} diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index d433e00d..8e3b21e0 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.2.2 with: python-version: 3.9 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 62079f3d..159b1998 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.2.2 with: python-version: 3.9 - name: Install dependencies diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index e416e961..d4d211a5 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.2.2 with: python-version: 3.9 - name: Install dependencies From a80c91de44e66ae062f3112a4c73bab8e9c61608 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 13 May 2021 02:01:24 -0400 Subject: [PATCH 015/100] Update watchgod to 0.7 --- {{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 528ab0bd..a9b65606 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchgod==0.6 # https://github.com/samuelcolvin/watchgod +watchgod==0.7 # https://github.com/samuelcolvin/watchgod {%- endif %} # Testing From 95fd002127fbbf476c246b1755f119c25aa8abbb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 13 May 2021 14:49:41 -0700 Subject: [PATCH 016/100] Update django from 3.1.10 to 3.1.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 250a903e..42b4e6d4 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.1.10 # pyup: < 3.2 # https://www.djangoproject.com/ +django==3.1.11 # pyup: < 3.2 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth From 577603c55ca6f367cffcc26ca149b515411b0774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 May 2021 05:31:45 +0000 Subject: [PATCH 017/100] Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.8.2 to 3.9.2. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.8.2...v3.9.2) 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 d433e00d..fa4fe2c3 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.8.2 + uses: peter-evans/create-pull-request@v3.9.2 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From ca2ed2086ad9b2f95716bb5cb4ff8fbdd50d3a40 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 May 2021 04:30:40 -0700 Subject: [PATCH 018/100] Update cookiecutter from 1.7.2 to 1.7.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9b2477c7..1ca33990 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==1.7.2 +cookiecutter==1.7.3 sh==1.14.1 binaryornot==0.4.4 From 0c27117dbd9dd89d18fe9d94149da5e3a3773ca1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 15 May 2021 11:48:27 -0700 Subject: [PATCH 019/100] Update pytest-django from 4.2.0 to 4.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 838a57da..6958c357 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,4 +42,4 @@ factory-boy==3.2.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.2.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==4.2.0 # https://github.com/pytest-dev/pytest-django +pytest-django==4.3.0 # https://github.com/pytest-dev/pytest-django From 9c24e8a879443d01aa9f3d6c3add7044cc92a09b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 May 2021 22:01:04 -0700 Subject: [PATCH 020/100] Update sh from 1.14.1 to 1.14.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b826d75b..bedaab9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==1.7.3 -sh==1.14.1 +sh==1.14.2 binaryornot==0.4.4 # Code quality From aac58a094b5ddb57aecdaada1aa97068516450cc Mon Sep 17 00:00:00 2001 From: luzfcb Date: Sat, 15 May 2021 22:27:42 +0000 Subject: [PATCH 021/100] 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 e21ebc1f..e96f64f2 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.4.0 + rev: v4.0.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From d76fe09163df260a66560e91e035086e247d3afd Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Sat, 15 May 2021 21:37:03 -0300 Subject: [PATCH 022/100] Replaced ugettext_lazy by gettext_lazy --- .../{{cookiecutter.project_slug}}/users/tests/test_forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py index 66118f49..35db91b4 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py @@ -2,7 +2,7 @@ Module for all Form Tests. """ import pytest -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm from {{ cookiecutter.project_slug }}.users.models import User From 34db12e5d6cef69e9184a6692c3d14cee4ed1401 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 16 May 2021 02:31:10 +0000 Subject: [PATCH 023/100] Update Changelog --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb0c7644..49056ad8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,26 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-05-15] +### Changed +- Update watchgod to 0.7 ([#3177](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3177)) +### Updated +- Auto-update pre-commit hooks ([#3184](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3184)) +- Update black to 21.5b1 ([#3167](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3167)) +- Update flake8 to 3.9.2 ([#3164](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3164)) +- Update pytest-django to 4.3.0 ([#3182](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3182)) +- Auto-update pre-commit hooks ([#3157](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3157)) +- Update python-slugify to 5.0.2 ([#3161](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3161)) +- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3171)) +- Update sentry-sdk to 1.1.0 ([#3163](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3163)) +- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3173)) +- Update tox to 3.23.1 ([#3160](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3160)) +- Update pytest to 6.2.4 ([#3156](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3156)) +- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3179)) +- Update sphinx to 4.0.1 ([#3169](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3169)) +- Update cookiecutter to 1.7.3 ([#3180](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3180)) +- Update django to 3.1.11 ([#3178](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3178)) + ## [2021-05-06] ### Updated - Update django to 3.1.10 ([#3162](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3162)) From 0c773f4ada9efd3a2466590bbef950926553bd21 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 17 May 2021 00:06:30 +0000 Subject: [PATCH 024/100] 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 e96f64f2..d054489d 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: v4.0.0 + rev: v4.0.1 hooks: - id: trailing-whitespace - id: end-of-file-fixer From fd7e575fa85393b220b97e05453787958329d285 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 May 2021 06:20:08 +0000 Subject: [PATCH 025/100] Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 Bumps [tiangolo/issue-manager](https://github.com/tiangolo/issue-manager) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/tiangolo/issue-manager/releases) - [Commits](https://github.com/tiangolo/issue-manager/compare/0.3.0...0.4.0) Signed-off-by: dependabot[bot] --- .github/workflows/issue-manager.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml index f6b46527..6e272f75 100644 --- a/.github/workflows/issue-manager.yml +++ b/.github/workflows/issue-manager.yml @@ -23,7 +23,7 @@ jobs: issue-manager: runs-on: ubuntu-latest steps: - - uses: tiangolo/issue-manager@0.3.0 + - uses: tiangolo/issue-manager@0.4.0 with: token: ${{ secrets.GITHUB_TOKEN }} From abba9de2bd747a92c6a4d41580f6fcfdc6fa38d8 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Mon, 17 May 2021 22:04:38 -0300 Subject: [PATCH 026/100] Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope of production Dockerfile to fix #3187 which occurs when Gulp is selected as `js_task_runner` on project generation. --- .../compose/production/django/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index c1b3e97b..5f1bc78b 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -1,3 +1,5 @@ +ARG PYTHON_VERSION=3.9-slim-buster + {% if cookiecutter.js_task_runner == 'Gulp' -%} FROM node:10-stretch-slim as client-builder @@ -11,8 +13,6 @@ RUN npm run build {%- endif %} -ARG PYTHON_VERSION=3.9-slim-buster - # define an alias for the specfic python version used in this file. FROM python:${PYTHON_VERSION} as python From f16224ddfd9c7d8ac79955badca4165350b24b15 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 18 May 2021 02:29:43 +0000 Subject: [PATCH 027/100] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49056ad8..0b12369f 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-05-17] +### Updated +- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3186)) +- Auto-update pre-commit hooks ([#3185](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3185)) + ## [2021-05-15] ### Changed - Update watchgod to 0.7 ([#3177](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3177)) From 052e715e83d1dac8a3e22f72bf391ee885d25989 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 18 May 2021 14:16:57 -0700 Subject: [PATCH 028/100] Update jinja2 from 2.11.3 to 3.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bedaab9b..c2ff7f80 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,4 +21,4 @@ pyyaml==5.4.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.55 -jinja2==2.11.3 +jinja2==3.0.1 From 381793e3962197711df335846a1944e81bcc8c23 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 19 May 2021 02:27:25 +0000 Subject: [PATCH 029/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b12369f..126a5c00 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-05-18] +### Changed +- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3188)) + ## [2021-05-17] ### Updated - Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3186)) From 5db1e0f719611c7e7db9f27d4cea4f781f21e065 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 21 May 2021 13:56:16 -0700 Subject: [PATCH 030/100] Update sphinx from 4.0.1 to 4.0.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 b49891aa..82f6a7ce 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==4.0.1 # https://github.com/sphinx-doc/sphinx +sphinx==4.0.2 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From be5e175ba775f7eb799dd0c419898e7bd9e470a2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 22 May 2021 10:09:39 -0700 Subject: [PATCH 031/100] Update pre-commit from 2.12.1 to 2.13.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bedaab9b..82d4b35b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==21.5b1 isort==5.8.0 flake8==3.9.2 flake8-isort==4.0.0 -pre-commit==2.12.1 +pre-commit==2.13.0 # Testing # ------------------------------------------------------------------------------ From 8640220d334583d2585b5ffe6021b29b78f16ba3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 22 May 2021 10:09:39 -0700 Subject: [PATCH 032/100] Update pre-commit from 2.12.1 to 2.13.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 b49891aa..6fc0159a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.4.3 # 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.12.1 # https://github.com/pre-commit/pre-commit +pre-commit==2.13.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 4685483fc80d5f4e2a24959e4216af3bb67cbe92 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 24 May 2021 07:58:58 -0700 Subject: [PATCH 033/100] Update pytest-cookies from 0.5.1 to 0.6.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bedaab9b..28cc5ae3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==2.12.1 # ------------------------------------------------------------------------------ tox==3.23.1 pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 -pytest-cookies==0.5.1 +pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==5.4.1 From bd0bba6e6c4ba75a32da5d44e18888f958612aa3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 05:29:46 +0000 Subject: [PATCH 034/100] Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.9.2 to 3.10.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.9.2...v3.10.0) 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 cc8d4680..25a6f7a0 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.9.2 + uses: peter-evans/create-pull-request@v3.10.0 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 02592a3d37639511a9d8905b4470fda838a1707a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 10:50:39 -0700 Subject: [PATCH 035/100] Update black from 21.5b1 to 21.5b2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bedaab9b..f1170e3b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==21.5b1 +black==21.5b2 isort==5.8.0 flake8==3.9.2 flake8-isort==4.0.0 From d0667d9b3c39d4c7c2b131d228b06af48232b7a3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 10:50:39 -0700 Subject: [PATCH 036/100] Update black from 21.5b1 to 21.5b2 --- {{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 b49891aa..d5c5bd88 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==3.9.2 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.5 # https://github.com/nedbat/coveragepy -black==21.5b1 # https://github.com/ambv/black +black==21.5b2 # https://github.com/ambv/black pylint-django==2.4.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From 5fb7dded0c6e9b36b3f516f4a404097e6f4ffb23 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 May 2021 12:33:44 -0700 Subject: [PATCH 037/100] Update django-redis from 4.12.1 to 5.0.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 e57007fd..f94b7abd 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -37,7 +37,7 @@ django-crispy-forms==1.11.2 # https://github.com/django-crispy-forms/django-cri {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4.1 # https://github.com/django-compressor/django-compressor {%- endif %} -django-redis==4.12.1 # https://github.com/jazzband/django-redis +django-redis==5.0.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework djangorestframework==3.12.4 # https://github.com/encode/django-rest-framework From 1cd8dffbc369991165e51db92eb2da41545d0d2b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Jun 2021 07:25:15 -0700 Subject: [PATCH 038/100] Update uvicorn from 0.13.4 to 0.14.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 e57007fd..e8fb74c3 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.7 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.13.4 # https://github.com/encode/uvicorn +uvicorn[standard]==0.14.0 # https://github.com/encode/uvicorn {%- endif %} # Django From f1e66ff8428441ad9a3e81255cf9590ea6045f52 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Wed, 2 Jun 2021 13:17:37 +0530 Subject: [PATCH 039/100] Updated .pre-commit-config.yaml to self-update its dependencies Pre-commit will now automatically also run on any raised PRs. This will ensure committed code will always stay consistent. --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d054489d..321d834d 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -26,3 +26,10 @@ repos: - id: flake8 args: ['--config=setup.cfg'] additional_dependencies: [flake8-isort] + + +# sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date +ci: + autoupdate_schedule: weekly + skip: [] + submodules: false From a1e649629432956f12bf966331cfe10cbf1cdf56 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Jun 2021 07:20:42 -0700 Subject: [PATCH 040/100] Update django from 3.1.11 to 3.1.12 --- {{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 e57007fd..fd455434 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.1.11 # pyup: < 3.2 # https://www.djangoproject.com/ +django==3.1.12 # pyup: < 3.2 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth From 9e57d844c0ca00cfa439854660cf5565582cbde3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Jun 2021 07:20:44 -0700 Subject: [PATCH 041/100] Update ipdb from 0.13.7 to 0.13.9 --- {{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 b49891aa..33bdeb96 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ -r base.txt Werkzeug==1.0.1 # https://github.com/pallets/werkzeug -ipdb==0.13.7 # https://github.com/gotcha/ipdb +ipdb==0.13.9 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- else %} From f1b9e070a004c3afb59053ccc2de67e58ebf10b1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 3 Jun 2021 03:01:34 +0000 Subject: [PATCH 042/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 126a5c00..eb865916 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-06-02] +### Updated +- Update django to 3.1.12 ([#3209](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3209)) + ## [2021-05-18] ### Changed - Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3188)) From e3c646f726a4be8992a4bac3b163b4f83d1f256d Mon Sep 17 00:00:00 2001 From: Ray Besiga Date: Sat, 5 Jun 2021 22:02:57 +0300 Subject: [PATCH 043/100] Shorthand for the official supported buildpack Replacing the Github link with the Heroku shorthand defined for the officially supported buildpack. --- docs/deployment-on-heroku.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst index 53e98037..0681a50c 100644 --- a/docs/deployment-on-heroku.rst +++ b/docs/deployment-on-heroku.rst @@ -10,7 +10,7 @@ Run these commands to deploy the project to Heroku: .. code-block:: bash - heroku create --buildpack https://github.com/heroku/heroku-buildpack-python + heroku create --buildpack heroku/python heroku addons:create heroku-postgresql:hobby-dev # On Windows use double quotes for the time zone, e.g. From 7302fe8bbf6bb34d77f6078040125c96bf8feb32 Mon Sep 17 00:00:00 2001 From: luzfcb Date: Sat, 5 Jun 2021 20:00:52 +0000 Subject: [PATCH 044/100] 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 84637568..ac59fbf9 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1082,5 +1082,10 @@ "name": "Tames McTigue", "github_login": "Tamerz", "twitter_username": "" + }, + { + "name": "Ray Besiga", + "github_login": "raybesiga", + "twitter_username": "raybesiga" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ea870187..5790997a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1251,6 +1251,13 @@ Listed in alphabetical order. + + Ray Besiga + + raybesiga + + raybesiga + Reggie Riser From 350064f630b07c9c10ee35062428041de695a1c0 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 6 Jun 2021 02:43:13 +0000 Subject: [PATCH 045/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb865916..9a478b10 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-06-05] +### Changed +- Shorthand for the officially supported buildpack ([#3211](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3211)) + ## [2021-06-02] ### Updated - Update django to 3.1.12 ([#3209](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3209)) From e101fb286f7e76fd219308fcbc15e453b3652aca Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 6 Jun 2021 11:53:50 -0700 Subject: [PATCH 046/100] Update pytest-django from 4.3.0 to 4.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 b49891aa..43b1fe70 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,4 +42,4 @@ factory-boy==3.2.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.2.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==4.3.0 # https://github.com/pytest-dev/pytest-django +pytest-django==4.4.0 # https://github.com/pytest-dev/pytest-django From 972b8274a5d7589e7ce88855152f1f9c8c537fa3 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 7 Jun 2021 02:48:54 +0000 Subject: [PATCH 047/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a478b10..2d51794c 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-06-06] +### Changed +- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3208)) + ## [2021-06-05] ### Changed - Shorthand for the officially supported buildpack ([#3211](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3211)) From 75d07e35bc35cde011302932e3db76bc39721b42 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 8 Jun 2021 00:15:41 +0000 Subject: [PATCH 048/100] 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 321d834d..c8ea7f57 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: check-yaml - repo: https://github.com/psf/black - rev: 21.5b1 + rev: 21.5b2 hooks: - id: black From 05249e9954922b710e3303a296cfae48844b8196 Mon Sep 17 00:00:00 2001 From: Grant McLean Date: Wed, 9 Jun 2021 10:33:13 +1200 Subject: [PATCH 049/100] Fix link format in developing-locally.rst Link was markdown format - changed to RST. --- docs/developing-locally.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 661c9f26..3a620653 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -37,7 +37,7 @@ First things first. .. 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/). + for the details of `pre-commit`, follow the `site of pre-commit `_. #. Create a new PostgreSQL database using createdb_: :: From 93882486ffc852419410c1d6253c905940c7f027 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 8 Jun 2021 16:16:52 -0700 Subject: [PATCH 050/100] Update mypy from 0.812 to 0.901 --- {{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 b49891aa..d3e1990e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.7 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.812 # https://github.com/python/mypy +mypy==0.901 # https://github.com/python/mypy django-stubs==1.8.0 # https://github.com/typeddjango/django-stubs pytest==6.2.4 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 9c3b0bcca02cb94c2bb90f0c05839f99fb4c3710 Mon Sep 17 00:00:00 2001 From: Grant McLean Date: Wed, 9 Jun 2021 15:38:12 +1200 Subject: [PATCH 051/100] revise previous patch to conform to project style for RST links --- docs/developing-locally.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 3a620653..f3358866 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -36,8 +36,8 @@ First things first. .. note:: - the `pre-commit` exists in the generated project as default. - for the details of `pre-commit`, follow the `site of pre-commit `_. + the `pre-commit` hook exists in the generated project as default. + For the details of `pre-commit`, follow the `pre-commit`_ site. #. Create a new PostgreSQL database using createdb_: :: @@ -88,6 +88,7 @@ or if you're running asynchronously: :: .. _createdb: https://www.postgresql.org/docs/current/static/app-createdb.html .. _initial PostgreSQL set up: http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html .. _postgres documentation: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html +.. _pre-commit: https://pre-commit.com/ .. _direnv: https://direnv.net/ From 2f38023d070adc7b5648ad92b4605539744977eb Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 9 Jun 2021 08:53:43 +0000 Subject: [PATCH 052/100] 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 ac59fbf9..a165effe 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1087,5 +1087,10 @@ "name": "Ray Besiga", "github_login": "raybesiga", "twitter_username": "raybesiga" + }, + { + "name": "Grant McLean", + "github_login": "grantm", + "twitter_username": "grantmnz" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5790997a..c97c620a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -712,6 +712,13 @@ Listed in alphabetical order. + + Grant McLean + + grantm + + grantmnz + Guilherme Guy From f2b0ddb78afb3dd535154ecdd3804ad10b4ceda5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 9 Jun 2021 06:19:42 -0700 Subject: [PATCH 053/100] Update django-coverage-plugin from 1.8.0 to 2.0.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 77d168e8..cfaeaacf 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -41,5 +41,5 @@ factory-boy==3.2.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.2.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.3 # https://github.com/django-extensions/django-extensions -django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin +django-coverage-plugin==2.0.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.4.0 # https://github.com/pytest-dev/pytest-django From d90a091cd69fb75535365661a366e6d80a730623 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 10 Jun 2021 02:28:30 +0000 Subject: [PATCH 054/100] Update Changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d51794c..7b2bb89d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-06-09] +### Changed +- Fix link format in developing-locally.rst ([#3214](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3214)) +### Updated +- Update pre-commit to 2.13.0 ([#3195](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3195)) +- Update pytest-django to 4.4.0 ([#3212](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3212)) +- Update mypy to 0.901 ([#3215](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3215)) +- Auto-update pre-commit hooks ([#3206](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3206)) +- Update black to 21.5b2 ([#3204](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3204)) + ## [2021-06-06] ### Changed - Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3208)) From d4ca82457360cbd6b6eef3295efd712e507ee5fd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 10 Jun 2021 16:19:55 -0700 Subject: [PATCH 055/100] Update mypy from 0.901 to 0.902 --- {{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 77d168e8..d16f7113 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.7 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.901 # https://github.com/python/mypy +mypy==0.902 # https://github.com/python/mypy django-stubs==1.8.0 # https://github.com/typeddjango/django-stubs pytest==6.2.4 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 5bf09040ebeca1c8fc110c360fc9de15b82f7c3a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 12 Jun 2021 06:55:08 -0700 Subject: [PATCH 056/100] Update django-crispy-forms from 1.11.2 to 1.12.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 fd455434..bcbbb3ce 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==3.1.12 # pyup: < 3.2 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ 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.11.2 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==1.12.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4.1 # https://github.com/django-compressor/django-compressor {%- endif %} From abb736478aef49eabfe5ad8c650979248bfea94a Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Sat, 12 Jun 2021 20:51:48 -0400 Subject: [PATCH 057/100] Update black GitHub link in requirements --- {{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 77d168e8..6b620042 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==3.9.2 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.5 # https://github.com/nedbat/coveragepy -black==21.5b2 # https://github.com/ambv/black +black==21.5b2 # https://github.com/psf/black pylint-django==2.4.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From fe187ddb6a7d30b5b9d0bc09277f5b6dddcb382e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 15 Jun 2021 02:23:36 +0000 Subject: [PATCH 058/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b2bb89d..113da3f2 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-06-14] +### Changed +- Update black GitHub link in requirements ([#3222](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3222)) + ## [2021-06-09] ### Changed - Fix link format in developing-locally.rst ([#3214](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3214)) From 19af4c063a5b76b0508b70596eacb204958e047b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:20 -0700 Subject: [PATCH 059/100] Update django-anymail from 8.2 to 8.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 3df7c566..47f8b1ed 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -22,7 +22,7 @@ django-storages[boto3]==1.11.1 # 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.2 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon_ses]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} From e57f283d80897cadd022d2632c815d1590c0781a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:20 -0700 Subject: [PATCH 060/100] Update django-anymail from 8.2 to 8.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 47f8b1ed..f2befbc7 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ django-storages[google]==1.11.1 # https://github.com/jschneier/django-storages {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==8.2 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} From 5cea74a7eb60b322861a7c85f5f812025aceb0e4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:20 -0700 Subject: [PATCH 061/100] Update django-anymail from 8.2 to 8.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 f2befbc7..fcfe7978 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -26,7 +26,7 @@ django-anymail[mailgun]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon_ses]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==8.2 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} From b02d986abd9e987c40f4be967d3f6905861097ae Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:21 -0700 Subject: [PATCH 062/100] Update django-anymail from 8.2 to 8.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 fcfe7978..69c22da0 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==8.2 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} From d10fe10e9cb360ecb5904400b22ee0055885c80e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:21 -0700 Subject: [PATCH 063/100] Update django-anymail from 8.2 to 8.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 69c22da0..87711f5a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -30,7 +30,7 @@ django-anymail[mailjet]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==8.2 # https://github.com/anymail/django-anymail +django-anymail[postmark]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} From f4f7fd0094ee86b59437bfadcc28d40d20ac95dc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:21 -0700 Subject: [PATCH 064/100] Update django-anymail from 8.2 to 8.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 87711f5a..436c9db3 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -32,7 +32,7 @@ django-anymail[mandrill]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==8.2 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} django-anymail[sendinblue]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} From aed5d2e701c283480dbad977e3c77d73fd69cf00 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:22 -0700 Subject: [PATCH 065/100] Update django-anymail from 8.2 to 8.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 436c9db3..6ad586d6 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -34,7 +34,7 @@ django-anymail[postmark]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==8.2 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==8.2 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From 2532937fbd8821e736b63e28d85a0093f456468a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:22 -0700 Subject: [PATCH 066/100] Update django-anymail from 8.2 to 8.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 6ad586d6..9f060368 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} django-anymail[sendinblue]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==8.2 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} django-anymail==8.2 # https://github.com/anymail/django-anymail {%- endif %} From 350ab6c93b03fbd129ad3e19b83927ed7e39dbf0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Jun 2021 06:22:23 -0700 Subject: [PATCH 067/100] Update django-anymail from 8.2 to 8.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 9f060368..0bb6bfd8 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==8.4 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==8.2 # https://github.com/anymail/django-anymail +django-anymail==8.4 # https://github.com/anymail/django-anymail {%- endif %} From f8bbcf0788232ec49bbd60012eafa156fdf653cc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 17 Jun 2021 09:36:11 -0700 Subject: [PATCH 068/100] Update psycopg2 from 2.8.6 to 2.9.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 3df7c566..e8ad6018 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.1.0 # https://github.com/benoitc/gunicorn -psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.1 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 6cd27194370333fb7daf1ba21e4596402b3f8fc5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 17 Jun 2021 09:36:12 -0700 Subject: [PATCH 069/100] Update psycopg2 from 2.8.6 to 2.9.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 6b620042..96c41929 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,7 +3,7 @@ Werkzeug==1.0.1 # https://github.com/pallets/werkzeug ipdb==0.13.7 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 +psycopg2==2.9.1 # https://github.com/psycopg/psycopg2 {%- else %} psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2 {%- endif %} From facd5c40fcac7b02f0af2d236e23c7dc0796ab42 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 17 Jun 2021 17:47:07 -0700 Subject: [PATCH 070/100] Update psycopg2-binary from 2.8.6 to 2.9.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 6b620042..a27db92a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,7 +5,7 @@ ipdb==0.13.7 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.9.1 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchgod==0.7 # https://github.com/samuelcolvin/watchgod From 18a94046b1b7b53651ce1bb23a63fd3a8e2b9b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Sat, 19 Jun 2021 01:18:31 -0300 Subject: [PATCH 071/100] Add venv to .dockerignore --- {{cookiecutter.project_slug}}/.dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore index d01db04a..5518e60a 100644 --- a/{{cookiecutter.project_slug}}/.dockerignore +++ b/{{cookiecutter.project_slug}}/.dockerignore @@ -7,3 +7,4 @@ .pre-commit-config.yaml .readthedocs.yml .travis.yml +venv From efcab1b4d6b0c91e1ac51e46684752f08af90397 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 20 Jun 2021 02:23:30 +0000 Subject: [PATCH 072/100] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 113da3f2..ef143bc8 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-06-19] +### Updated +- Update psycopg2 to 2.9.1 ([#3227](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3227)) +- Update psycopg2-binary to 2.9.1 ([#3228](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3228)) + ## [2021-06-14] ### Changed - Update black GitHub link in requirements ([#3222](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3222)) From 4214b1b8efcb86b264d64d3bf8592c382a70acd6 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Sun, 20 Jun 2021 12:47:07 -0400 Subject: [PATCH 073/100] Update docs/howto.rst --- {{cookiecutter.project_slug}}/docs/howto.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/{{cookiecutter.project_slug}}/docs/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst index 25f442c3..0ef90d02 100644 --- a/{{cookiecutter.project_slug}}/docs/howto.rst +++ b/{{cookiecutter.project_slug}}/docs/howto.rst @@ -4,20 +4,19 @@ How To - Project Documentation Get Started ---------------------------------------------------------------------- -Documentation can be written as rst files in the `{{cookiecutter.project_slug}}/docs/_source`. +Documentation can be written as rst files in `{{cookiecutter.project_slug}}/docs`. {% if cookiecutter.use_docker == 'n' %} -To build and serve docs, use the command: - :: +To build and serve docs, use the command:: - make livehtml + make livehtml from inside the `{{cookiecutter.project_slug}}/docs` directory. {% else %} -To build and serve docs, use the commands: - :: +To build and serve docs, use the commands:: - docker-compose -f local.yml up docs + docker-compose -f local.yml up docs + {% endif %} Changes to files in `docs/_source` will be picked up and reloaded automatically. From 9cbb840ec92c261798d1b5d5f7e6c99f39226524 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 21 Jun 2021 00:06:34 +0000 Subject: [PATCH 074/100] 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 c8ea7f57..57207a74 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: check-yaml - repo: https://github.com/psf/black - rev: 21.5b2 + rev: 21.6b0 hooks: - id: black From 2aeb6a13703762f02bf39a02d956c59d495e524a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 21 Jun 2021 12:17:56 +0100 Subject: [PATCH 075/100] Remove version restriction on pytest --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3b7c3b8e..c616a8b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.13.0 # Testing # ------------------------------------------------------------------------------ tox==3.23.1 -pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 +pytest==5.4.3 pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==5.4.1 From 3b419295ff84644e57d3e13142fcf3fe8de67ecd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Jun 2021 04:18:10 -0700 Subject: [PATCH 076/100] Update pytest from 5.4.3 to 6.2.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c616a8b1..0bfb16bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==2.13.0 # Testing # ------------------------------------------------------------------------------ tox==3.23.1 -pytest==5.4.3 +pytest==6.2.4 pytest-cookies==0.6.1 pytest-instafail==0.4.2 pyyaml==5.4.1 From 608cbef44041375222e8f8eac4c4e1c5b4cbe000 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Jun 2021 04:23:35 -0700 Subject: [PATCH 077/100] Update black from 21.5b2 to 21.6b0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c616a8b1..34d783df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==21.5b2 +black==21.6b0 isort==5.8.0 flake8==3.9.2 flake8-isort==4.0.0 From 810e8b46724ef1613383edacae0763b1cedcb1eb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Jun 2021 04:23:36 -0700 Subject: [PATCH 078/100] Update black from 21.5b2 to 21.6b0 --- {{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 9263f085..34517e3a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==3.9.2 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.5 # https://github.com/nedbat/coveragepy -black==21.5b2 # https://github.com/psf/black +black==21.6b0 # https://github.com/psf/black pylint-django==2.4.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From eaa70138648a10cd52951c89a6b728e2235f2056 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Jun 2021 04:46:11 -0700 Subject: [PATCH 079/100] Update pylint-django from 2.4.3 to 2.4.4 --- {{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 6f41cecf..e77e15b9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ flake8==3.9.2 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.5 # https://github.com/nedbat/coveragepy black==21.6b0 # https://github.com/psf/black -pylint-django==2.4.3 # https://github.com/PyCQA/pylint-django +pylint-django==2.4.4 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} From 8bbba913eaae766b397f78455633bf172b3e4794 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Jun 2021 08:42:31 -0700 Subject: [PATCH 080/100] Update isort from 5.8.0 to 5.9.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1c652fd6..89b1f7a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==21.6b0 -isort==5.8.0 +isort==5.9.0 flake8==3.9.2 flake8-isort==4.0.0 pre-commit==2.13.0 From 84729606489cc30e2d84815c94f1eb1cd959e5f3 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Jun 2021 00:04:46 +0000 Subject: [PATCH 081/100] 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 57207a74..ac71019a 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.8.0 + rev: 5.9.1 hooks: - id: isort From 10e1e264d27ce1eec9387c236f48bafe5513c0c7 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Jun 2021 02:17:41 +0000 Subject: [PATCH 082/100] Update Changelog --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef143bc8..b1a9a0ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-06-21] +### Updated +- Update isort to 5.9.0 ([#3234](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3234)) +- Update django-anymail to 8.4 ([#3225](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3225)) +- Update django-redis to 5.0.0 ([#3205](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3205)) +- Update pylint-django to 2.4.4 ([#3233](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3233)) +- Auto-update pre-commit hooks ([#3220](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3220)) +- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3197)) +- Update black to 21.6b0 ([#3232](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3232)) +- Update pytest to 6.2.4 ([#3231](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3231)) +- Update django-crispy-forms to 1.12.0 ([#3221](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3221)) +- Update mypy to 0.902 ([#3219](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3219)) +- Update django-coverage-plugin to 2.0.0 ([#3217](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3217)) +- Update ipdb to 0.13.9 ([#3210](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3210)) +- Update uvicorn to 0.14.0 ([#3207](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3207)) +- Update pytest-cookies to 0.6.1 ([#3196](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3196)) +- Update sphinx to 4.0.2 ([#3193](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3193)) +- Update jinja2 to 3.0.1 ([#3189](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3189)) + ## [2021-06-19] ### Updated - Update psycopg2 to 2.9.1 ([#3227](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3227)) From 03df4970aeda6c884962a29eacdbc0553003840f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Jun 2021 08:42:35 -0700 Subject: [PATCH 083/100] Update isort from 5.9.0 to 5.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 89b1f7a6..b48a5ab9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==21.6b0 -isort==5.9.0 +isort==5.9.1 flake8==3.9.2 flake8-isort==4.0.0 pre-commit==2.13.0 From 391e31c4dd8e8efdf0d3694c5bf6d1e2ca472a13 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 23 Jun 2021 02:13:45 +0000 Subject: [PATCH 084/100] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1a9a0ee..620d7eb0 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-06-22] +### Changed +- Update docs/howto.rst ([#3230](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3230)) +- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3154)) +### Updated +- Update isort to 5.9.1 ([#3236](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3236)) +- Auto-update pre-commit hooks ([#3235](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3235)) + ## [2021-06-21] ### Updated - Update isort to 5.9.0 ([#3234](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3234)) From 9cc54eea33db925d0ce96d6ca25e2e0d10bc6a92 Mon Sep 17 00:00:00 2001 From: LECbg Date: Thu, 24 Jun 2021 11:57:23 +0200 Subject: [PATCH 085/100] Update gitignore for VSCode Update VSCode section as of https://github.com/github/gitignore/blob/991e760c1c6d50fdda246e0178b9c58b06770b90/Global/VisualStudioCode.gitignore --- {{cookiecutter.project_slug}}/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index 311b43a5..613e8bea 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -159,6 +159,10 @@ typings/ !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ {% if cookiecutter.use_pycharm == 'y' -%} From 28544cb247e4a43e8ba3914fe85db348ae6ed096 Mon Sep 17 00:00:00 2001 From: Kuo Chao Cheng Date: Fri, 25 Jun 2021 12:05:12 +0800 Subject: [PATCH 086/100] Wrap jQuery event after DOMContentLoaded --- .../templates/account/email.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html index 055904ae..5c9406f3 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html @@ -74,7 +74,9 @@ window.addEventListener('DOMContentLoaded',function() { } }); -$('.form-group').removeClass('row'); +document.addEventListener('DOMContentLoaded', function() { + $('.form-group').removeClass('row'); +}) {% endblock %} {%- endraw %} From 6f971b7ac4b2f2b2a06d4eabc5a6a1b96393498c Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 25 Jun 2021 07:45:22 +0000 Subject: [PATCH 087/100] 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 a165effe..64987bd1 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1092,5 +1092,10 @@ "name": "Grant McLean", "github_login": "grantm", "twitter_username": "grantmnz" + }, + { + "name": "Kuo Chao Cheng", + "github_login": "wwwtony5488", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c97c620a..580bd912 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -985,6 +985,13 @@ Listed in alphabetical order. + + Kuo Chao Cheng + + wwwtony5488 + + + lcd1232 From fa83d9cf6efa75909905e4e8dccce20f0c68fbec Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 25 Jun 2021 07:46:59 +0000 Subject: [PATCH 088/100] 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 64987bd1..c11c531f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1097,5 +1097,10 @@ "name": "Kuo Chao Cheng", "github_login": "wwwtony5488", "twitter_username": "" + }, + { + "name": "LECbg", + "github_login": "LECbg", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 580bd912..1903bcc1 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -999,6 +999,13 @@ Listed in alphabetical order. + + LECbg + + LECbg + + + Leo won From f576f280ee1ac03abfb679f594097f445610f91f Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 25 Jun 2021 09:55:56 +0200 Subject: [PATCH 089/100] Update version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 73ccb863..ddc9524d 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.1.8" +version = "3.1.12" if sys.argv[-1] == "tag": os.system(f'git tag -a {version} -m "version {version}"') From f250178a7596b0b41e6afae10ef5093b77a50c2f Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 26 Jun 2021 02:13:05 +0000 Subject: [PATCH 090/100] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 620d7eb0..ccef7c8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-06-25] +### Changed +- Update `.gitignore` file for VSCode ([#3238](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3238)) +### Fixed +- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3239)) + ## [2021-06-22] ### Changed - Update docs/howto.rst ([#3230](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3230)) From d8b39f32aef37491b8f10210bcfe6ce0ab516ea4 Mon Sep 17 00:00:00 2001 From: Haseeb ur Rehman Date: Mon, 28 Jun 2021 15:30:30 +0500 Subject: [PATCH 091/100] Fix Celery ports error on local Docker (#3241) --- {{cookiecutter.project_slug}}/local.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 6241ceed..eee70c54 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -77,7 +77,6 @@ services: {%- if cookiecutter.use_mailhog == 'y' %} - mailhog {%- endif %} - ports: [] command: /start-celeryworker celerybeat: @@ -90,7 +89,6 @@ services: {%- if cookiecutter.use_mailhog == 'y' %} - mailhog {%- endif %} - ports: [] command: /start-celerybeat flower: From 7ea4194b6b4369a453b57c3ae33cbcf3109eee01 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 28 Jun 2021 10:31:08 +0000 Subject: [PATCH 092/100] 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 c11c531f..f7c0a05b 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1102,5 +1102,10 @@ "name": "LECbg", "github_login": "LECbg", "twitter_username": "" + }, + { + "name": "Haseeb ur Rehman", + "github_login": "professorhaseeb", + "twitter_username": "professorhaseeb" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 1903bcc1..0493530b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -761,6 +761,13 @@ Listed in alphabetical order. + + Haseeb ur Rehman + + professorhaseeb + + professorhaseeb + Hendrik Schneider From c6d53d753a300a2a296544054a8250b0b09a0dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 28 Jun 2021 09:02:16 -0300 Subject: [PATCH 093/100] Revert "Fix Celery ports error on local Docker (#3241)" This reverts commit d8b39f32aef37491b8f10210bcfe6ce0ab516ea4. --- {{cookiecutter.project_slug}}/local.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index eee70c54..6241ceed 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -77,6 +77,7 @@ services: {%- if cookiecutter.use_mailhog == 'y' %} - mailhog {%- endif %} + ports: [] command: /start-celeryworker celerybeat: @@ -89,6 +90,7 @@ services: {%- if cookiecutter.use_mailhog == 'y' %} - mailhog {%- endif %} + ports: [] command: /start-celerybeat flower: From 9316846691eb53940f6e54e7248c874830a38f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 28 Jun 2021 10:20:08 -0300 Subject: [PATCH 094/100] Improve github bug report template --- .github/ISSUE_TEMPLATE/bug.md | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 757b5990..d1bf4da6 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -14,12 +14,38 @@ labels: bug * Host system configuration: * Version of cookiecutter CLI (get it with `cookiecutter --version`): - * OS: - * Python version: - * Docker versions (if using Docker): + * OS name and version: + + On Linux, run + ```bash + lsb_release -a 2> /dev/null || cat /etc/redhat-release 2> /dev/null || cat /etc/*-release 2> /dev/null || cat /etc/issue 2> /dev/null + ``` + + On MacOs, run + ```bash + sw_vers + ``` + + On Windows, via CMD, run + ``` + systeminfo | findstr /B /C:"OS Name" /C:"OS Version" + ``` + + + ```bash + # Insert here the OS name and version + + ``` + + * Python version, run `python3 -V`: + * Docker version (if using Docker), run `docker --version`: + * docker-compose version (if using Docker), run `docker-compose --version`: * ... * Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html): - ``` + On Linux and MacOS: `cat ${HOME}/.cookiecutter_replay/cookiecutter-django.json` + (Please, take care to remove sensitive information) + ```json + # Insert here the replay file content ``` Logs: From 10b9f22a3f660a3db7fe5d1199361c3cfc325659 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 29 Jun 2021 02:14:38 +0000 Subject: [PATCH 095/100] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccef7c8d..9fb8d310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2021-06-28] +### Changed +- Revert "Fix Celery ports error on local Docker" ([#3242](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3242)) +### Fixed +- Fix Celery ports error on local Docker ([#3241](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3241)) + ## [2021-06-25] ### Changed - Update `.gitignore` file for VSCode ([#3238](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3238)) From 91f93fe371cd5a413e6622cd0d4321594e2f30a1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 30 Jun 2021 02:17:24 +0000 Subject: [PATCH 096/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fb8d310..1a6537cf 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-06-29] +### Changed +- Improve github bug report template ([#3243](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3243)) + ## [2021-06-28] ### Changed - Revert "Fix Celery ports error on local Docker" ([#3242](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3242)) From abe3588bedf4d7be0bd62045e82af8febb2dac19 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 1 Jul 2021 08:19:11 -0700 Subject: [PATCH 097/100] Update django from 3.1.12 to 3.1.13 --- {{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 36f02a3c..a39de1bc 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.14.0 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.1.12 # pyup: < 3.2 # https://www.djangoproject.com/ +django==3.1.13 # pyup: < 3.2 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth From 0aca0a8782f6b44e1903067c73a85a67fe29b29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Thu, 8 Jul 2021 19:29:25 -0300 Subject: [PATCH 098/100] Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku --- {{cookiecutter.project_slug}}/Procfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile index 8679a066..e23ca13c 100644 --- a/{{cookiecutter.project_slug}}/Procfile +++ b/{{cookiecutter.project_slug}}/Procfile @@ -5,6 +5,6 @@ web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker web: gunicorn config.wsgi:application {%- endif %} {%- if cookiecutter.use_celery == "y" -%} -worker: celery worker --app=config.celery_app --loglevel=info -beat: celery beat --app=config.celery_app --loglevel=info +worker: REMAP_SIGTERM=SIGQUIT celery worker --app=config.celery_app --loglevel=info +beat: REMAP_SIGTERM=SIGQUIT celery beat --app=config.celery_app --loglevel=info {%- endif %} From f58f134deca5f3d504fe100200f67ac82789c5d9 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 9 Jul 2021 02:14:27 +0000 Subject: [PATCH 099/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a6537cf..b07de8c1 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-07-08] +### Updated +- Update django to 3.1.13 ([#3247](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3247)) + ## [2021-06-29] ### Changed - Improve github bug report template ([#3243](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3243)) From 76f1a2875f14bf0cb7478eb12c3cd3e2630ee0d5 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 13 Jul 2021 02:14:22 +0000 Subject: [PATCH 100/100] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b07de8c1..588c58ab 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-07-12] +### Changed +- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3263)) + ## [2021-07-08] ### Updated - Update django to 3.1.13 ([#3247](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3247))