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 104/162] 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 105/162] 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 106/162] 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 107/162] 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 108/162] 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 109/162] 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 110/162] 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 111/162] 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 112/162] 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 113/162] 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 114/162] 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 115/162] 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 116/162] 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 117/162] 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 118/162] 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 119/162] 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 120/162] 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 121/162] 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 122/162] 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 |
+
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 135/162] 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 136/162] 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 137/162] 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 138/162] 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 139/162] 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 140/162] 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 141/162] 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 142/162] 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 143/162] 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 144/162] 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 145/162] 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 146/162] 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 147/162] 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 148/162] 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 149/162] 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 150/162] 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 151/162] 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 152/162] 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 153/162] 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 154/162] 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 155/162] 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 156/162] 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 157/162] 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 158/162] 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 159/162] 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 160/162] 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 161/162] 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 162/162] 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"
]
}
}
|