From 4d6292a5d331288ae9a753296c6897bd54cd43ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 07:48:18 +0000 Subject: [PATCH 1/9] Auto-update pre-commit hooks (#4683) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a302a6664..c01710499 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.3" + rev: "v3.1.0" hooks: - id: prettier args: ["--tab-width", "2"] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index dfff5e696..3601ebce4 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v3.1.0 hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] From a0fe329c4ece878d7f18c7e5ff05e2a4cb88d6f6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 14 Nov 2023 02:48:49 -0500 Subject: [PATCH 2/9] Update sentry-sdk from 1.34.0 to 1.35.0 (#4681) --- {{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 40e6df006..31471e492 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.12 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.34.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.35.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From be37a588b80894d3e2fe6c1eb46b5a07d198e2f9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 15 Nov 2023 02:15:01 +0000 Subject: [PATCH 3/9] Release 2023.11.14 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9405e5444..b96678417 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.11.14 + + +### Updated + +- Update sentry-sdk to 1.35.0 ([#4681](https://github.com/cookiecutter/cookiecutter-django/pull/4681)) + +- Auto-update pre-commit hooks ([#4683](https://github.com/cookiecutter/cookiecutter-django/pull/4683)) + ## 2023.11.11 diff --git a/setup.py b/setup.py index 658cbb69b..47659a8a3 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.11.11" +version = "2023.11.14" with open("README.md") as readme_file: long_description = readme_file.read() From 552153065b3fa5ed1881fc98ed55e03523c4e45f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 20 Nov 2023 07:26:15 -0500 Subject: [PATCH 4/9] Update psycopg to 3.1.13 (#4685) * Update psycopg from 3.1.12 to 3.1.13 * Update psycopg from 3.1.12 to 3.1.13 * Update psycopg from 3.1.12 to 3.1.13 --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 65f7fbdc7..78ffc43d7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,9 +3,9 @@ Werkzeug[watchdog]==3.0.1 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg[c]==3.1.12 # https://github.com/psycopg/psycopg +psycopg[c]==3.1.13 # https://github.com/psycopg/psycopg {%- else %} -psycopg[binary]==3.1.12 # https://github.com/psycopg/psycopg +psycopg[binary]==3.1.13 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 31471e492..2a17f253e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==21.2.0 # https://github.com/benoitc/gunicorn -psycopg[c]==3.1.12 # https://github.com/psycopg/psycopg +psycopg[c]==3.1.13 # https://github.com/psycopg/psycopg {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From a67956c6e0cd24f19b6e594cae0e54679f6403ca Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 20 Nov 2023 07:27:07 -0500 Subject: [PATCH 5/9] Update pytest-xdist to 3.4.0 (#4680) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0e2c84421..67553f687 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ pre-commit==3.5.0 # ------------------------------------------------------------------------------ tox==4.11.3 pytest==7.4.3 -pytest-xdist==3.3.1 +pytest-xdist==3.4.0 pytest-cookies==0.7.0 pytest-instafail==0.5.0 pyyaml==6.0.1 From befc57134242415c533de1e7d943f7ea7390568b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 20 Nov 2023 07:28:03 -0500 Subject: [PATCH 6/9] Update django-cors-headers to 4.3.1 (#4684) --- {{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 f8129e7fc..3c1694ba9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,7 +41,7 @@ django-redis==5.4.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} # Django REST Framework djangorestframework==3.14.0 # https://github.com/encode/django-rest-framework -django-cors-headers==4.3.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==4.3.1 # https://github.com/adamchainz/django-cors-headers # DRF-spectacular for api documentation drf-spectacular==0.26.5 # https://github.com/tfranzel/drf-spectacular {%- endif %} From 6dea9412589228193aa41d7787744080e14cb26c Mon Sep 17 00:00:00 2001 From: Christian Jauvin Date: Mon, 20 Nov 2023 07:45:20 -0500 Subject: [PATCH 7/9] Fix bug with social account adapter name override, in very specific conditions (#4650) * Fix bug with social account adapter in specific condition * Slight refactoring of fix --- .../users/adapters.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py index c5c824bda..874ad61d9 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py @@ -27,11 +27,12 @@ class SocialAccountAdapter(DefaultSocialAccountAdapter): See: https://django-allauth.readthedocs.io/en/latest/advanced.html?#creating-and-populating-user-instances """ - user = sociallogin.user - if name := data.get("name"): - user.name = name - elif first_name := data.get("first_name"): - user.name = first_name - if last_name := data.get("last_name"): - user.name += f" {last_name}" - return super().populate_user(request, sociallogin, data) + user = super().populate_user(request, sociallogin, data) + if not user.name: + if name := data.get("name"): + user.name = name + elif first_name := data.get("first_name"): + user.name = first_name + if last_name := data.get("last_name"): + user.name += f" {last_name}" + return user From a405d2bbcfd22980ac8a602dd4b0f414fb2490cb Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 20 Nov 2023 12:45:57 +0000 Subject: [PATCH 8/9] 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 7a029c764..013d2c99d 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1473,5 +1473,10 @@ "name": "Jakub Boukal", "github_login": "SukiCZ", "twitter_username": "" + }, + { + "name": "Christian Jauvin", + "github_login": "cjauvin", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 070199124..98d8b32f9 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -509,6 +509,13 @@ Listed in alphabetical order. + + Christian Jauvin + + cjauvin + + + Christopher Clarke From 09848e2e87ebcd04f2c846905538892bef03778b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 21 Nov 2023 02:17:13 +0000 Subject: [PATCH 9/9] Release 2023.11.20 --- CHANGELOG.md | 13 +++++++++++++ setup.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b96678417..e7a89380c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.11.20 + + +### Fixed + +- Fix bug with social account adapter name override, in very specific conditions ([#4650](https://github.com/cookiecutter/cookiecutter-django/pull/4650)) + +### Updated + +- Update django-cors-headers to 4.3.1 ([#4684](https://github.com/cookiecutter/cookiecutter-django/pull/4684)) + +- Update psycopg to 3.1.13 ([#4685](https://github.com/cookiecutter/cookiecutter-django/pull/4685)) + ## 2023.11.14 diff --git a/setup.py b/setup.py index 47659a8a3..3266981c7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.11.14" +version = "2023.11.20" with open("README.md") as readme_file: long_description = readme_file.read()