From 29a2ef89b23dbe2c648fc175f1fabbb8b5302ee5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 09:19:17 +0100 Subject: [PATCH 01/10] Bump bandit from 1.7.0 to 1.7.1 (#30) Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.0...1.7.1) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7acae09..3d2d648 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Django>=2.2 Wagtail>=2.8 -bandit==1.7.0 +bandit==1.7.1 black==21.10b0 flake8==4.0.1 isort==5.10.1 From 59a8d698589309c96ad97a8c7c14c3aab4303d8c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 00:50:55 +0000 Subject: [PATCH 02/10] Bump actions/setup-python from 2.2.2 to 2.3.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.2.2...v2.3.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1ee3c6..183e3b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - "pydocstyle ." runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 - uses: actions/checkout@v2.4.0 - uses: actions/cache@v2.1.6 with: @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt install -y gettext - - uses: actions/setup-python@v2.2.2 + - uses: actions/setup-python@v2.3.0 - uses: actions/setup-node@v2.4.1 - uses: actions/checkout@v2.4.0 - name: Install Python dependencies @@ -49,7 +49,7 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.3.0 - uses: actions/checkout@v2.4.0 - run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r requirements.txt @@ -67,7 +67,7 @@ jobs: - "3.10" steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.3.0 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel @@ -88,7 +88,7 @@ jobs: python-version: ["3.10"] steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.3.0 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel @@ -122,7 +122,7 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v2.3.0 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7217ce9..2e5bb94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2.3.0 - name: Install Python dependencies run: python -m pip install --upgrade pip setuptools wheel twine - name: Build dist packages From 13aeb06b1e611c8b5a5f582de48bc90a75b500c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Nov 2021 00:54:14 +0000 Subject: [PATCH 03/10] Bump black from 21.10b0 to 21.11b1 Bumps [black](https://github.com/psf/black) from 21.10b0 to 21.11b1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits) --- updated-dependencies: - dependency-name: black dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3d2d648..c457cf0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Django>=2.2 Wagtail>=2.8 bandit==1.7.1 -black==21.10b0 +black==21.11b1 flake8==4.0.1 isort==5.10.1 msgcheck==3.1 From 352d048393683223e768f6a440ffa2b1dc232f96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Nov 2021 08:43:49 +0100 Subject: [PATCH 04/10] Bump actions/cache from 2.1.6 to 2.1.7 (#34) Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 183e3b9..7744022 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/setup-python@v2.3.0 - uses: actions/checkout@v2.4.0 - - uses: actions/cache@v2.1.6 + - uses: actions/cache@v2.1.7 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} From 8c7d72446ecab890fc2a1a4377ba5c5a6c901862 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:37:39 +0100 Subject: [PATCH 05/10] Bump actions/setup-python from 2.3.0 to 2.3.1 (#35) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7744022..ab8b5b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - "pydocstyle ." runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v2.3.0 + - uses: actions/setup-python@v2.3.1 - uses: actions/checkout@v2.4.0 - uses: actions/cache@v2.1.7 with: @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt install -y gettext - - uses: actions/setup-python@v2.3.0 + - uses: actions/setup-python@v2.3.1 - uses: actions/setup-node@v2.4.1 - uses: actions/checkout@v2.4.0 - name: Install Python dependencies @@ -49,7 +49,7 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v2.3.0 + - uses: actions/setup-python@v2.3.1 - uses: actions/checkout@v2.4.0 - run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r requirements.txt @@ -67,7 +67,7 @@ jobs: - "3.10" steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2.3.0 + uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel @@ -88,7 +88,7 @@ jobs: python-version: ["3.10"] steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2.3.0 + uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel @@ -122,7 +122,7 @@ jobs: options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2.3.0 + uses: actions/setup-python@v2.3.1 with: python-version: ${{ matrix.python-version }} - run: python -m pip install --upgrade pip setuptools wheel diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e5bb94..ffad020 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.4.0 - - uses: actions/setup-python@v2.3.0 + - uses: actions/setup-python@v2.3.1 - name: Install Python dependencies run: python -m pip install --upgrade pip setuptools wheel twine - name: Build dist packages From 09e54bbfaefa2a56589aadc373df30f2a77d2ae2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:38:22 +0100 Subject: [PATCH 06/10] Bump actions/setup-node from 2.4.1 to 2.5.0 (#36) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab8b5b9..8648aae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: steps: - run: sudo apt install -y gettext - uses: actions/setup-python@v2.3.1 - - uses: actions/setup-node@v2.4.1 + - uses: actions/setup-node@v2.5.0 - uses: actions/checkout@v2.4.0 - name: Install Python dependencies run: python -m pip install --upgrade pip setuptools wheel twine readme-renderer From 9f75bdd1bbeb25b602cff2aef1f3bd896ad2d1d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 01:07:09 +0000 Subject: [PATCH 07/10] Bump black from 21.11b1 to 21.12b0 Bumps [black](https://github.com/psf/black) from 21.11b1 to 21.12b0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits) --- updated-dependencies: - dependency-name: black dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c457cf0..d296f6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Django>=2.2 Wagtail>=2.8 bandit==1.7.1 -black==21.11b1 +black==21.12b0 flake8==4.0.1 isort==5.10.1 msgcheck==3.1 From 9f33cd6a37f69fa9776d0d8dfca7427228b06b37 Mon Sep 17 00:00:00 2001 From: Rustem Saiargaliev Date: Tue, 30 Nov 2021 08:46:31 +0100 Subject: [PATCH 08/10] CI: use cache provided by setup-python Also, set lts node version --- .github/workflows/ci.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8648aae..90baabc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,12 +22,9 @@ jobs: steps: - uses: actions/setup-python@v2.3.1 - uses: actions/checkout@v2.4.0 - - uses: actions/cache@v2.1.7 with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + cache: 'pip' + cache-dependency-path: 'requirements.txt' - run: python -m pip install -r requirements.txt - run: ${{ matrix.lint-command }} @@ -37,6 +34,8 @@ jobs: - run: sudo apt install -y gettext - uses: actions/setup-python@v2.3.1 - uses: actions/setup-node@v2.5.0 + with: + node-version: 'lts/*' - uses: actions/checkout@v2.4.0 - name: Install Python dependencies run: python -m pip install --upgrade pip setuptools wheel twine readme-renderer @@ -51,6 +50,9 @@ jobs: steps: - uses: actions/setup-python@v2.3.1 - uses: actions/checkout@v2.4.0 + with: + cache: 'pip' + cache-dependency-path: 'requirements.txt' - run: python -m pip install --upgrade pip setuptools wheel - run: python -m pip install -r requirements.txt - run: python setup.py develop From 1d4c8694b624dfc5eb6bd76ea47abe03d25be9b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Dec 2021 00:48:14 +0000 Subject: [PATCH 09/10] Bump actions/setup-node from 2.5.0 to 2.5.1 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90baabc..faff9b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: steps: - run: sudo apt install -y gettext - uses: actions/setup-python@v2.3.1 - - uses: actions/setup-node@v2.5.0 + - uses: actions/setup-node@v2.5.1 with: node-version: 'lts/*' - uses: actions/checkout@v2.4.0 From d5df6a0f65fe74ef5e44af908694aca2b124c9d0 Mon Sep 17 00:00:00 2001 From: Rust Saiargaliev Date: Tue, 11 Jan 2022 10:52:43 +0200 Subject: [PATCH 10/10] Rename `BaseLoginForm.get_context` to avoid clash with Django internals (#40) In Django 4.0 `forms.Form.get_context` was introduced for passing form context in templates. https://docs.djangoproject.com/en/4.0/ref/forms/api/#django.forms.Form.get_context Due to this we have a clash, as django-mail-auth uses function with the same name, but for different purpose: ```python BaseLoginForm.get_context() missing 2 required positional arguments: 'request' and 'user' ``` --- mailauth/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mailauth/forms.py b/mailauth/forms.py index ecdb9b6..d20533f 100644 --- a/mailauth/forms.py +++ b/mailauth/forms.py @@ -42,7 +42,7 @@ def get_token(self, user): """Return the access token.""" return MailAuthBackend.get_token(user=user) - def get_context(self, request, user): + def get_mail_context(self, request, user): """ Return the context for a message template render. @@ -118,7 +118,7 @@ def save(self): """ email = self.cleaned_data[self.field_name] for user in self.get_users(email): - context = self.get_context(self.request, user) + context = self.get_mail_context(self.request, user) self.send_mail(email, context) def send_mail(self, to_email, context):