Date: Tue, 11 Aug 2020 16:20:28 +0000
Subject: [PATCH 099/228] 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 aeb0b61fd..e749ec14c 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1012,5 +1012,10 @@
"name": "Yuchen Xie",
"github_login": "mapx",
"twitter_username": ""
+ },
+ {
+ "name": "enchance",
+ "github_login": "enchance",
+ "twitter_username": ""
}
]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d033b1d98..f88512a33 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -607,6 +607,13 @@ Listed in alphabetical order.
bloodpet |
+
+ enchance |
+
+ enchance
+ |
+ |
+
Eraldo Energy |
From 6ce39c7667e8df6908f1eccc810d36b79bd1f4d4 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Wed, 12 Aug 2020 11:30:01 +0000
Subject: [PATCH 100/228] 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 e749ec14c..febc1fb1f 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1017,5 +1017,10 @@
"name": "enchance",
"github_login": "enchance",
"twitter_username": ""
+ },
+ {
+ "name": "Jan Fabry",
+ "github_login": "janfabry",
+ "twitter_username": ""
}
]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f88512a33..b4f2bfcb0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -789,6 +789,13 @@ Listed in alphabetical order.
|
|
+
+ Jan Fabry |
+
+ janfabry
+ |
+ |
+
Jan Van Bruggen |
From 499af1b2034dddfab24646f8d3c8effd42827bef Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 12 Aug 2020 12:31:32 +0100
Subject: [PATCH 101/228] Update isort in pre-commit hook config
---
{{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 734a0a715..1be2f6a45 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: 4.3.21
+ rev: 5.3.2
hooks:
- id: isort
From 3d1067fb56dea48e7b47f3b5b769035fcf847f5b Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 12 Aug 2020 12:52:58 +0100
Subject: [PATCH 102/228] Workflow to run pre-commit autoupdate
---
.github/workflows/pre-commit-autoupdate.yml | 35 +++++++++++++++++++++
1 file changed, 35 insertions(+)
create mode 100644 .github/workflows/pre-commit-autoupdate.yml
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
new file mode 100644
index 000000000..2ecb0032c
--- /dev/null
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -0,0 +1,35 @@
+# Run pre-commit autoupdate every day at midnight
+# and create a pull request if any changes
+
+
+name: Pre-commit auto-update
+
+on:
+ schedule:
+ - cron: "0 0 * * *"
+ workflow_dispatch: # to trigger manually
+
+jobs:
+ auto-update:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2.1.1
+ with:
+ python-version: 3.8
+
+ - name: Install pre-commit
+ run: pip install pre-commit
+ - name: Run pre-commit autoupdate
+ run: pre-commit autoupdate
+ working-directory: {{cookiecutter.project_slug}}
+
+ - name: Create Pull Request
+ uses: peter-evans/create-pull-request@v2
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ branch: update/pre-commit-autoupdate
+ title: Auto-update pre-commit hooks
+ commit-message: Auto-update pre-commit hooks
+ body: Update versions of tools in pre-commit configs to latest version
+ labels: update
From 4db39b531919ec3782dd6b7a5af1c5fff894db1a Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 12 Aug 2020 12:55:37 +0100
Subject: [PATCH 103/228] Fix syntax
---
.github/workflows/pre-commit-autoupdate.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 2ecb0032c..4beaa578f 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -20,9 +20,10 @@ jobs:
- name: Install pre-commit
run: pip install pre-commit
+
- name: Run pre-commit autoupdate
+ working-directory: "{{cookiecutter.project_slug}}"
run: pre-commit autoupdate
- working-directory: {{cookiecutter.project_slug}}
- name: Create Pull Request
uses: peter-evans/create-pull-request@v2
From 5ae7d718bde5b25dbd93be5f36acba34fa88c416 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Aug 2020 11:56:34 +0000
Subject: [PATCH 104/228] 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 1be2f6a45..921a87b7d 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: master
+ rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
From 266596f16b09dbc8d7f0551ab0dfacee9e6b32bb Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 12 Aug 2020 13:11:17 +0100
Subject: [PATCH 105/228] Only consider users of type 'User'
---
scripts/update_contributors.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 180e7e170..b77a35189 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -44,7 +44,11 @@ def iter_recent_authors():
state="closed", sort="updated", direction="desc"
).get_page(0)
for pull in recent_pulls:
- if pull.merged and pull.user.login not in BOT_LOGINS:
+ if (
+ pull.merged
+ and pull.user.type == "User"
+ and pull.user.login not in BOT_LOGINS
+ ):
yield pull.user
From 632bbd0a0892ead6b2fce183f0cee8dedb6587c6 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 12 Aug 2020 13:11:54 +0100
Subject: [PATCH 106/228] Only fetch 5 entries per page to limit GH API usage
---
scripts/update_contributors.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index b77a35189..e00593ea4 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -39,7 +39,7 @@ def iter_recent_authors():
Use Github API to fetch recent authors rather than
git CLI to work with Github usernames.
"""
- repo = Github().get_repo("pydanny/cookiecutter-django")
+ repo = Github(per_page=5).get_repo("pydanny/cookiecutter-django")
recent_pulls = repo.get_pulls(
state="closed", sort="updated", direction="desc"
).get_page(0)
From 6e17bd2e6bea21433544fbd8c94c5129264424fd Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 12 Aug 2020 23:55:18 -0700
Subject: [PATCH 107/228] Update isort from 5.3.2 to 5.4.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 17cebc3cb..63eb9759e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==19.10b0
-isort==5.3.2
+isort==5.4.0
flake8==3.8.3
flake8-isort==4.0.0
From 2d410c5df99291f31ad5af9c262e5cd49a186e76 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Thu, 13 Aug 2020 01:34:47 -0700
Subject: [PATCH 108/228] Update factory-boy from 2.12.0 to 3.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 789135938..e437ca565 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -37,7 +37,7 @@ pre-commit==2.6.0 # https://github.com/pre-commit/pre-commit
# Django
# ------------------------------------------------------------------------------
-factory-boy==2.12.0 # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
django-extensions==3.0.5 # https://github.com/django-extensions/django-extensions
From 55d3d9533318db26b3ca0656ca78c6b352b97730 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:08:53 -0400
Subject: [PATCH 109/228] Add STATICFILES_STORAGE with compressor support
---
{{cookiecutter.project_slug}}/config/settings/production.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 3d4f324cd..ce381715c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -236,10 +236,12 @@ ANYMAIL = {}
# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
-{%- if cookiecutter.cloud_provider == 'AWS' %}
+{%- if cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'y' %}
COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-{%- elif cookiecutter.cloud_provider == 'GCP' %}
+{%- elif cookiecutter.cloud_provider == 'GCP' and cookiecutter.use_whitenoise == 'y' %}
COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
+COMPRESS_STORAGE = STATICFILES_STORAGE
{%- elif cookiecutter.cloud_provider == 'None' %}
COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
{%- endif %}
From 1cb2a0c98e3d54b4f2e89426e678f73713be94b6 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:13:40 -0400
Subject: [PATCH 110/228] Set COMPRESS_ROOT to STATIC_ROOT for compressor
Django compressor also recommends the `COMPRESS_ROOT` be the STATIC_ROOT. This also makes sure the utils is set up properly so that the CACHE directory is actually publicly available (it'll be inside the static directory as a subdirectory).
---
{{cookiecutter.project_slug}}/config/settings/production.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index ce381715c..f64ad1d27 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -242,6 +242,7 @@ COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
COMPRESS_STORAGE = STATICFILES_STORAGE
+COMPRESS_ROOT = STATIC_ROOT
{%- elif cookiecutter.cloud_provider == 'None' %}
COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
{%- endif %}
From 148d6c2e29e6095ad2ae451be043dece513836a2 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:24:51 -0400
Subject: [PATCH 111/228] Added noqa F405 to undefined STATIC_ROOT - flake8
* This is in addition to the PR for compressor support with AWS S3 and Google Cloud buckets
---
{{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index f64ad1d27..7a8167229 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -242,7 +242,7 @@ COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
COMPRESS_STORAGE = STATICFILES_STORAGE
-COMPRESS_ROOT = STATIC_ROOT
+COMPRESS_ROOT = STATIC_ROOT # noqa F405
{%- elif cookiecutter.cloud_provider == 'None' %}
COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
{%- endif %}
From ebd43bbd3c29ff29cdf2617e661b857b89eb520c Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Thu, 13 Aug 2020 20:59:56 +0100
Subject: [PATCH 112/228] Update runtime.txt
---
{{cookiecutter.project_slug}}/runtime.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 385705b56..43b47fb46 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.8.3
+python-3.8.5
From 59d92d9eb4dc50b16443cb0f999408462bcabf60 Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga
Date: Fri, 14 Aug 2020 01:00:17 +0300
Subject: [PATCH 113/228] Update docs/developing-locally-docker.rst
Co-authored-by: Bruno Alla
---
docs/developing-locally-docker.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index b5672e224..0bf52295b 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -280,7 +280,7 @@ Rebuild your ``docker`` application. ::
$ docker-compose -f local.yml up -d --build
-Go to your browser and type in your usrl, ``
+Go to your browser and type in your URL bar ``https://my-dev-env.local``
See `https with nginx`_ for more information on this configuration.
From ddcafff94fce980ac1e3ed21debe1d09e1f5c97d Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga
Date: Fri, 14 Aug 2020 01:01:17 +0300
Subject: [PATCH 114/228] Update docs/developing-locally-docker.rst
Co-authored-by: Bruno Alla
---
docs/developing-locally-docker.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 0bf52295b..17ea725bd 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -270,7 +270,7 @@ local.yml
The services run behind the reverse proxy.
config/settings/local.py
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
You should allow the new hostname. ::
From d411ed9b6a43e9fbf7e15eff2d2367f380887920 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 18:45:37 -0400
Subject: [PATCH 115/228] Update compressor not check whitenoise condition
---
.../config/settings/production.py | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 7a8167229..89049cad0 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -235,16 +235,11 @@ ANYMAIL = {}
# ------------------------------------------------------------------------------
# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
-# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
-{%- if cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'y' %}
-COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-{%- elif cookiecutter.cloud_provider == 'GCP' and cookiecutter.use_whitenoise == 'y' %}
-COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
-{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
-COMPRESS_STORAGE = STATICFILES_STORAGE
-COMPRESS_ROOT = STATIC_ROOT # noqa F405
-{%- elif cookiecutter.cloud_provider == 'None' %}
+{%- if cookiecutter.cloud_provider == 'None' %}
COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
+{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %}
+# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
+COMPRESS_STORAGE = STATICFILES_STORAGE
{%- endif %}
# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %} # noqa F405{% endif %}
From aa261ddbb7908c098c7b9c3e36c81c3bda8ae71c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Aug 2020 00:20:41 +0000
Subject: [PATCH 116/228] 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 921a87b7d..5ff2d62b6 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.3.2
+ rev: 5.4.1
hooks:
- id: isort
From 363b6eed4ef32340cba3c43b4900c5dff98ebcdd Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Thu, 13 Aug 2020 23:55:15 -0700
Subject: [PATCH 117/228] Update isort from 5.4.0 to 5.4.1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 63eb9759e..a1cb16ee7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==19.10b0
-isort==5.4.0
+isort==5.4.1
flake8==3.8.3
flake8-isort==4.0.0
From 7e87a92596b66828575f71e6b2235dd030db1d34 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 14 Aug 2020 08:12:55 +0100
Subject: [PATCH 118/228] Add missing comment over settings
---
{{cookiecutter.project_slug}}/config/settings/production.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 89049cad0..2f1b52e72 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -236,6 +236,7 @@ ANYMAIL = {}
# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
{%- if cookiecutter.cloud_provider == 'None' %}
+# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %}
# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
From dfdc3e729fbc577da1a204defc295cae4187a479 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Fri, 14 Aug 2020 07:17:53 +0000
Subject: [PATCH 119/228] 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 febc1fb1f..99121fdca 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1022,5 +1022,10 @@
"name": "Jan Fabry",
"github_login": "janfabry",
"twitter_username": ""
+ },
+ {
+ "name": "Jimmy Gitonga",
+ "github_login": "Afrowave",
+ "twitter_username": ""
}
]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b4f2bfcb0..dee97bef4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -838,6 +838,13 @@ Listed in alphabetical order.
|
afrowave |
+
+ Jimmy Gitonga |
+
+ Afrowave
+ |
+ |
+
John Cass |
From be340d24d25cd96ae3549dae86f76cf60a3b5c38 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 14 Aug 2020 08:24:34 +0100
Subject: [PATCH 120/228] Remove duplicated contributor
---
.github/contributors.json | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/.github/contributors.json b/.github/contributors.json
index 99121fdca..43e52913e 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -575,7 +575,7 @@
},
{
"name": "Jimmy Gitonga",
- "github_login": "afrowave",
+ "github_login": "Afrowave",
"twitter_username": "afrowave"
},
{
@@ -1022,10 +1022,5 @@
"name": "Jan Fabry",
"github_login": "janfabry",
"twitter_username": ""
- },
- {
- "name": "Jimmy Gitonga",
- "github_login": "Afrowave",
- "twitter_username": ""
}
-]
\ No newline at end of file
+]
From 3c1f2f0923f859939768a87c132d17483dde91b1 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Fri, 14 Aug 2020 07:25:26 +0000
Subject: [PATCH 121/228] Update Contributors
---
.github/contributors.json | 2 +-
CONTRIBUTORS.md | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/.github/contributors.json b/.github/contributors.json
index 43e52913e..e65ddcd38 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1023,4 +1023,4 @@
"github_login": "janfabry",
"twitter_username": ""
}
-]
+]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index dee97bef4..752aa9e5e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -831,19 +831,12 @@ Listed in alphabetical order.
|
Adys |
-
- Jimmy Gitonga |
-
- afrowave
- |
- afrowave |
-
Jimmy Gitonga |
Afrowave
|
- |
+ afrowave |
John Cass |
From 6c63143f3bf4fdbc195fea83708b2514da6a5442 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 14 Aug 2020 08:27:57 +0100
Subject: [PATCH 122/228] Avoid duplicate contributors due to different case
---
scripts/update_contributors.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index e00593ea4..8423ccd64 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -64,7 +64,11 @@ class ContributorsJSONFile:
def __contains__(self, github_login: str):
"""Provide a nice API to do: `username in file`."""
- return any(github_login == contrib["github_login"] for contrib in self.content)
+ return any(
+ # Github usernames are case insensitive
+ github_login.lower() == contrib["github_login"].lower()
+ for contrib in self.content
+ )
def add_contributor(self, user: NamedUser):
"""Append the contributor data we care about at the end."""
From 0ebd35dd8369ea4faa5d3af75362cef15944cec0 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 14 Aug 2020 12:19:42 +0100
Subject: [PATCH 123/228] Update deprecated imports
---
.../{{cookiecutter.project_slug}}/users/tests/factories.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 8917c5aec..1a78f132d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -1,7 +1,8 @@
from typing import Any, Sequence
from django.contrib.auth import get_user_model
-from factory import DjangoModelFactory, Faker, post_generation
+from factory import Faker, post_generation
+from factory.django import DjangoModelFactory
class UserFactory(DjangoModelFactory):
From 5e3abf903f60a5a88d1f0c52af1f37ce86d54bad Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 14 Aug 2020 04:19:56 -0700
Subject: [PATCH 124/228] Update sphinx from 3.2.0 to 3.2.1
---
{{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 789135938..f615195d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
# Documentation
# ------------------------------------------------------------------------------
-sphinx==3.2.0 # https://github.com/sphinx-doc/sphinx
+sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx
sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
# Code quality
From 89420f2932a6a67512c23524631caa5b717308a8 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Fri, 14 Aug 2020 15:09:36 +0300
Subject: [PATCH 125/228] Update linters.rst
Related to #2744 issue.
---
docs/linters.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/linters.rst b/docs/linters.rst
index 2d6232181..a4f60cc8d 100644
--- a/docs/linters.rst
+++ b/docs/linters.rst
@@ -19,7 +19,7 @@ The config for flake8 is located in setup.cfg. It specifies:
pylint
------
-This is included in flake8's checks, but you can also run it separately to see a more detailed report: ::
+To run pylint: ::
$ pylint
From 3752997562adfbb7769219ded50e1b6b5d83e24c Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 14 Aug 2020 15:49:18 -0700
Subject: [PATCH 126/228] Update sentry-sdk from 0.16.3 to 0.16.5
---
{{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 385c7489f..309a6b6a5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.3 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.5 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.1.0 # https://github.com/redis/hiredis-py
From 727ad58d065dabbae619cce8766dc803bc1c7b2b Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 14 Aug 2020 23:10:21 -0700
Subject: [PATCH 127/228] Update isort from 5.4.1 to 5.4.2
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index a1cb16ee7..270d25351 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==19.10b0
-isort==5.4.1
+isort==5.4.2
flake8==3.8.3
flake8-isort==4.0.0
From ba5c1a760f9ab62a68321ae15a1607449c28b8fd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Aug 2020 00:21:36 +0000
Subject: [PATCH 128/228] 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 5ff2d62b6..faca79081 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.4.1
+ rev: 5.4.2
hooks:
- id: isort
From 7d499e05aff036432fe1483529d52f4765ccabe2 Mon Sep 17 00:00:00 2001
From: Corey Garvey
Date: Wed, 19 Aug 2020 15:38:59 +0100
Subject: [PATCH 129/228] Update CONTRIBUTORS.rst
---
CONTRIBUTORS.rst | 1 +
1 file changed, 1 insertion(+)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index eab2132fb..3faa87d5e 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -93,6 +93,7 @@ Listed in alphabetical order.
Cole Mackenzie `@cmackenzie1`_
Cole Maclean `@cole`_ @cole
Collederas `@Collederas`_
+ Corey Garvey `@coreygarvey`_
Craig Margieson `@cmargieson`_
Cristian Vargas `@cdvv7788`_
Cullen Rhodes `@c-rhodes`_
From 4f7204744667184bc2fc48a2e039bf44282a1a27 Mon Sep 17 00:00:00 2001
From: Corey Garvey
Date: Wed, 19 Aug 2020 15:40:13 +0100
Subject: [PATCH 130/228] Updating production path to be hidden folder
---
docs/developing-locally-docker.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 17ea725bd..0d582d484 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -116,7 +116,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: ::
The three envs we are presented with here are ``POSTGRES_DB``, ``POSTGRES_USER``, and ``POSTGRES_PASSWORD`` (by the way, their values have also been generated for you). You might have figured out already where these definitions will end up; it's all the same with ``django`` service container envs.
-One final touch: should you ever need to merge ``.envs/production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: ::
+One final touch: should you ever need to merge ``.envs/.production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: ::
$ python merge_production_dotenvs_in_dotenv.py
From 10d88c50f3f734d281e7d2bf128a2d8de6e53ba1 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Wed, 19 Aug 2020 19:19:20 +0000
Subject: [PATCH 131/228] 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 e65ddcd38..714880995 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1022,5 +1022,10 @@
"name": "Jan Fabry",
"github_login": "janfabry",
"twitter_username": ""
+ },
+ {
+ "name": "Corey Garvey",
+ "github_login": "coreygarvey",
+ "twitter_username": ""
}
]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 752aa9e5e..0174628e5 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -439,6 +439,13 @@ Listed in alphabetical order.
|
+
+ Corey Garvey |
+
+ coreygarvey
+ |
+ |
+
Craig Margieson |
From cc1d297ad6eaa9af8d6632eb46a15beb06154dc3 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Sun, 23 Aug 2020 12:35:31 -0700
Subject: [PATCH 132/228] Update pre-commit from 2.6.0 to 2.7.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 5afe76938..01538655d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django
{%- if cookiecutter.use_celery == 'y' %}
pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery
{%- endif %}
-pre-commit==2.6.0 # https://github.com/pre-commit/pre-commit
+pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
# Django
# ------------------------------------------------------------------------------
From 32b81ba02e260f75dc00865f89ebcb112f1f4050 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 24 Aug 2020 09:54:47 -0700
Subject: [PATCH 133/228] Update sentry-sdk from 0.16.5 to 0.17.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 309a6b6a5..ce493a3cc 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.5 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.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 294d20d5e6fdd5aa4fc726ecad1ce8e69403e9a0 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Tue, 25 Aug 2020 05:08:22 -0700
Subject: [PATCH 134/228] Update django-cors-headers from 3.4.0 to 3.5.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 d24b50718..71f7cf5ab 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,5 +41,5 @@ django-redis==4.12.1 # https://github.com/jazzband/django-redis
{%- if cookiecutter.use_drf == "y" %}
# Django REST Framework
djangorestframework==3.11.1 # https://github.com/encode/django-rest-framework
-django-cors-headers==3.4.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers
{%- endif %}
From b8618430c96f552a97170d02626ca998d91036c3 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 26 Aug 2020 10:05:23 -0700
Subject: [PATCH 135/228] Update black from 19.10b0 to 20.8b1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 270d25351..9661a823b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
-black==19.10b0
+black==20.8b1
isort==5.4.2
flake8==3.8.3
flake8-isort==4.0.0
From 0dc3fe0b3d15faa394a6d2d2180c0fc976c0ac8c Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 26 Aug 2020 10:05:24 -0700
Subject: [PATCH 136/228] Update black from 19.10b0 to 20.8b1
---
{{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 01538655d..1b3b7fa04 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,7 +28,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
flake8==3.8.3 # https://github.com/PyCQA/flake8
flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort
coverage==5.2.1 # https://github.com/nedbat/coveragepy
-black==19.10b0 # https://github.com/ambv/black
+black==20.8b1 # https://github.com/ambv/black
pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django
{%- if cookiecutter.use_celery == 'y' %}
pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery
From bc584203641497cba526a07cc44ec9ae36372e42 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Aug 2020 00:22:07 +0000
Subject: [PATCH 137/228] 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 faca79081..297826013 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: 19.10b0
+ rev: 20.8b1
hooks:
- id: black
From e21869c1d4268c786451f45171b56b69abaca41c Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Thu, 27 Aug 2020 09:41:28 +0200
Subject: [PATCH 138/228] Fix black formatting issues
---
tests/test_cookiecutter_generation.py | 10 ++++++++--
.../{{cookiecutter.project_slug}}/users/models.py | 3 +--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 89b9b856e..f9bfcd539 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -175,7 +175,10 @@ def test_black_passes(cookies, context_override):
@pytest.mark.parametrize(
["use_docker", "expected_test_script"],
- [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),],
+ [
+ ("n", "pytest"),
+ ("y", "docker-compose -f local.yml run django pytest"),
+ ],
)
def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_script):
context.update({"ci_tool": "Travis", "use_docker": use_docker})
@@ -197,7 +200,10 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
@pytest.mark.parametrize(
["use_docker", "expected_test_script"],
- [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),],
+ [
+ ("n", "pytest"),
+ ("y", "docker-compose -f local.yml run django pytest"),
+ ],
)
def test_gitlab_invokes_flake8_and_pytest(
cookies, context, use_docker, expected_test_script
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 70efdfdec..8391bc032 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -5,8 +5,7 @@ from django.utils.translation import gettext_lazy as _
class User(AbstractUser):
- """Default user for {{cookiecutter.project_name}}.
- """
+ """Default user for {{cookiecutter.project_name}}."""
#: First and last name do not cover name patterns around the globe
name = CharField(_("Name of User"), blank=True, max_length=255)
From 8a5eae8f87c9d2610059e10aa334167cfa6aac3f Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Thu, 27 Aug 2020 10:33:47 +0200
Subject: [PATCH 139/228] Remove feature branch used for testing
---
.github/workflows/update-contributors.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index f95532578..acae4729d 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -4,7 +4,6 @@ on:
push:
branches:
- master
- - auto-generate-contributors
jobs:
build:
From 18af7523fc7a20d52e4b684d6dd0bc0aa2fe7c85 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Thu, 27 Aug 2020 05:17:04 -0700
Subject: [PATCH 140/228] Pin pygithub to latest version 1.53
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 96d5046ee..5f92a09e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,5 +19,5 @@ pyyaml==5.3.1
# Scripting
# ------------------------------------------------------------------------------
-PyGithub
+PyGithub==1.53
jinja2
From 814dfa26e45296130ce74521600082cf7b1146ad Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Thu, 27 Aug 2020 07:02:49 -0700
Subject: [PATCH 141/228] Pin jinja2 to latest version 2.11.2
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 5f92a09e0..7444d12bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,4 +20,4 @@ pyyaml==5.3.1
# Scripting
# ------------------------------------------------------------------------------
PyGithub==1.53
-jinja2
+jinja2==2.11.2
From 688739cb3981b779beb8431ed6208ae5e595ff02 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer
Date: Fri, 28 Aug 2020 10:17:34 +0200
Subject: [PATCH 142/228] Add environment and traces_sample_rate keyword to
sentry_sdk.init
---
docs/settings.rst | 2 ++
.../config/settings/production.py | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/docs/settings.rst b/docs/settings.rst
index 949d5f35f..7563f50d2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -49,6 +49,8 @@ DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a
DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error
GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error
SENTRY_DSN SENTRY_DSN n/a raises error
+SENTRY_ENVIRONMENT n/a n/a production
+SENTRY_TRACES_SAMPLE_RATE n/a n/a 0.0
DJANGO_SENTRY_LOG_LEVEL SENTRY_LOG_LEVEL n/a logging.INFO
MAILGUN_API_KEY MAILGUN_API_KEY n/a raises error
MAILGUN_DOMAIN MAILGUN_SENDER_DOMAIN n/a raises error
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2f1b52e72..7b2776bf8 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -353,13 +353,17 @@ sentry_logging = LoggingIntegration(
)
{%- if cookiecutter.use_celery == 'y' %}
+integrations = [sentry_logging, DjangoIntegration(), CeleryIntegration()]
+{% else %}
+integrations = [sentry_logging, DjangoIntegration()]
+{% endif -%}
+
sentry_sdk.init(
dsn=SENTRY_DSN,
- integrations=[sentry_logging, DjangoIntegration(), CeleryIntegration()],
+ integrations=integrations,
+ environment=env("SENTRY_ENVIRONMENT", default="production"),
+ traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0.0),
)
-{% else %}
-sentry_sdk.init(dsn=SENTRY_DSN, integrations=[sentry_logging, DjangoIntegration()])
-{% endif -%}
{% endif %}
# Your stuff...
# ------------------------------------------------------------------------------
From d17321dfbe65846f3c0f552e9dad3b4c0fc8301b Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 28 Aug 2020 14:55:22 -0700
Subject: [PATCH 143/228] Update sentry-sdk from 0.17.0 to 0.17.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 ce493a3cc..16766cbc6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.0 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.1 # 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 54e8f262193d2022e305896bd2a2d6e5a0f7ecca Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 28 Aug 2020 19:31:17 -0700
Subject: [PATCH 144/228] Update sh from 1.13.1 to 1.14.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 7444d12bd..7f3f6e315 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
cookiecutter==1.7.2
-sh==1.13.1
+sh==1.14.0
binaryornot==0.4.4
# Code quality
From baf5e6e74ecb1695fd030a6af2eed47b43144670 Mon Sep 17 00:00:00 2001
From: Howie Zhao
Date: Sat, 29 Aug 2020 11:53:24 +0800
Subject: [PATCH 145/228] chore: exclude venv directory
---
{{cookiecutter.project_slug}}/setup.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 6520aff76..5bde75cff 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -1,10 +1,10 @@
[flake8]
max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
[pycodestyle]
max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
[mypy]
python_version = 3.8
From 2c82c4e1da6f2aa9454080b8b25ea56b3ad9de6a Mon Sep 17 00:00:00 2001
From: Howie Zhao
Date: Sat, 29 Aug 2020 11:59:29 +0800
Subject: [PATCH 146/228] chore: update document link
---
{{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2f1b52e72..5528d166f 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -34,7 +34,7 @@ CACHES = {
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
# Mimicing memcache behavior.
- # http://jazzband.github.io/django-redis/latest/#_memcached_exceptions_behavior
+ # https://github.com/jazzband/django-redis#memcached-exceptions-behavior
"IGNORE_EXCEPTIONS": True,
},
}
From aeefbc060fd7ed0ea7194725290d188df44fa207 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 31 Aug 2020 00:15:40 -0700
Subject: [PATCH 147/228] Update django-storages from 1.9.1 to 1.10
---
{{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 ce493a3cc..ec0071d94 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py
# Django
# ------------------------------------------------------------------------------
{%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.9.1 # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages
{%- elif cookiecutter.cloud_provider == 'GCP' %}
django-storages[google]==1.9.1 # https://github.com/jschneier/django-storages
{%- endif %}
From 0c23267806f80dfb9fdd4dd053081c191744445d Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 31 Aug 2020 00:15:41 -0700
Subject: [PATCH 148/228] Update django-storages from 1.9.1 to 1.10
---
{{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 ec0071d94..d988e107b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py
{%- if cookiecutter.cloud_provider == 'AWS' %}
django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages
{%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.9.1 # https://github.com/jschneier/django-storages
+django-storages[google]==1.10 # https://github.com/jschneier/django-storages
{%- endif %}
{%- if cookiecutter.mail_service == 'Mailgun' %}
django-anymail[mailgun]==7.2.1 # https://github.com/anymail/django-anymail
From 2f7a6c3013be3c7f78d7ec8987c2da6929414805 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 31 Aug 2020 05:45:27 -0700
Subject: [PATCH 149/228] Update sphinx-autobuild from 0.7.1 to 2020.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 1b3b7fa04..f5f17a44f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
# Documentation
# ------------------------------------------------------------------------------
sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx
-sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
+sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
# Code quality
# ------------------------------------------------------------------------------
From fe9c9b5e48c84a05fd2147314179ab70fba45062 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 31 Aug 2020 11:53:48 -0700
Subject: [PATCH 150/228] Update django-extensions from 3.0.5 to 3.0.6
---
{{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 1b3b7fa04..89942cfe1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.5 # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.6 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django
From 18c53d0a3b6deeeb26e0ceae93631f353cd4b3bd Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Tue, 1 Sep 2020 07:56:55 -0700
Subject: [PATCH 151/228] Update sentry-sdk from 0.17.1 to 0.17.2
---
{{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 16766cbc6..bcde27ae8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.1 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.2 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.1.0 # https://github.com/redis/hiredis-py
From 007ab4aefd8484aed70499efc33d5414c38ba567 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Tue, 1 Sep 2020 07:56:59 -0700
Subject: [PATCH 152/228] Update django from 3.0.9 to 3.0.10
---
{{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 71f7cf5ab..1c496a256 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn==0.11.8 # https://github.com/encode/uvicorn
# Django
# ------------------------------------------------------------------------------
-django==3.0.9 # pyup: < 3.1 # https://www.djangoproject.com/
+django==3.0.10 # pyup: < 3.1 # https://www.djangoproject.com/
django-environ==0.4.5 # https://github.com/joke2k/django-environ
django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils
django-allauth==0.42.0 # https://github.com/pennersr/django-allauth
From 72bd4d99b20271bbefc7b9301c2146588ec93c8e Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Tue, 1 Sep 2020 13:04:19 -0700
Subject: [PATCH 153/228] Update tox from 3.19.0 to 3.20.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 7f3f6e315..57938d744 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
# Testing
# ------------------------------------------------------------------------------
-tox==3.19.0
+tox==3.20.0
pytest==6.0.1
pytest-cookies==0.5.1
pytest-instafail==0.4.2
From dc1c89688c8062278b53a25f309bf828b6bffeab Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Tue, 1 Sep 2020 22:06:01 +0200
Subject: [PATCH 154/228] Update project version in setup.py
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index d12165463..8a5b0b8ce 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ except ImportError:
# Our version ALWAYS matches the version of Django we support
# If Django has a new release, we branch, tag, then update this setting after the tag.
-version = "3.0.9"
+version = "3.0.10"
if sys.argv[-1] == "tag":
os.system(f'git tag -a {version} -m "version {version}"')
From 53b4371c09c1304e0d684cdfc687ade2835e1181 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Tue, 1 Sep 2020 22:20:02 +0200
Subject: [PATCH 155/228] Remove deprecated setting from django-storages
---
{{cookiecutter.project_slug}}/config/settings/production.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2f1b52e72..85440adc6 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -86,8 +86,6 @@ _AWS_EXPIRY = 60 * 60 * 24 * 7
AWS_S3_OBJECT_PARAMETERS = {
"CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
}
-# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_DEFAULT_ACL = None
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront
From bd977e29afdb4008e5152578a11e8b4b9bce66b4 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Tue, 1 Sep 2020 17:08:30 -0700
Subject: [PATCH 156/228] Update django-extensions from 3.0.6 to 3.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 62cb409dc..26eaf8e7f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.6 # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.7 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django
From a115c13ced853e5c1fba283fb062ae556424c996 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 2 Sep 2020 09:57:55 +0200
Subject: [PATCH 157/228] Add issue manager workflow
---
.github/workflows/issue-manager.yml | 59 +++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
create mode 100644 .github/workflows/issue-manager.yml
diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
new file mode 100644
index 000000000..3f7658178
--- /dev/null
+++ b/.github/workflows/issue-manager.yml
@@ -0,0 +1,59 @@
+# Automatically close issues that have a keyword mark (an HTML comment)
+# in the last comment in the issue, by a group of predefined users, after a custom delay.
+# https://github.com/tiangolo/issue-manager
+
+# Default config:
+#
+# Wait 10 days and comment: "Assuming the original issue was solved, it will be automatically closed now"
+
+# Extra config:
+# ''
+# Wait 10 days and comment: "Automatically closing. To re-open, please provide the additional information requested"
+
+name: Issue Manager
+
+on:
+ schedule:
+ - cron: "0 0 * * *"
+
+jobs:
+ issue-manager:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: tiangolo/issue-manager@0.3.0
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+
+ config: >
+ {
+ "answered": {
+ "delay": 864000,
+ "message": "Assuming the original issue was solved, it will be automatically closed now.",
+ "users": [
+ "pydanny",
+ "audreyr",
+ "luzfcb",
+ "theskumar",
+ "jayfk",
+ "burhan",
+ "webyneter",
+ "browniebroke",
+ "sfdye",
+ ]
+ },
+ "waiting": {
+ "delay": 864000,
+ "message": "Automatically closing. To re-open, please provide the additional information requested.",
+ "users": [
+ "pydanny",
+ "audreyr",
+ "luzfcb",
+ "theskumar",
+ "jayfk",
+ "burhan",
+ "webyneter",
+ "browniebroke",
+ "sfdye",
+ ]
+ }
+ }
From a7c69639f2e3d87e989d4a7ca883fd368927d32d Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 2 Sep 2020 02:51:48 -0700
Subject: [PATCH 158/228] Update sentry-sdk from 0.17.2 to 0.17.3
---
{{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 7340a8929..607faed3f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.2 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.3 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.1.0 # https://github.com/redis/hiredis-py
From 992837e274fc9f0b597221d32271f672eb197aa4 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Thu, 3 Sep 2020 08:36:06 +0100
Subject: [PATCH 159/228] Fix JSON formatting
---
.github/workflows/issue-manager.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index 3f7658178..f6b465276 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -13,8 +13,11 @@
name: Issue Manager
on:
+ # Every day at midnight
schedule:
- cron: "0 0 * * *"
+ # Manual trigger
+ workflow_dispatch:
jobs:
issue-manager:
@@ -38,7 +41,7 @@ jobs:
"burhan",
"webyneter",
"browniebroke",
- "sfdye",
+ "sfdye"
]
},
"waiting": {
@@ -53,7 +56,7 @@ jobs:
"burhan",
"webyneter",
"browniebroke",
- "sfdye",
+ "sfdye"
]
}
}
From 865621c435e238987ea32f17274a2316c1c20db7 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Thu, 3 Sep 2020 06:41:36 -0700
Subject: [PATCH 160/228] Update isort from 5.4.2 to 5.5.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 57938d744..3a896178a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==20.8b1
-isort==5.4.2
+isort==5.5.0
flake8==3.8.3
flake8-isort==4.0.0
From 84713cf72431a8b49cc3348a744922efaa22677b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:24:21 +0000
Subject: [PATCH 161/228] 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 297826013..affb6929a 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.4.2
+ rev: 5.5.0
hooks:
- id: isort
From 9858c6a86612840dee15c1043d38ac117783e3a0 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 4 Sep 2020 06:28:21 -0700
Subject: [PATCH 162/228] Update isort from 5.5.0 to 5.5.1
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 3a896178a..7ecdd4d0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==20.8b1
-isort==5.5.0
+isort==5.5.1
flake8==3.8.3
flake8-isort==4.0.0
From c6c0bd9289fddc05533d8df9c78c5953471e5e13 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 4 Sep 2020 08:26:40 -0700
Subject: [PATCH 163/228] Update django-extensions from 3.0.7 to 3.0.8
---
{{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 26eaf8e7f..144214104 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.7 # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.8 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django
From b78fbb1a25cef4d3d88cc27ceb4c08ee9807a468 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 4 Sep 2020 17:27:09 +0200
Subject: [PATCH 164/228] Fix typo in docstring
---
scripts/update_contributors.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 8423ccd64..0236daae3 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -13,7 +13,7 @@ def main() -> None:
"""
Script entry point.
- 1. Fetch recent contribtors from the Github API
+ 1. Fetch recent contributors from the Github API
2. Add missing ones to the JSON file
3. Generate Markdown from JSON file
"""
From df0d332207aad72663056c3de1c24a75edc40e61 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 4 Sep 2020 17:26:24 +0200
Subject: [PATCH 165/228] Automatically generate changelog
Fixes #1491
---
.github/changelog-template.md | 9 +++
.github/workflows/update-changelog.yml | 34 +++++++++++
CHANGELOG.md | 2 +
scripts/update_changelog.py | 78 ++++++++++++++++++++++++++
4 files changed, 123 insertions(+)
create mode 100644 .github/changelog-template.md
create mode 100644 .github/workflows/update-changelog.yml
create mode 100644 scripts/update_changelog.py
diff --git a/.github/changelog-template.md b/.github/changelog-template.md
new file mode 100644
index 000000000..49550ba12
--- /dev/null
+++ b/.github/changelog-template.md
@@ -0,0 +1,9 @@
+## [{{merge_date.strftime('%Y-%m-%d')}}]
+{%- for change_type, pulls in grouped_pulls.items() %}
+{%- if pulls %}
+### {{ change_type }}
+{%- for pull_request in pulls %}
+- {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.url }}))
+{%- endfor -%}
+{% endif -%}
+{% endfor -%}
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
new file mode 100644
index 000000000..562c37eb9
--- /dev/null
+++ b/.github/workflows/update-changelog.yml
@@ -0,0 +1,34 @@
+name: Update Changelog
+
+on:
+ # Every day at 2am
+ schedule:
+ - cron: "0 2 * * *"
+ # Manual trigger
+ workflow_dispatch:
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: "3.8"
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install -r requirements.txt
+ - name: Update list
+ run: python scripts/update_changelog.py
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Commit changes
+ uses: stefanzweifel/git-auto-commit-action@v4
+ with:
+ commit_message: Update Changelog
+ file_pattern: CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27a8578a2..0019b35c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
# Change Log
All enhancements and patches to Cookiecutter Django will be documented in this file.
+
+
## [2020-04-13]
### Changed
- Updated to Python 3.8 (@codnee)
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
new file mode 100644
index 000000000..08ff5b095
--- /dev/null
+++ b/scripts/update_changelog.py
@@ -0,0 +1,78 @@
+import os
+from pathlib import Path
+from github import Github
+from jinja2 import Template
+import datetime as dt
+
+CURRENT_FILE = Path(__file__)
+ROOT = CURRENT_FILE.parents[1]
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
+
+# Generate changelog for PRs merged yesterday
+MERGED_DATE = dt.date.today() - dt.timedelta(days=1)
+
+
+def main() -> None:
+ """
+ Script entry point.
+ """
+ merged_pulls = list(iter_pulls())
+ if not merged_pulls:
+ print("Nothing was merged, existing.")
+ return
+
+ # Group pull requests by type of change
+ grouped_pulls = group_pulls_by_change_type(merged_pulls)
+
+ # Generate portion of markdown
+ rendered_content = generate_md(grouped_pulls)
+
+ # Update CHANGELOG.md file
+ file_path = ROOT / "CHANGELOG.md"
+ old_content = file_path.read_text()
+ updated_content = old_content.replace(
+ "",
+ f"\n\n{rendered_content}",
+ )
+ file_path.write_text(updated_content)
+
+
+def iter_pulls():
+ """Fetch merged pull requests at the date we're interested in."""
+ repo = Github(login_or_token=GITHUB_TOKEN).get_repo("pydanny/cookiecutter-django")
+ recent_pulls = repo.get_pulls(
+ state="closed", sort="updated", direction="desc"
+ ).get_page(0)
+ for pull in recent_pulls:
+ if pull.merged and pull.merged_at.date() == MERGED_DATE:
+ yield pull
+
+
+def group_pulls_by_change_type(pull_requests_list):
+ """Group pull request by change type."""
+ grouped_pulls = {
+ "Changed": [],
+ "Fixed": [],
+ "Updated": [],
+ }
+ for pull in pull_requests_list:
+ label_names = {l.name for l in pull.labels}
+ if "update" in label_names:
+ group_name = "Updated"
+ elif "bug" in label_names:
+ group_name = "Fixed"
+ else:
+ group_name = "Changed"
+ grouped_pulls[group_name].append(pull)
+ return grouped_pulls
+
+
+def generate_md(grouped_pulls):
+ """Generate markdown file from Jinja template."""
+ changelog_template = ROOT / ".github" / "changelog-template.md"
+ template = Template(changelog_template.read_text(), autoescape=True)
+ return template.render(merge_date=MERGED_DATE, grouped_pulls=grouped_pulls)
+
+
+if __name__ == "__main__":
+ main()
From dbb5a697f9fdcd40ca671d8936020b219bb2d05c Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 4 Sep 2020 17:54:28 +0200
Subject: [PATCH 166/228] Auto-generate changelog for the past week
---
CHANGELOG.md | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0019b35c1..f9fab8379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-02]
+### Changed
+- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777))
+### Updated
+- Update sentry-sdk to 0.17.3 ([#2788](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2788))
+- Update django-extensions to 3.0.7 ([#2787](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2787))
+
+## [2020-09-01]
+### Changed
+- Exclude venv directory and update document link ([#2780](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2780))
+### Updated
+- Update tox to 3.20.0 ([#2786](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2786))
+- Update django-storages to 1.10 ([#2781](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2781))
+- Update sentry-sdk to 0.17.2 ([#2784](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2784))
+- Update django to 3.0.10 ([#2785](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2785))
+- Update sphinx-autobuild to 2020.9.1 ([#2782](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2782))
+- Update django-extensions to 3.0.6 ([#2783](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2783))
+
+## [2020-08-31]
+### Updated
+- Update sh to 1.14.0 ([#2779](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2779))
+- Update sentry-sdk to 0.17.1 ([#2778](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2778))
+
## [2020-04-13]
### Changed
- Updated to Python 3.8 (@codnee)
From 77a00376e8195b73fae5c3dd80efdf5d9b432e3f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 5 Sep 2020 00:40:41 +0000
Subject: [PATCH 167/228] 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 affb6929a..74839c2c0 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.5.0
+ rev: 5.5.1
hooks:
- id: isort
From e6d7b015583b2bebc14853b82753337c13d0f101 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Sat, 5 Sep 2020 02:43:34 +0000
Subject: [PATCH 168/228] Update Changelog
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9fab8379..93b4b9ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-04]
+### Updated
+- Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792))
+- Update isort to 5.5.1 ([#2791](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2791))
+- Auto-update pre-commit hooks ([#2790](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2790))
+- Update isort to 5.5.0 ([#2789](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2789))
+
## [2020-09-02]
### Changed
- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777))
From 4659cb9baa82388436e7e2731359dde4bd58a433 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Sun, 6 Sep 2020 02:16:23 +0000
Subject: [PATCH 169/228] Update Changelog
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93b4b9ef1..bc397c7ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-05]
+### Updated
+- Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793))
+
## [2020-09-04]
### Updated
- Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792))
From 9cdae535b3b56656e495d544d8f5de461f2c8321 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Sun, 6 Sep 2020 19:12:31 -0700
Subject: [PATCH 170/228] Update psycopg2-binary from 2.8.5 to 2.8.6
---
{{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 144214104..dad44f822 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ ipdb==0.13.3 # https://github.com/gotcha/ipdb
{%- if cookiecutter.use_docker == 'y' %}
psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
{%- else %}
-psycopg2-binary==2.8.5 # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2
{%- endif %}
{%- if cookiecutter.use_async == 'y' %}
watchgod==0.6 # https://github.com/samuelcolvin/watchgod
From cbc46cb34f80235831f332168b895a707e4b12b9 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Mon, 7 Sep 2020 14:23:02 +0200
Subject: [PATCH 171/228] Update psycopg2 from 2.8.5 to 2.8.6
---
{{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
{{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index dad44f822..998905a05 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.3 # https://github.com/gotcha/ipdb
{%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
{%- else %}
psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2
{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 607faed3f..31e576288 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
-r base.txt
gunicorn==20.0.4 # https://github.com/benoitc/gunicorn
-psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
{%- if cookiecutter.use_whitenoise == 'n' %}
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
From 7fb71507d2f29049a9b446e4c20122fcaa849911 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury
Date: Mon, 7 Sep 2020 17:58:49 +0530
Subject: [PATCH 172/228] Updated Gitlab CI to use Python 3.8 instead of Python
3.7 (#2794)
---
CONTRIBUTORS.md | 2 +-
{{cookiecutter.project_slug}}/.gitlab-ci.yml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0174628e5..2d17cddfe 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1463,4 +1463,4 @@ guidance and advice.
- Jannis Leidel
- Nate Aune
-- Barry Morrison
\ No newline at end of file
+- Barry Morrison
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 246c4c982..60925b811 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
flake8:
stage: lint
- image: python:3.7-alpine
+ image: python:3.8-alpine
before_script:
- pip install -q flake8
script:
@@ -21,7 +21,7 @@ flake8:
pytest:
stage: test
- image: python:3.7
+ image: python:3.8
{% if cookiecutter.use_docker == 'y' -%}
image: docker/compose:latest
tags:
@@ -39,7 +39,7 @@ pytest:
tags:
- python
services:
- - postgres:11
+ - postgres:{{ cookiecutter.postgresql_version }}
variables:
DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
From 17fbe5f4c6b37b45121779b9c5b17f192a338076 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Mon, 7 Sep 2020 12:29:24 +0000
Subject: [PATCH 173/228] Update Contributors
---
.github/contributors.json | 5 +++++
CONTRIBUTORS.md | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.github/contributors.json b/.github/contributors.json
index 714880995..8c2180bd1 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1027,5 +1027,10 @@
"name": "Corey Garvey",
"github_login": "coreygarvey",
"twitter_username": ""
+ },
+ {
+ "name": "Arnav Choudhury",
+ "github_login": "arnav13081994",
+ "twitter_username": ""
}
]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2d17cddfe..69ea53f3f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -264,6 +264,13 @@ Listed in alphabetical order.
|
|
+
+ Arnav Choudhury |
+
+ arnav13081994
+ |
+ |
+
AsheKR |
@@ -1463,4 +1470,4 @@ guidance and advice.
- Jannis Leidel
- Nate Aune
-- Barry Morrison
+- Barry Morrison
\ No newline at end of file
From 624dd94dd3738d50f91655d350ca9bf22b6af68f Mon Sep 17 00:00:00 2001
From: Wes Turner <50891+westurner@users.noreply.github.com>
Date: Mon, 7 Sep 2020 08:51:52 -0400
Subject: [PATCH 174/228] Add :z/:Z to mounted volumes in
{local,production}.yml (#2663)
---
{{cookiecutter.project_slug}}/local.yml | 14 +++++++-------
{{cookiecutter.project_slug}}/production.yml | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 528e59b2c..a6cbe5430 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -17,7 +17,7 @@ services:
- mailhog
{%- endif %}
volumes:
- - .:/app
+ - .:/app:z
env_file:
- ./.envs/.local/.django
- ./.envs/.local/.postgres
@@ -32,8 +32,8 @@ services:
image: {{ cookiecutter.project_slug }}_production_postgres
container_name: postgres
volumes:
- - local_postgres_data:/var/lib/postgresql/data
- - local_postgres_data_backups:/backups
+ - local_postgres_data:/var/lib/postgresql/data:Z
+ - local_postgres_data_backups:/backups:z
env_file:
- ./.envs/.local/.postgres
@@ -46,9 +46,9 @@ services:
env_file:
- ./.envs/.local/.django
volumes:
- - ./docs:/docs
- - ./config:/app/config
- - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}
+ - ./docs:/docs:z
+ - ./config:/app/config:z
+ - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
ports:
- "7000:7000"
@@ -113,7 +113,7 @@ services:
depends_on:
- django
volumes:
- - .:/app
+ - .:/app:z
# http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
- /app/node_modules
command: npm run dev
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 2cd2af132..93b61b134 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -25,8 +25,8 @@ services:
dockerfile: ./compose/production/postgres/Dockerfile
image: {{ cookiecutter.project_slug }}_production_postgres
volumes:
- - production_postgres_data:/var/lib/postgresql/data
- - production_postgres_data_backups:/backups
+ - production_postgres_data:/var/lib/postgresql/data:Z
+ - production_postgres_data_backups:/backups:z
env_file:
- ./.envs/.production/.postgres
@@ -38,7 +38,7 @@ services:
depends_on:
- django
volumes:
- - production_traefik:/etc/traefik/acme
+ - production_traefik:/etc/traefik/acme:z
ports:
- "0.0.0.0:80:80"
- "0.0.0.0:443:443"
@@ -75,5 +75,5 @@ services:
env_file:
- ./.envs/.production/.django
volumes:
- - production_postgres_data_backups:/backups
+ - production_postgres_data_backups:/backups:z
{%- endif %}
From 756cf6c93545fa43e4330d52ec48bb49a9272925 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Mon, 7 Sep 2020 12:52:21 +0000
Subject: [PATCH 175/228] 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 8c2180bd1..4f2f96dfa 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1032,5 +1032,10 @@
"name": "Arnav Choudhury",
"github_login": "arnav13081994",
"twitter_username": ""
+ },
+ {
+ "name": "Wes Turner",
+ "github_login": "westurner",
+ "twitter_username": "westurner"
}
]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 69ea53f3f..e0fda25ed 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1426,6 +1426,13 @@ Listed in alphabetical order.
|
|
+
+ Wes Turner |
+
+ westurner
+ |
+ westurner |
+
Will Farley |
From 0b3dd776c624184cd89dde2b28d81625f1914112 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Mon, 7 Sep 2020 15:06:18 +0200
Subject: [PATCH 176/228] Fix options for sphinx-autobuild in docs Makefile
(#2799)
Fix #2796
---
{{cookiecutter.project_slug}}/docs/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 90f61de32..4f772cade 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -22,9 +22,9 @@ help:
# Build, watch and serve docs with live reload
livehtml:
sphinx-autobuild -b html
- {%- if cookiecutter.use_docker == 'y' %} -H 0.0.0.0
+ {%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0
{%- else %} --open-browser
- {%- endif %} -p 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
+ {%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
# Outputs rst files from django application code
apidocs:
From ffaec0008405dc528ba869a780c7ec61a36d0942 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Mon, 7 Sep 2020 15:10:57 +0200
Subject: [PATCH 177/228] Remove --no-binary option for psycopg2 (#2798)
It was required in 2.7, but it's now the default in 2.8
---
{{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
{{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 998905a05..cc751326f 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.3 # https://github.com/gotcha/ipdb
{%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
{%- else %}
psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2
{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 31e576288..8016786cf 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
-r base.txt
gunicorn==20.0.4 # https://github.com/benoitc/gunicorn
-psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
{%- if cookiecutter.use_whitenoise == 'n' %}
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
From 2a0f40e7671fc1f21a18c369403ba6d1f7b13b65 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Mon, 7 Sep 2020 15:30:37 +0200
Subject: [PATCH 178/228] Clean up nested venv files from `.gitignore`
Fixes #2226
---
.gitignore | 10 ----------
{{cookiecutter.project_slug}}/.gitignore | 12 ------------
2 files changed, 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index 386b2651a..f753fec91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,16 +208,6 @@ Session.vim
tags
-### VirtualEnv template
-# Virtualenv
-# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-pyvenv.cfg
-pip-selfcheck.json
-
-
# Even though the project might be opened and edited
# in any of the JetBrains IDEs, it makes no sence whatsoever
# to 'run' anything within it since any particular cookiecutter
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 9850b1273..311b43a57 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -321,18 +321,6 @@ Session.vim
# Auto-generated tag files
tags
-{% if cookiecutter.use_docker == 'n' %}
-
-### VirtualEnv template
-# Virtualenv
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-[Ss]cripts
-pyvenv.cfg
-pip-selfcheck.json
-.env
-{% endif %}
### Project template
{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
From 8eab7bbdb578f943f5cd5af02a7e68b29150f115 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Tue, 8 Sep 2020 02:16:41 +0000
Subject: [PATCH 179/228] Update Changelog
---
CHANGELOG.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc397c7ca..4c42b8695 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-07]
+### Changed
+- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663))
+- Remove --no-binary option for psycopg2 ([#2798](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2798))
+- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2794))
+### Fixed
+- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2799))
+### Updated
+- Update psycopg2-binary to 2.8.6 ([#2797](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2797))
+
## [2020-09-05]
### Updated
- Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793))
From 536e86ecadb66a9f37315a73af4dd6255a5a2f39 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury
Date: Tue, 8 Sep 2020 13:34:10 +0530
Subject: [PATCH 180/228] Traeffik and Django dockerfile changes (#2801)
---
CONTRIBUTORS.md | 2 +-
.../compose/production/django/Dockerfile | 16 ++++++++--------
.../compose/production/traefik/Dockerfile | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e0fda25ed..dd55e2af2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1477,4 +1477,4 @@ guidance and advice.
- Jannis Leidel
- Nate Aune
-- Barry Morrison
\ No newline at end of file
+- Barry Morrison
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 72f71d6ec..2e6a195b7 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -32,26 +32,26 @@ COPY ./requirements /requirements
RUN pip install --no-cache-dir -r /requirements/production.txt \
&& rm -rf /requirements
-COPY ./compose/production/django/entrypoint /entrypoint
+COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint
RUN sed -i 's/\r$//g' /entrypoint
RUN chmod +x /entrypoint
-RUN chown django /entrypoint
-COPY ./compose/production/django/start /start
+
+COPY --chown=django:django ./compose/production/django/start /start
RUN sed -i 's/\r$//g' /start
RUN chmod +x /start
-RUN chown django /start
+
{%- if cookiecutter.use_celery == "y" %}
-COPY ./compose/production/django/celery/worker/start /start-celeryworker
+COPY --chown=django:django ./compose/production/django/celery/worker/start /start-celeryworker
RUN sed -i 's/\r$//g' /start-celeryworker
RUN chmod +x /start-celeryworker
-RUN chown django /start-celeryworker
-COPY ./compose/production/django/celery/beat/start /start-celerybeat
+
+COPY --chown=django:django ./compose/production/django/celery/beat/start /start-celerybeat
RUN sed -i 's/\r$//g' /start-celerybeat
RUN chmod +x /start-celerybeat
-RUN chown django /start-celerybeat
+
COPY ./compose/production/django/celery/flower/start /start-flower
RUN sed -i 's/\r$//g' /start-flower
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 746aa2b48..26a653d50 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,5 +1,5 @@
FROM traefik:v2.0
-RUN mkdir -p /etc/traefik/acme
-RUN touch /etc/traefik/acme/acme.json
-RUN chmod 600 /etc/traefik/acme/acme.json
+RUN mkdir -p /etc/traefik/acme \
+ && touch /etc/traefik/acme/acme.json \
+ && chmod 600 /etc/traefik/acme/acme.json
COPY ./compose/production/traefik/traefik.yml /etc/traefik
From 69209b6fa16147e0260d7e934910fdfa90e3780f Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Tue, 8 Sep 2020 08:04:49 +0000
Subject: [PATCH 181/228] Update Contributors
---
CONTRIBUTORS.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index dd55e2af2..e0fda25ed 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1477,4 +1477,4 @@ guidance and advice.
- Jannis Leidel
- Nate Aune
-- Barry Morrison
+- Barry Morrison
\ No newline at end of file
From b3028d8299879916097f8f83c6d1f2093d2f0365 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Wed, 9 Sep 2020 02:17:01 +0000
Subject: [PATCH 182/228] Update Changelog
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c42b8695..dd8b927d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-08]
+### Changed
+- Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))
+
## [2020-09-07]
### Changed
- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663))
From d2e6b285d9fb84a4f622cc8170997b7ece26dc5e Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 9 Sep 2020 09:36:07 +0100
Subject: [PATCH 183/228] Update FUNDING.yml
---
.github/FUNDING.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 5a5aefc78..c66e6bc7c 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
# These are supported funding model platforms
-github: pydanny
+github: [pydanny, browniebroke]
patreon: roygreenfeld
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
From 949cd5acb7bbf2773496f19285efbc4c94271a3f Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 9 Sep 2020 14:07:30 +0200
Subject: [PATCH 184/228] Update issue and pull request templates
---
.github/ISSUE_TEMPLATE.md | 1 -
.github/ISSUE_TEMPLATE/bug.md | 32 ++++++++++++++++++--------
.github/ISSUE_TEMPLATE/feature.md | 18 ++++-----------
.github/ISSUE_TEMPLATE/improvement.md | 24 -------------------
.github/ISSUE_TEMPLATE/paid-support.md | 8 ++++++-
.github/ISSUE_TEMPLATE/question.md | 10 ++++++--
.github/ISSUE_TEMPLATE/regression.md | 28 ----------------------
.github/PULL_REQUEST_TEMPLATE.md | 25 ++++++++------------
cookiecutter.json | 1 -
9 files changed, 51 insertions(+), 96 deletions(-)
delete mode 100644 .github/ISSUE_TEMPLATE.md
delete mode 100644 .github/ISSUE_TEMPLATE/improvement.md
delete mode 100644 .github/ISSUE_TEMPLATE/regression.md
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index b232b6e34..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1 +0,0 @@
-## [Make sure to follow one of the issue templates we've got](https://github.com/pydanny/cookiecutter-django/issues/new/choose), otherwise the issue might be closed immeditely
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 2a48c0c32..b2b577f57 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,21 +1,33 @@
---
name: Bug Report
about: Report a bug
+title: '[bug]'
+labels: bug
---
## What happened?
-
-
-
## What should've happened instead?
+## Additional details
+
-
-## Steps to reproduce
-
-[//]: # (Any or all of the following:)
-[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
-[//]: # (* Replay file https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html)
-[//]: # (* Logs)
+* Host system configuration:
+ * Version of cookiecutter CLI (get it with `cookiecutter --version`):
+ * OS:
+ * Python version:
+ * Docker versions (if using Docker):
+ * ...
+* Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
+ ```
+ ```
+
+Logs:
+
+
+$ cookiecutter https://github.com/pydanny/cookiecutter-django
+project_name [Project Name]: ...
+
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index b0d560d81..8cc8141aa 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,24 +1,14 @@
---
name: New Feature Proposal
about: Propose a new feature
+title: '[feature request]'
+labels: enhancement
---
## Description
-[//]: # (What's it you're proposing? How should it be implemented?)
-
-
-
+What are you proposing? How should it be implemented?
## Rationale
-[//]: # (Why should this feature be implemented?)
-
-
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-
+Why should this feature be implemented?
diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
deleted file mode 100644
index 572652373..000000000
--- a/.github/ISSUE_TEMPLATE/improvement.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Improvement Suggestion
-about: Let us know how we could improve
----
-
-## Description
-
-[//]: # (What's it you're proposing? How should it be implemented?)
-
-
-
-
-## Rationale
-
-[//]: # (Why should this feature be implemented?)
-
-
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-
diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md
index d565e564f..e553329f6 100644
--- a/.github/ISSUE_TEMPLATE/paid-support.md
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -1,10 +1,16 @@
---
name: Paid Support Request
about: Ask Core Team members to help you out
+title: ''
+labels: ''
+assignees: ''
+
---
-Provided your question goes beyound [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
+Provided your question goes beyond [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
* Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
* Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+
+* Bruno Alla, Core Developer ([GitHub](https://github.com/sponsors/browniebroke)).
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 0c0f3d891..f24e413f1 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,6 +1,12 @@
---
name: Question
-about: Please, ask your question on StackOverflow or Gitter
+about: Please consider asking your question on StackOverflow or Slack
+title: '[question]'
+labels: question
---
-First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`. Finally, feel free to join [Gitter](https://gitter.im/pydanny/cookiecutter-django) and ask around.
+First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/).
+
+If that doesn't help, post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you might get more visibility there than on our issue tracker.
+
+Finally, feel free to join [Slack](https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U) and ask around.
diff --git a/.github/ISSUE_TEMPLATE/regression.md b/.github/ISSUE_TEMPLATE/regression.md
deleted file mode 100644
index 80384004b..000000000
--- a/.github/ISSUE_TEMPLATE/regression.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Regression Report
-about: Let us know if something that'd been working has broke
----
-
-## What happened before?
-
-
-
-
-## What happens now?
-
-
-
-
-## Last stable commit / Since when?
-
-
-
-
-## Steps to reproduce
-
-[//]: # (Any or all of the following:)
-[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
-[//]: # (* Project generation options)
-[//]: # (* Logs)
-
-
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 45e67c69b..5559e62ff 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +1,18 @@
-[//]: # (Thank you for helping us out: your efforts mean great deal to the project and the community as a whole!)
-
-[//]: # (Before you proceed:)
-
-[//]: # (- Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)
-[//]: # (- If you're adding a new option, please make sure that tests/test_cookiecutter_generation.py is updated accordingly)
+
## Description
-[//]: # (What's it you're proposing?)
+
+Checklist:
+
+- [ ] I've made sure that `tests/test_cookiecutter_generation.py` is updated accordingly (especially if adding or updating a template option)
+- [ ] I've updated the documentation or confirm that my change doesn't require any updates
## Rationale
-[//]: # (Why does the project need that?)
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-
+
diff --git a/cookiecutter.json b/cookiecutter.json
index ca11b3b47..682061476 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -59,6 +59,5 @@
"Gitlab"
],
"keep_local_envs_in_vcs": "y",
-
"debug": "n"
}
From 996b958feb319921de75210876ee30771b6b261b Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 9 Sep 2020 14:25:12 +0200
Subject: [PATCH 185/228] Configure Dependabot to update Github actions
---
.github/dependabot.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 .github/dependabot.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..5ee5d0a04
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+# Config for Dependabot updates. See Documentation here:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ # Update Github actions in workflows
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
From 684218a90807d2997b1d25c677349cac72ac1079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Sep 2020 12:25:44 +0000
Subject: [PATCH 186/228] Update actions/setup-python requirement to v2.1.2
Updates the requirements on [actions/setup-python](https://github.com/actions/setup-python) to permit the latest version.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/commits/24156c231c5e9d581bde27d0cdbb72715060ea51)
Signed-off-by: dependabot[bot]
---
.github/workflows/pre-commit-autoupdate.yml | 2 +-
.github/workflows/update-changelog.yml | 2 +-
.github/workflows/update-contributors.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 4beaa578f..f07d18033 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.1.1
+ - uses: actions/setup-python@v2.1.2
with:
python-version: 3.8
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 562c37eb9..ac8f749e5 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.1.2
with:
python-version: "3.8"
- name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index acae4729d..6dd2ac529 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.1.2
with:
python-version: "3.8"
- name: Install dependencies
From 8df38802f35afb2201b4db32c04b7c60e176e782 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 9 Sep 2020 15:41:47 -0700
Subject: [PATCH 187/228] Update sentry-sdk from 0.17.3 to 0.17.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 8016786cf..4ed494349 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.3 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.4 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.1.0 # https://github.com/redis/hiredis-py
From a3ed42a28968f243ef42962b709414dae676ab3f Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Thu, 10 Sep 2020 02:16:26 +0000
Subject: [PATCH 188/228] Update Changelog
---
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd8b927d1..a3a25226a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-09]
+### Changed
+- Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804))
+- Clean up nested venv files from `.gitignore` ([#2800](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2800))
+
## [2020-09-08]
### Changed
- Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))
From ca4bbd918d8c0249b2ba68aff17ac8038f924863 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 9 Sep 2020 23:58:50 -0700
Subject: [PATCH 189/228] Update isort from 5.5.1 to 5.5.2
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 7ecdd4d0a..3f110e519 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==20.8b1
-isort==5.5.1
+isort==5.5.2
flake8==3.8.3
flake8-isort==4.0.0
From 806080e53eeb33ecd82cb7e890ecfb94fbc52f25 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:24:40 +0000
Subject: [PATCH 190/228] 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 74839c2c0..398ccbf81 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.5.1
+ rev: 5.5.2
hooks:
- id: isort
From 625c7ceb7311a5acb173df82af3668ba834b034c Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 11 Sep 2020 10:55:38 +0100
Subject: [PATCH 191/228] Fix git-auto-commit-action
---
.github/workflows/update-changelog.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index ac8f749e5..ef9263f31 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
+ uses: stefanzweifel/git-auto-commit-action@v4.5.1
with:
commit_message: Update Changelog
file_pattern: CHANGELOG.md
From 7ef9f919e201a891040a1b6d788852020541b3b5 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Fri, 11 Sep 2020 10:56:03 +0100
Subject: [PATCH 192/228] Update update-contributors.yml
---
.github/workflows/update-contributors.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 6dd2ac529..ba7fd74bc 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
+ uses: stefanzweifel/git-auto-commit-action@v4.5.1
with:
commit_message: Update Contributors
file_pattern: CONTRIBUTORS.md .github/contributors.json
From 4f631e148388d12d95ef567dcb56d529fee26c63 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Fri, 11 Sep 2020 09:58:15 +0000
Subject: [PATCH 193/228] Update Changelog
---
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3a25226a..7855d1676 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-10]
+### Updated
+- Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807))
+- Update sentry-sdk to 0.17.4 ([#2805](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2805))
+
## [2020-09-09]
### Changed
- Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804))
From e1922807aacd0dee853fdac389e5558b5cfa92d3 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury
Date: Fri, 11 Sep 2020 21:47:00 +0530
Subject: [PATCH 194/228] Updating Traefik version from 2.0 to 2.2.11
---
.../compose/production/traefik/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 26a653d50..aa879052b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.0
+FROM traefik:v2.2.11
RUN mkdir -p /etc/traefik/acme \
&& touch /etc/traefik/acme/acme.json \
&& chmod 600 /etc/traefik/acme/acme.json
From 13ca7bf4a4ea91afcc70021e94170091cd8bdcbc Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:42 -0700
Subject: [PATCH 195/228] Update django-anymail from 7.2.1 to 8.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 4ed494349..047661cdb 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages
django-storages[google]==1.10 # https://github.com/jschneier/django-storages
{%- endif %}
{%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Amazon SES' %}
django-anymail[amazon_ses]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mailjet' %}
From 11d089c859d11798ee5657870faad417cf6e90ce Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:43 -0700
Subject: [PATCH 196/228] Update django-anymail from 7.2.1 to 8.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 047661cdb..0c46da1d9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.10 # https://github.com/jschneier/django-storages
{%- if cookiecutter.mail_service == 'Mailgun' %}
django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mailjet' %}
django-anymail[mailjet]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mandrill' %}
From 8cddc2f740812c1837b07ece95e21319f14c565b Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:44 -0700
Subject: [PATCH 197/228] Update django-anymail from 7.2.1 to 8.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 0c46da1d9..e8e57d945 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Amazon SES' %}
django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mandrill' %}
django-anymail[mandrill]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Postmark' %}
From e5c2f82949effe5719ebab00f42c7c13f9bf32db Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:45 -0700
Subject: [PATCH 198/228] Update django-anymail from 7.2.1 to 8.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 e8e57d945..d507b1255 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mailjet' %}
django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Postmark' %}
django-anymail[postmark]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Sendgrid' %}
From 99c9b043199c8cbc0d8de0829685170f6464403e Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:45 -0700
Subject: [PATCH 199/228] Update django-anymail from 7.2.1 to 8.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 d507b1255..2c92ad99b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Mandrill' %}
django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Sendgrid' %}
django-anymail[sendgrid]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SendinBlue' %}
From e591022c6f3daa6207f36c95588bf1dd1bd6a8a5 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:46 -0700
Subject: [PATCH 200/228] Update django-anymail from 7.2.1 to 8.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 2c92ad99b..cfdf7dff1 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Postmark' %}
django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SendinBlue' %}
django-anymail[sendinblue]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SparkPost' %}
From 8241615edd35f09dd0b426f07964ffdc80c22001 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:47 -0700
Subject: [PATCH 201/228] Update django-anymail from 7.2.1 to 8.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 cfdf7dff1..83f8fdf62 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Sendgrid' %}
django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SparkPost' %}
django-anymail[sparkpost]==7.2.1 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Other SMTP' %}
From bc0805549b540c0484b2a0731fbb1c1ba110da13 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:48 -0700
Subject: [PATCH 202/228] Update django-anymail from 7.2.1 to 8.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 83f8fdf62..b5342b526 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SendinBlue' %}
django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Other SMTP' %}
django-anymail==7.2.1 # https://github.com/anymail/django-anymail
{%- endif %}
From 192ca300af8f052fa3a21dadcbb15761e351ec79 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 15:59:49 -0700
Subject: [PATCH 203/228] Update django-anymail from 7.2.1 to 8.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 b5342b526..ced72c2f6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'SparkPost' %}
django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail
{%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==7.2.1 # https://github.com/anymail/django-anymail
+django-anymail==8.0 # https://github.com/anymail/django-anymail
{%- endif %}
From 33eca9d121479db0e3ea4a8795e745f848be9c3e Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Sat, 12 Sep 2020 02:16:10 +0000
Subject: [PATCH 204/228] Update Changelog
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7855d1676..db5a2d9c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-11]
+### Updated
+- Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809))
+
## [2020-09-10]
### Updated
- Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807))
From c7ee1e7c03ebb59a8833d9fd26ec0d97b5acccb7 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 19:16:16 -0700
Subject: [PATCH 205/228] Update pytest from 6.0.1 to 6.0.2
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 3f110e519..f645e14d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
# Testing
# ------------------------------------------------------------------------------
tox==3.20.0
-pytest==6.0.1
+pytest==6.0.2
pytest-cookies==0.5.1
pytest-instafail==0.4.2
pyyaml==5.3.1
From 12cc96817de8208f8ad778428c1e05a577c7ed15 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Fri, 11 Sep 2020 19:16:17 -0700
Subject: [PATCH 206/228] Update pytest from 6.0.1 to 6.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 cc751326f..e5eb6c67c 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.770 # https://github.com/python/mypy
django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs
-pytest==6.0.1 # https://github.com/pytest-dev/pytest
+pytest==6.0.2 # https://github.com/pytest-dev/pytest
pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
# Documentation
From 62c3f5fd5d8d97686dba27d5a8afe7e368f2d02e Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Sun, 13 Sep 2020 02:16:38 +0000
Subject: [PATCH 207/228] Update Changelog
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db5a2d9c1..1b32d6d68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-12]
+### Updated
+- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814))
+- Update pytest to 6.0.2 ([#2819](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2819))
+- Update django-anymail to 8.0 ([#2818](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2818))
+
## [2020-09-11]
### Updated
- Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809))
From a6b88a9370a0707efb82a0e636f04e5c6f86c4a1 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 14 Sep 2020 01:40:32 -0700
Subject: [PATCH 208/228] Update django-storages from 1.10 to 1.10.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 ced72c2f6..3ee5e7619 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py
# Django
# ------------------------------------------------------------------------------
{%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages
{%- elif cookiecutter.cloud_provider == 'GCP' %}
django-storages[google]==1.10 # https://github.com/jschneier/django-storages
{%- endif %}
From 8b4c87fd12cd2de4fdf5d5a4ae252eb3e6d1af2e Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 14 Sep 2020 01:40:33 -0700
Subject: [PATCH 209/228] Update django-storages from 1.10 to 1.10.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 3ee5e7619..c6dc2e17c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py
{%- if cookiecutter.cloud_provider == 'AWS' %}
django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages
{%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.10 # https://github.com/jschneier/django-storages
+django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages
{%- endif %}
{%- if cookiecutter.mail_service == 'Mailgun' %}
django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail
From f1600ef17ba04523e82bf514b2e47cebed4a06ee Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 14 Sep 2020 01:40:37 -0700
Subject: [PATCH 210/228] Update coverage from 5.2.1 to 5.3
---
{{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index e5eb6c67c..9a475e7f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
# ------------------------------------------------------------------------------
flake8==3.8.3 # https://github.com/PyCQA/flake8
flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort
-coverage==5.2.1 # https://github.com/nedbat/coveragepy
+coverage==5.3 # https://github.com/nedbat/coveragepy
black==20.8b1 # https://github.com/ambv/black
pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django
{%- if cookiecutter.use_celery == 'y' %}
From 584267d8a4f1674acf8afbe01cd3ea8049f96082 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 14 Sep 2020 08:03:16 -0700
Subject: [PATCH 211/228] Update sentry-sdk from 0.17.4 to 0.17.5
---
{{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index c6dc2e17c..855a8e290 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.4 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.5 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==1.1.0 # https://github.com/redis/hiredis-py
From b76d8d4f025590c1ddfb2a4506a932e92c5357f6 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Mon, 17 Aug 2020 14:20:00 +0100
Subject: [PATCH 212/228] Revert Celery to 4.4.6
It looks like 4.4.7 has some issues with Redis broker:
https://github.com/celery/celery/issues/6285
---
{{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 1c496a256..c858b7339 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==3.5.3 # https://github.com/andymccurdy/redis-py
hiredis==1.1.0 # https://github.com/redis/hiredis-py
{%- endif %}
{%- if cookiecutter.use_celery == "y" %}
-celery==4.4.7 # pyup: < 5.0 # https://github.com/celery/celery
+celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery
django-celery-beat==2.0.0 # https://github.com/celery/django-celery-beat
{%- if cookiecutter.use_docker == 'y' %}
flower==0.9.5 # https://github.com/mher/flower
From ec3922cfe6a4c58f98d3a547207d7993e5ab5ff2 Mon Sep 17 00:00:00 2001
From: Daniel Feldroy
Date: Mon, 14 Sep 2020 11:36:47 -0700
Subject: [PATCH 213/228] Give admin_forms the forms namespace
This will make extending various signup and registration forms easier.
---
.../{{cookiecutter.project_slug}}/users/forms.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index ba848b858..d2170bb32 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,22 +1,23 @@
-from django.contrib.auth import forms, get_user_model
+from django.contrib.auth import get_user_model
+from django.contrib.auth import forms as admin_forms
from django.core.exceptions import ValidationError
from django.utils.translation import gettext_lazy as _
User = get_user_model()
-class UserChangeForm(forms.UserChangeForm):
- class Meta(forms.UserChangeForm.Meta):
+class UserChangeForm(admin_forms.UserChangeForm):
+ class Meta(admin_forms.UserChangeForm.Meta):
model = User
-class UserCreationForm(forms.UserCreationForm):
+class UserCreationForm(admin_forms.UserCreationForm):
- error_message = forms.UserCreationForm.error_messages.update(
+ error_message = admin_forms.UserCreationForm.error_messages.update(
{"duplicate_username": _("This username has already been taken.")}
)
- class Meta(forms.UserCreationForm.Meta):
+ class Meta(admin_forms.UserCreationForm.Meta):
model = User
def clean_username(self):
From 5950f4ebe21c119705974658817169fb44d7495e Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Tue, 15 Sep 2020 02:16:59 +0000
Subject: [PATCH 214/228] Update Changelog
---
CHANGELOG.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b32d6d68..460e463e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-14]
+### Fixed
+- Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829))
+### Updated
+- Update sentry-sdk to 0.17.5 ([#2828](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2828))
+- Update coverage to 5.3 ([#2826](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2826))
+- Update django-storages to 1.10.1 ([#2825](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2825))
+
## [2020-09-12]
### Updated
- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814))
From a2c4453cf56adba84471875d1b08bb0cb77d7002 Mon Sep 17 00:00:00 2001
From: Bruno Alla
Date: Wed, 16 Sep 2020 09:39:02 +0100
Subject: [PATCH 215/228] Fix isort errors
---
.../{{cookiecutter.project_slug}}/users/forms.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index d2170bb32..7d3a296bc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,5 +1,5 @@
-from django.contrib.auth import get_user_model
from django.contrib.auth import forms as admin_forms
+from django.contrib.auth import get_user_model
from django.core.exceptions import ValidationError
from django.utils.translation import gettext_lazy as _
From fa85682910419511f28827747f872a18956d26c2 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 16 Sep 2020 04:28:56 -0700
Subject: [PATCH 216/228] Update pytest-django from 3.9.0 to 3.10.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 9a475e7f8..f2f87b381 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
django-extensions==3.0.8 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django
+pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django
From c06869367d8e935c9c38b420afa6cd064d45ef1f Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Wed, 16 Sep 2020 04:29:06 -0700
Subject: [PATCH 217/228] Update sentry-sdk from 0.17.5 to 0.17.6
---
{{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 855a8e290..06731b0b2 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.5 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.6 # 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 d0ef737234b4c9427f71f88f399cf3c20d6a3c77 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Thu, 17 Sep 2020 02:16:54 +0000
Subject: [PATCH 218/228] Update Changelog
---
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 460e463e4..b2c3e1e4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-16]
+### Updated
+- Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833))
+- Update pytest-django to 3.10.0 ([#2832](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2832))
+
## [2020-09-14]
### Fixed
- Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829))
From ade8aede4745c34d5650f833ba30d671c21972fa Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Thu, 17 Sep 2020 15:04:31 -0700
Subject: [PATCH 219/228] Update django-extensions from 3.0.8 to 3.0.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 f2f87b381..6536f7f34 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.8 # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django
From 9851fbed6b955553b3e3b7c721de4dad8b0d729c Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Sat, 19 Sep 2020 02:16:52 +0000
Subject: [PATCH 220/228] Update Changelog
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2c3e1e4c..027408d68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-18]
+### Updated
+- Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839))
+
## [2020-09-16]
### Updated
- Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833))
From 859766941d44b4d31332f3f4436d4d040adeb733 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Sun, 20 Sep 2020 12:27:04 -0700
Subject: [PATCH 221/228] Update django-debug-toolbar from 2.2 to 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 6536f7f34..0ac958899 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
# ------------------------------------------------------------------------------
factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
-django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.0 # https://github.com/jazzband/django-debug-toolbar
django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django
From 561e9744bfd0ae00688a5a6a383dbb3e9ee37385 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Sep 2020 00:26:05 +0000
Subject: [PATCH 222/228] 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 398ccbf81..d995d5aa3 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.5.2
+ rev: 5.5.3
hooks:
- id: isort
From 4f0363acfc86159b7abe9f3a7ad1ec3027d5ad34 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Sun, 20 Sep 2020 17:26:14 -0700
Subject: [PATCH 223/228] Update isort from 5.5.2 to 5.5.3
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index f645e14d6..717b98263 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
black==20.8b1
-isort==5.5.2
+isort==5.5.3
flake8==3.8.3
flake8-isort==4.0.0
From b064e09f12cf6b0bd3e54d560eb2eb0227aa86ff Mon Sep 17 00:00:00 2001
From: Arnav Choudhury
Date: Mon, 21 Sep 2020 15:50:24 +0530
Subject: [PATCH 224/228] Adding GitHub-Action CI Option (#2837)
---
cookiecutter.json | 3 +-
docs/project-generation-options.rst | 2 +
hooks/post_gen_project.py | 7 ++
tests/test_bare.sh | 2 +-
tests/test_cookiecutter_generation.py | 38 ++++++++
.../.github/dependabot.yml | 7 ++
.../.github/workflows/ci.yml | 95 +++++++++++++++++++
7 files changed, 152 insertions(+), 2 deletions(-)
create mode 100644 {{cookiecutter.project_slug}}/.github/dependabot.yml
create mode 100644 {{cookiecutter.project_slug}}/.github/workflows/ci.yml
diff --git a/cookiecutter.json b/cookiecutter.json
index 682061476..4a580036d 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -56,7 +56,8 @@
"ci_tool": [
"None",
"Travis",
- "Gitlab"
+ "Gitlab",
+ "Github"
],
"keep_local_envs_in_vcs": "y",
"debug": "n"
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index ec52e2183..8a81e19de 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -119,6 +119,7 @@ ci_tool:
1. None
2. `Travis CI`_
3. `Gitlab CI`_
+ 4. `Github Actions`_
keep_local_envs_in_vcs:
Indicates whether the project's ``.envs/.local/`` should be kept in VCS
@@ -176,3 +177,4 @@ debug:
.. _GitLab CI: https://docs.gitlab.com/ee/ci/
+.. _Github Actions: https://docs.github.com/en/actions
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index fae73e110..ede14c324 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -123,6 +123,10 @@ def remove_dotgitlabciyml_file():
os.remove(".gitlab-ci.yml")
+def remove_dotgithub_folder():
+ shutil.rmtree(".github")
+
+
def append_to_project_gitignore(path):
gitignore_file_path = ".gitignore"
with open(gitignore_file_path, "a") as gitignore_file:
@@ -395,6 +399,9 @@ def main():
if "{{ cookiecutter.ci_tool }}".lower() != "gitlab":
remove_dotgitlabciyml_file()
+ if "{{ cookiecutter.ci_tool }}".lower() != "github":
+ remove_dotgithub_folder()
+
if "{{ cookiecutter.use_drf }}".lower() == "n":
remove_drf_starter_files()
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 28f9b7bfb..cc1f1c36e 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# this is a very simple script that tests the docker configuration for cookiecutter-django
# it is meant to be run from the root directory of the repository, eg:
-# sh tests/test_docker.sh
+# sh tests/test_bare.sh
set -o errexit
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index f9bfcd539..af6e4588b 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -96,6 +96,7 @@ SUPPORTED_COMBINATIONS = [
{"ci_tool": "None"},
{"ci_tool": "Travis"},
{"ci_tool": "Gitlab"},
+ {"ci_tool": "Github"},
{"keep_local_envs_in_vcs": "y"},
{"keep_local_envs_in_vcs": "n"},
{"debug": "y"},
@@ -138,6 +139,7 @@ def check_paths(paths):
@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
def test_project_generation(cookies, context, context_override):
"""Test that project is generated and fully rendered."""
+
result = cookies.bake(extra_context={**context, **context_override})
assert result.exit_code == 0
assert result.exception is None
@@ -225,6 +227,42 @@ def test_gitlab_invokes_flake8_and_pytest(
pytest.fail(e)
+@pytest.mark.parametrize(
+ ["use_docker", "expected_test_script"],
+ [
+ ("n", "pytest"),
+ ("y", "docker-compose -f local.yml exec -T django pytest"),
+ ],
+)
+def test_github_invokes_flake8_and_pytest(
+ cookies, context, use_docker, expected_test_script
+):
+ context.update({"ci_tool": "Github", "use_docker": use_docker})
+ result = cookies.bake(extra_context=context)
+
+ assert result.exit_code == 0
+ assert result.exception is None
+ assert result.project.basename == context["project_slug"]
+ assert result.project.isdir()
+
+ with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml:
+ try:
+ github_config = yaml.safe_load(github_yml)
+ flake8_present = False
+ for action_step in github_config["jobs"]["flake8"]["steps"]:
+ if action_step.get("run") == "flake8":
+ flake8_present = True
+ assert flake8_present
+
+ expected_test_script_present = False
+ for action_step in github_config["jobs"]["pytest"]["steps"]:
+ if action_step.get("run") == expected_test_script:
+ expected_test_script_present = True
+ assert expected_test_script_present
+ except yaml.YAMLError as e:
+ pytest.fail(e)
+
+
@pytest.mark.parametrize("slug", ["project slug", "Project_Slug"])
def test_invalid_slug(cookies, context, slug):
"""Invalid slug should failed pre-generation hook."""
diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
new file mode 100644
index 000000000..8e8ac8663
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+ # Update Github actions in workflows
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
new file mode 100644
index 000000000..52818e187
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -0,0 +1,95 @@
+name: CI
+
+# Enable Buildkit and let compose use it to speed up image building
+env:
+ DOCKER_BUILDKIT: 1
+ COMPOSE_DOCKER_CLI_BUILD: 1
+
+on:
+ pull_request:
+ branches: [ "master" ]
+ paths-ignore: [ "docs/**" ]
+
+ push:
+ branches: [ "master" ]
+ paths-ignore: [ "docs/**" ]
+
+
+jobs:
+ flake8:
+ runs-on: ubuntu-latest
+ steps:
+
+ - name: Checkout Code Repository
+ uses: actions/checkout@v2
+
+ - name: Set up Python 3.8
+ uses: actions/setup-python@v2
+ with:
+ python-version: 3.8
+
+ - name: Install flake8
+ run: |
+ python -m pip install --upgrade pip
+ pip install flake8
+
+ - name: Lint with flake8
+ run: flake8
+
+# With no caching at all the entire ci process takes 4m 30s to complete!
+ pytest:
+ runs-on: ubuntu-latest
+ steps:
+
+ - name: Checkout Code Repository
+ uses: actions/checkout@v2
+ {% if cookiecutter.use_docker == 'y' -%}
+
+ - name: Build the Stack
+ run: docker-compose -f local.yml build
+
+ - name: Make DB Migrations
+ run: docker-compose -f local.yml run --rm django python manage.py migrate
+
+ - name: Run the Stack
+ run: docker-compose -f local.yml up -d
+
+ - name: Run Django Tests
+ run: docker-compose -f local.yml exec -T django pytest
+
+ - name: Tear down the Stack
+ run: docker-compose down
+
+ {%- else %}
+
+ - name: Set up Python 3.8
+ uses: actions/setup-python@v2
+ with:
+ python-version: 3.8
+
+ - name: Get pip cache dir
+ id: pip-cache-location
+ run: |
+ echo "::set-output name=dir::$(pip cache dir)"
+
+ {% raw %}
+ - name: Cache pip Project Dependencies
+ uses: actions/cache@v2
+ with:
+ # Get the location of pip cache dir
+ path: ${{ steps.pip-cache-location.outputs.dir }}
+ # Look to see if there is a cache hit for the corresponding requirements file
+ key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }}
+ restore-keys: |
+ ${{ runner.os }}-pip-
+ {% endraw %}
+
+ - name: Install Dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install -r requirements/local.txt
+
+ - name: Test with pytest
+ run: pytest
+
+ {%- endif %}
From e715b8f43dc6a1daef594bbdefeac48ca7f01c3e Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Mon, 21 Sep 2020 14:13:08 -0700
Subject: [PATCH 225/228] Update django-debug-toolbar from 3.0 to 3.1
---
{{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0ac958899..423ac3742 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit
# ------------------------------------------------------------------------------
factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy
-django-debug-toolbar==3.0 # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.1 # https://github.com/jazzband/django-debug-toolbar
django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django
From c567793453cc28f69ac3e07655ea2b4e2dfc080b Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Tue, 22 Sep 2020 02:17:28 +0000
Subject: [PATCH 226/228] Update Changelog
---
CHANGELOG.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 027408d68..9feac1399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-21]
+### Changed
+- Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837))
+### Updated
+- Update django-debug-toolbar to 3.0 ([#2842](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2842))
+- Auto-update pre-commit hooks ([#2843](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2843))
+- Update isort to 5.5.3 ([#2844](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2844))
+
## [2020-09-18]
### Updated
- Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839))
From 762f3b3ae2526bfc8ad92413c4a14885ecf005d6 Mon Sep 17 00:00:00 2001
From: pyup-bot
Date: Tue, 22 Sep 2020 02:49:28 -0700
Subject: [PATCH 227/228] Update sentry-sdk from 0.17.6 to 0.17.7
---
{{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 06731b0b2..07ff0c523 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6 # https://github.com/psycopg/psycopg2
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.6 # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.7 # 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 1e924fac1696be524f3e1b3a11e9358199c8c543 Mon Sep 17 00:00:00 2001
From: browniebroke
Date: Thu, 24 Sep 2020 02:17:40 +0000
Subject: [PATCH 228/228] Update Changelog
---
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9feac1399..8efd5341a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## [2020-09-23]
+### Updated
+- Update sentry-sdk to 0.17.7 ([#2847](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2847))
+- Update django-debug-toolbar to 3.1 ([#2846](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2846))
+
## [2020-09-21]
### Changed
- Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837))
|