From 09cb960400423d84ddc72dd6153b608e2ef7a395 Mon Sep 17 00:00:00 2001 From: Abdullah Adeel <64294045+mabdullahadeel@users.noreply.github.com> Date: Fri, 21 Jan 2022 17:20:51 +0500 Subject: [PATCH 01/12] mysql support link (#3544) Co-authored-by: Bruno Alla --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 555081316..3f5df1f01 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ production-ready Django projects quickly. ## Constraints - Only maintained 3rd party libraries are used. -- Uses PostgreSQL everywhere (10.19 - 14.1) +- Uses PostgreSQL everywhere: 10.19 - 14.1 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available). - Environment variables for configuration (This won't work with Apache/mod_wsgi). ## Support this Project! @@ -203,6 +203,10 @@ If you are using [PyUp](https://pyup.io) to keep your dependencies updated and s Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project. +## For MySQL users +To get full MySQL support in addition to the default Postgresql, you can use this fork of the cookiecutter-django: +https://github.com/mabdullahadeel/cookiecutter-django-mysql + ## Releases Need a stable release? You can find them at From be13fbc02ca10d8f7a674186aae1cfa862021907 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 21 Jan 2022 12:21:25 +0000 Subject: [PATCH 02/12] 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 86ccf42a6..fba6ad11b 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1222,5 +1222,10 @@ "name": "Vikas Yadav", "github_login": "vik-y", "twitter_username": "" + }, + { + "name": "Abdullah Adeel", + "github_login": "mabdullahadeel", + "twitter_username": "abdadeel_" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4d1a505a9..e2668ce0c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -131,6 +131,13 @@ Listed in alphabetical order. Qoyyuum + + Abdullah Adeel + + mabdullahadeel + + abdadeel_ + Adam Bogdał From de8ba098553e212f4d5a36f2c0f842949ca51a89 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 21 Jan 2022 07:55:17 -0500 Subject: [PATCH 03/12] Update django-anymail to 8.5 (#3542) --- .../requirements/production.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 859af6049..ec55e2486 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -22,21 +22,21 @@ django-storages[boto3]==1.12.3 # https://github.com/jschneier/django-storages django-storages[google]==1.12.3 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==8.4 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==8.4 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==8.4 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==8.4 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==8.4 # https://github.com/anymail/django-anymail +django-anymail[postmark]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==8.4 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==8.4 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==8.4 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==8.5 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==8.4 # https://github.com/anymail/django-anymail +django-anymail==8.5 # https://github.com/anymail/django-anymail {%- endif %} From 647b86ac898c5d84f886f78b7cdb1fa1738428ba Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 21 Jan 2022 07:55:45 -0500 Subject: [PATCH 04/12] Update sentry-sdk to 1.5.3 (#3543) --- {{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 ec55e2486..dc1ee8b5f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.5.2 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.3 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py From 3014c046b2a216496f2cf874cacf7bac0ce563c2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 Jan 2022 02:14:15 +0000 Subject: [PATCH 05/12] Release 2022.01.21 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9614f0eed..2c425280f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.01.21 + +### Changed +- mysql support link ([#3544](https://github.com/cookiecutter/cookiecutter-django/pull/3544)) +### Updated +- Update sentry-sdk to 1.5.3 ([#3543](https://github.com/cookiecutter/cookiecutter-django/pull/3543)) +- Update django-anymail to 8.5 ([#3542](https://github.com/cookiecutter/cookiecutter-django/pull/3542)) + ## 2022.01.19 ### Changed diff --git a/setup.py b/setup.py index e4d65a2c2..d01f09c28 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.01.19" +version = "2022.01.21" with open("README.rst") as readme_file: long_description = readme_file.read() From 7aa2c4d6db82cef911e2c519e2c67d547f700f8b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Jan 2022 18:04:37 -0500 Subject: [PATCH 06/12] Update uvicorn from 0.17.0 to 0.17.0.post1 (#3547) --- {{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 d9dbb83e3..8e8911df4 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==1.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.17.0 # https://github.com/encode/uvicorn +uvicorn[standard]==0.17.0.post1 # https://github.com/encode/uvicorn {%- endif %} # Django From ec8ecae0e4795839271a315bb6c6345b7fd9bbaa Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Jan 2022 18:05:18 -0500 Subject: [PATCH 07/12] Update django-crispy-forms from 1.13.0 to 1.14.0 (#3548) --- {{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 8e8911df4..cdb5d6dfa 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ django==3.2.11 # pyup: < 4.0 # https://www.djangoproject.com/ django-environ==0.8.1 # https://github.com/joke2k/django-environ django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils django-allauth==0.47.0 # https://github.com/pennersr/django-allauth -django-crispy-forms==1.13.0 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms crispy-bootstrap5==0.6 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.use_compressor == "y" %} django-compressor==3.1 # https://github.com/django-compressor/django-compressor From 27fc2ea1a11329c1d01b04c14c6a7032f168e818 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Jan 2022 18:05:47 -0500 Subject: [PATCH 08/12] Update sentry-sdk from 1.5.3 to 1.5.4 (#3549) --- {{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 dc1ee8b5f..faefd1245 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.5.3 # https://github.com/getsentry/sentry-python +sentry-sdk==1.5.4 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py From ff0521576e9ac70dd5bced59e3b1e22180b336d9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 26 Jan 2022 18:06:34 -0500 Subject: [PATCH 09/12] Update coverage from 6.2 to 6.3 (#3550) --- {{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 12d1e3007..784d02349 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==4.0.1 # https://github.com/PyCQA/flake8 flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort -coverage==6.2 # https://github.com/nedbat/coveragepy +coverage==6.3 # https://github.com/nedbat/coveragepy black==21.12b0 # https://github.com/psf/black pylint-django==2.5.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 9129bf12d0166f2709d3726d88dae93386a89ed2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Jan 2022 02:14:22 +0000 Subject: [PATCH 10/12] Release 2022.01.26 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c425280f..e5c5b8f2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.01.26 + +### Updated +- Update coverage to 6.3 ([#3550](https://github.com/cookiecutter/cookiecutter-django/pull/3550)) +- Update sentry-sdk to 1.5.4 ([#3549](https://github.com/cookiecutter/cookiecutter-django/pull/3549)) +- Update django-crispy-forms to 1.14.0 ([#3548](https://github.com/cookiecutter/cookiecutter-django/pull/3548)) +- Update uvicorn to 0.17.0.post1 ([#3547](https://github.com/cookiecutter/cookiecutter-django/pull/3547)) + ## 2022.01.21 ### Changed diff --git a/setup.py b/setup.py index d01f09c28..970797427 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.01.21" +version = "2022.01.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 83a0e73df1a51a147fdda712ac8e5dcbeae92032 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 27 Jan 2022 15:28:38 -0500 Subject: [PATCH 11/12] Update redis from 4.1.1 to 4.1.2 (#3551) --- {{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 cdb5d6dfa..9c2c9b042 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==5.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.1.1 # https://github.com/redis/redis-py +redis==4.1.2 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.0.0 # https://github.com/redis/hiredis-py {%- endif %} From 5497d1f5962bc1887b6b1334fa30ca75847f6aa5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 28 Jan 2022 02:15:15 +0000 Subject: [PATCH 12/12] Release 2022.01.27 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5c5b8f2e..b2fb058b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2022.01.27 + +### Updated +- Update redis to 4.1.2 ([#3551](https://github.com/cookiecutter/cookiecutter-django/pull/3551)) + ## 2022.01.26 ### Updated diff --git a/setup.py b/setup.py index 970797427..cd7e7e9d4 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2022.01.26" +version = "2022.01.27" with open("README.rst") as readme_file: long_description = readme_file.read()