From 20f154e5e0086959f0edcf9b79786a8bf69694dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 00:52:55 +0000 Subject: [PATCH 01/26] Bump black from 23.10.1 to 23.11.0 Bumps [black](https://github.com/psf/black) from 23.10.1 to 23.11.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.10.1...23.11.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 3ff6511..56e8bc7 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.5 -black==23.10.1 +black==23.11.0 flake8==6.1.0 isort==5.12.0 pydocstyle[toml]==6.3.0 From d80ae090b47649e5709e231f9f0ba5d2564b667d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 00:18:38 +0000 Subject: [PATCH 02/26] Bump isort from 5.12.0 to 5.13.0 Bumps [isort](https://github.com/pycqa/isort) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.12.0...5.13.0) --- updated-dependencies: - dependency-name: isort dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 56e8bc7..b72a2c7 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.5 black==23.11.0 flake8==6.1.0 -isort==5.12.0 +isort==5.13.0 pydocstyle[toml]==6.3.0 From 5b75e78a16595a491f19598c8f6ba83ce54cee9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 00:18:23 +0000 Subject: [PATCH 03/26] Bump bandit from 1.7.5 to 1.7.6 Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.5 to 1.7.6. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.5...1.7.6) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index b72a2c7..91a398c 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,4 +1,4 @@ -bandit==1.7.5 +bandit==1.7.6 black==23.11.0 flake8==6.1.0 isort==5.13.0 From 29bf4b7e9dc287c67dd12bec5d8f5e71ad829e60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 00:27:53 +0000 Subject: [PATCH 04/26] Bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... 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 975c0be..ecf11f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" cache: pip @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - name: Install Python dependencies @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.11" - run: sudo apt install -y python3-enchant @@ -71,7 +71,7 @@ jobs: - "4.2" steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - run: python -m pip install -e '.[test]' @@ -91,7 +91,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - run: python -m pip install -e ".[test,${{ matrix.extras }}]" @@ -118,7 +118,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@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f54c7c0..e10fa24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - run: python -m pip install --upgrade pip build wheel twine From 16d91e87615a3535e27aa0616ec45a4fb5e15383 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 00:03:42 +0000 Subject: [PATCH 05/26] Bump isort from 5.13.0 to 5.13.1 Bumps [isort](https://github.com/pycqa/isort) from 5.13.0 to 5.13.1. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.13.0...5.13.1) --- updated-dependencies: - dependency-name: isort dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 91a398c..2a8b219 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.6 black==23.11.0 flake8==6.1.0 -isort==5.13.0 +isort==5.13.1 pydocstyle[toml]==6.3.0 From 7fb7255cf55584de1b9a4f927a6bff60086809c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:31:21 +0000 Subject: [PATCH 06/26] Bump black from 23.11.0 to 23.12.0 Bumps [black](https://github.com/psf/black) from 23.11.0 to 23.12.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.11.0...23.12.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 2a8b219..67d627d 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.6 -black==23.11.0 +black==23.12.0 flake8==6.1.0 isort==5.13.1 pydocstyle[toml]==6.3.0 From 09372f413802ace60403ceacfc685757977609b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:58:12 +0000 Subject: [PATCH 07/26] Bump isort from 5.13.1 to 5.13.2 Bumps [isort](https://github.com/pycqa/isort) from 5.13.1 to 5.13.2. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.13.1...5.13.2) --- updated-dependencies: - dependency-name: isort dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 67d627d..06e16b8 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.6 black==23.12.0 flake8==6.1.0 -isort==5.13.1 +isort==5.13.2 pydocstyle[toml]==6.3.0 From d9611a2ebd2f774ddc3dd59b421427266277abe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:02:28 +0000 Subject: [PATCH 08/26] Bump github/codeql-action from 2 to 3 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecf11f4..8577cd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -147,14 +147,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}" From e57a15d28d07ac01ffa5166f7ddd2f410c2605dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 00:21:56 +0000 Subject: [PATCH 09/26] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... 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 8577cd6..aa2a778 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: run: python -m pip install --upgrade pip build wheel twine readme-renderer - run: python -m build --sdist --wheel - run: python -m twine check dist/* - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/* From e90ac4b2c9ee9e288b1b69317827c3000dd9d385 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:32:05 +0000 Subject: [PATCH 10/26] Bump black from 23.12.0 to 23.12.1 Bumps [black](https://github.com/psf/black) from 23.12.0 to 23.12.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.12.0...23.12.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 06e16b8..68fe48e 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.6 -black==23.12.0 +black==23.12.1 flake8==6.1.0 isort==5.13.2 pydocstyle[toml]==6.3.0 From f2d488b58a4c7302139df3f3583ac80036fdb8d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 00:48:47 +0000 Subject: [PATCH 11/26] Bump flake8 from 6.1.0 to 7.0.0 Bumps [flake8](https://github.com/pycqa/flake8) from 6.1.0 to 7.0.0. - [Commits](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index 68fe48e..c0482d1 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.6 black==23.12.1 -flake8==6.1.0 +flake8==7.0.0 isort==5.13.2 pydocstyle[toml]==6.3.0 From 494a3d6a5ba83d7221aa371d523f5af736774983 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 00:04:57 +0000 Subject: [PATCH 12/26] Bump bandit from 1.7.6 to 1.7.7 Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.6 to 1.7.7. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.6...1.7.7) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- linter-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linter-requirements.txt b/linter-requirements.txt index c0482d1..c262708 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,4 +1,4 @@ -bandit==1.7.6 +bandit==1.7.7 black==23.12.1 flake8==7.0.0 isort==5.13.2 From da3692bc0f246b4773c1410c3b115f08f4ab02b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 00:11:26 +0000 Subject: [PATCH 13/26] Bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa2a778..119dcb6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: python-version: ${{ matrix.python-version }} - run: python -m pip install -e '.[test]' - run: python -m pytest - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: flags: ${{ matrix.python-version }} @@ -96,7 +96,7 @@ jobs: python-version: ${{ matrix.python-version }} - run: python -m pip install -e ".[test,${{ matrix.extras }}]" - run: python -m pytest - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: flags: ${{ matrix.extras }} @@ -127,7 +127,7 @@ jobs: env: DB_PORT: ${{ job.services.postgres.ports[5432] }} DB: pg - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: flags: ${{ matrix.extras }} From 234624e9e81b8ba4b52c2a7d4500b8515ffb9d14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:53:23 +0100 Subject: [PATCH 14/26] Bump black from 23.12.1 to 24.2.0 (#121) --- docs/conf.py | 1 + linter-requirements.txt | 2 +- mailauth/__init__.py | 1 + mailauth/contrib/user/admin.py | 8 +++++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 4654c9c..e1a2264 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,5 @@ """Sphinx configuration file.""" + import os import sys diff --git a/linter-requirements.txt b/linter-requirements.txt index c262708..475dbf0 100644 --- a/linter-requirements.txt +++ b/linter-requirements.txt @@ -1,5 +1,5 @@ bandit==1.7.7 -black==23.12.1 +black==24.2.0 flake8==7.0.0 isort==5.13.2 pydocstyle[toml]==6.3.0 diff --git a/mailauth/__init__.py b/mailauth/__init__.py index 6cf2d89..2aa31a2 100644 --- a/mailauth/__init__.py +++ b/mailauth/__init__.py @@ -1,4 +1,5 @@ """Django authentication via login URLs, no passwords required.""" + from . import _version __version__ = _version.version diff --git a/mailauth/contrib/user/admin.py b/mailauth/contrib/user/admin.py index a3ac665..f53474f 100644 --- a/mailauth/contrib/user/admin.py +++ b/mailauth/contrib/user/admin.py @@ -32,9 +32,11 @@ def anonymize(self, request, queryset): ) % { "count": count, - "obj_name": self.model._meta.verbose_name_plural - if count > 1 - else self.model._meta.verbose_name, + "obj_name": ( + self.model._meta.verbose_name_plural + if count > 1 + else self.model._meta.verbose_name + ), }, fail_silently=True, ) From 3eb6d5ec6d8ab5934e8c68e5a367891cb354c0bf Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Mon, 19 Feb 2024 14:53:48 +0100 Subject: [PATCH 15/26] Move linter requirements into extra dependencies --- .github/workflows/ci.yml | 4 ++-- linter-requirements.txt | 5 ----- pyproject.toml | 7 +++++++ 3 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 linter-requirements.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 119dcb6..98a1eab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,8 @@ jobs: with: python-version: "3.x" cache: pip - cache-dependency-path: linter-requirements.txt - - run: python -m pip install -r linter-requirements.txt + cache-dependency-path: pyproject.toml + - run: python -m pip install .[lint] - run: ${{ matrix.lint-command }} dist: diff --git a/linter-requirements.txt b/linter-requirements.txt deleted file mode 100644 index 475dbf0..0000000 --- a/linter-requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -bandit==1.7.7 -black==24.2.0 -flake8==7.0.0 -isort==5.13.2 -pydocstyle[toml]==6.3.0 diff --git a/pyproject.toml b/pyproject.toml index b55d925..357c29a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,6 +52,13 @@ test = [ "pytest-cov", "pytest-django", ] +lint = [ + "bandit==1.7.7", + "black==24.2.0", + "flake8==7.0.0", + "isort==5.13.2", + "pydocstyle[toml]==6.3.0", +] docs = [ "sphinx", ] From 185b7440076a7d05b593ba28ed55e066170c6658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 01:00:08 +0000 Subject: [PATCH 16/26] Bump bandit from 1.7.7 to 1.7.8 Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.7 to 1.7.8. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.7...1.7.8) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 357c29a..eb2908d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ test = [ "pytest-django", ] lint = [ - "bandit==1.7.7", + "bandit==1.7.8", "black==24.2.0", "flake8==7.0.0", "isort==5.13.2", From cd7f7578b5671fd45745c27669d08e150d12ef73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 00:05:47 +0000 Subject: [PATCH 17/26] Bump black from 24.2.0 to 24.3.0 Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.2.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index eb2908d..88d79b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ test = [ ] lint = [ "bandit==1.7.8", - "black==24.2.0", + "black==24.3.0", "flake8==7.0.0", "isort==5.13.2", "pydocstyle[toml]==6.3.0", From ec1f2521815156f49d4263856cea371d982f2d05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:52:55 +0000 Subject: [PATCH 18/26] Bump black from 24.3.0 to 24.4.0 Bumps [black](https://github.com/psf/black) from 24.3.0 to 24.4.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.3.0...24.4.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 88d79b9..72d1f3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ test = [ ] lint = [ "bandit==1.7.8", - "black==24.3.0", + "black==24.4.0", "flake8==7.0.0", "isort==5.13.2", "pydocstyle[toml]==6.3.0", From 57bdad98cdccc1d8933a1b154a467938f466cadd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 00:09:43 +0000 Subject: [PATCH 19/26] Bump black from 24.4.0 to 24.4.1 Bumps [black](https://github.com/psf/black) from 24.4.0 to 24.4.1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.4.0...24.4.1) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 72d1f3f..27b4d02 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ test = [ ] lint = [ "bandit==1.7.8", - "black==24.4.0", + "black==24.4.1", "flake8==7.0.0", "isort==5.13.2", "pydocstyle[toml]==6.3.0", From 697a0889c4dc51acabd2c7572bed73352b6deb43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 00:44:51 +0000 Subject: [PATCH 20/26] Bump black from 24.4.1 to 24.4.2 Bumps [black](https://github.com/psf/black) from 24.4.1 to 24.4.2. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.4.1...24.4.2) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 27b4d02..953d1be 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ test = [ ] lint = [ "bandit==1.7.8", - "black==24.4.1", + "black==24.4.2", "flake8==7.0.0", "isort==5.13.2", "pydocstyle[toml]==6.3.0", From 78cfd5371c7dc9a9994aad9896eb0ccb0223fb60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 01:04:19 +0000 Subject: [PATCH 21/26] Bump flake8 from 7.0.0 to 7.1.0 Bumps [flake8](https://github.com/pycqa/flake8) from 7.0.0 to 7.1.0. - [Commits](https://github.com/pycqa/flake8/compare/7.0.0...7.1.0) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 953d1be..c30946e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ test = [ lint = [ "bandit==1.7.8", "black==24.4.2", - "flake8==7.0.0", + "flake8==7.1.0", "isort==5.13.2", "pydocstyle[toml]==6.3.0", ] From 005fe6707fa9fc3bb727a7af03e24dab5f6e811e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:19:04 +0000 Subject: [PATCH 22/26] Bump bandit from 1.7.8 to 1.7.9 Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.8 to 1.7.9. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.8...1.7.9) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c30946e..13b7307 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ test = [ "pytest-django", ] lint = [ - "bandit==1.7.8", + "bandit==1.7.9", "black==24.4.2", "flake8==7.1.0", "isort==5.13.2", From 9bfe3b32890e74f443b316df35d852e0c7546e01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 00:56:13 +0000 Subject: [PATCH 23/26] Bump black from 24.4.2 to 24.8.0 Bumps [black](https://github.com/psf/black) from 24.4.2 to 24.8.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.4.2...24.8.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 13b7307..4faca2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,7 @@ test = [ ] lint = [ "bandit==1.7.9", - "black==24.4.2", + "black==24.8.0", "flake8==7.1.0", "isort==5.13.2", "pydocstyle[toml]==6.3.0", From 2060f5bd6acee0ae7cc57a49ba13a136778df112 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:17:30 +0000 Subject: [PATCH 24/26] Bump flake8 from 7.1.0 to 7.1.1 Bumps [flake8](https://github.com/pycqa/flake8) from 7.1.0 to 7.1.1. - [Commits](https://github.com/pycqa/flake8/compare/7.1.0...7.1.1) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4faca2d..244bf04 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ test = [ lint = [ "bandit==1.7.9", "black==24.8.0", - "flake8==7.1.0", + "flake8==7.1.1", "isort==5.13.2", "pydocstyle[toml]==6.3.0", ] From e8f92f91cc7859dff6d6af45bda9d9655c26a52a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:35:28 +0000 Subject: [PATCH 25/26] Bump bandit from 1.7.9 to 1.7.10 Bumps [bandit](https://github.com/PyCQA/bandit) from 1.7.9 to 1.7.10. - [Release notes](https://github.com/PyCQA/bandit/releases) - [Commits](https://github.com/PyCQA/bandit/compare/1.7.9...1.7.10) --- updated-dependencies: - dependency-name: bandit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 244bf04..96e0cf1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -53,7 +53,7 @@ test = [ "pytest-django", ] lint = [ - "bandit==1.7.9", + "bandit==1.7.10", "black==24.8.0", "flake8==7.1.1", "isort==5.13.2", From 390cd4849a98d870d93f1c62e2963882eebbdd2e Mon Sep 17 00:00:00 2001 From: Johannes Maron Date: Wed, 9 Oct 2024 23:03:55 +0200 Subject: [PATCH 26/26] Update supported Python and Django versions (#134) --- .github/workflows/ci.yml | 30 +++++++++++++++++++++--------- pyproject.toml | 15 +++++++-------- tests/conftest.py | 6 ++++-- tests/contrib/admin/test_views.py | 2 +- tests/test_signing.py | 10 ++++++---- 5 files changed, 39 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98a1eab..17379fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,42 +62,47 @@ jobs: strategy: matrix: python-version: - - "3.9" - "3.10" - "3.11" + - "3.12" django-version: - - "4.0" - - "4.1" - "4.2" + - "5.0" + - "5.1" steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - run: python -m pip install -e '.[test]' + - run: python -m pip install Django~=${{ matrix.django-version }}.0 - run: python -m pytest - uses: codecov/codecov-action@v4 with: - flags: ${{ matrix.python-version }} + token: ${{ secrets.CODECOV_TOKEN }} + flags: python-${{ matrix.python-version }} - contrib: + wagtail: needs: [ lint, dist, docs ] runs-on: ubuntu-latest strategy: matrix: - extras: - - wagtail python-version: [ "3.x" ] + wagtail-version: + - "5.2.0" + - "6.0.0" steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - run: python -m pip install -e ".[test,${{ matrix.extras }}]" + - run: python -m pip install -e ".[test,wagtail]" + - run: python -m pip install wagtail~=${{ matrix.wagtail-version }} - run: python -m pytest - uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} flags: ${{ matrix.extras }} @@ -123,17 +128,24 @@ jobs: python-version: ${{ matrix.python-version }} - uses: actions/checkout@v4 - run: python -m pip install -e ".[test,postgres]" + - run: psql template1 -c "CREATE EXTENSION citext;" + env: + PGHOST: localhost + PGPORT: ${{ job.services.postgres.ports[5432] }} + PGUSER: django + PGPASSWORD: django - run: python -m pytest env: DB_PORT: ${{ job.services.postgres.ports[5432] }} DB: pg - uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} flags: ${{ matrix.extras }} analyze: name: CodeQL - needs: [ SQLite, contrib, PostgreSQL ] + needs: [ SQLite, wagtail, PostgreSQL ] runs-on: ubuntu-latest permissions: actions: read diff --git a/pyproject.toml b/pyproject.toml index 96e0cf1..a5cf4d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,26 +24,25 @@ classifiers = [ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3 :: Only", "Framework :: Django", - "Framework :: Django :: 4.0", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", "Framework :: Wagtail", - "Framework :: Wagtail :: 2", - "Framework :: Wagtail :: 3", - "Framework :: Wagtail :: 4", + "Framework :: Wagtail :: 5", + "Framework :: Wagtail :: 6", "Topic :: Internet", "Topic :: Internet :: WWW/HTTP", "Topic :: Software Development :: Quality Assurance", "Topic :: Software Development :: Testing", ] -requires-python = ">=3.9" +requires-python = ">=3.10" dependencies = [ - "django>=4.0" + "django>=4.2" ] [project.optional-dependencies] diff --git a/tests/conftest.py b/tests/conftest.py index 9194bfc..86d6359 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,3 +1,5 @@ +import zoneinfo + import pytest from django.contrib.auth import get_user_model from django.utils import timezone @@ -18,7 +20,7 @@ def user(db): return get_user_model().objects.create_user( pk=1337, email="spiderman@avengers.com", - last_login=timezone.datetime(2002, 5, 3, tzinfo=timezone.utc), + last_login=timezone.datetime(2002, 5, 3, tzinfo=zoneinfo.ZoneInfo("UTC")), ) @@ -28,7 +30,7 @@ def admin_user(db): return get_user_model().objects.create_user( pk=1337, email="spiderman@avengers.com", - last_login=timezone.datetime(2002, 5, 3, tzinfo=timezone.utc), + last_login=timezone.datetime(2002, 5, 3, tzinfo=zoneinfo.ZoneInfo("UTC")), is_superuser=True, ) diff --git a/tests/contrib/admin/test_views.py b/tests/contrib/admin/test_views.py index d29b76d..ce0d9c4 100644 --- a/tests/contrib/admin/test_views.py +++ b/tests/contrib/admin/test_views.py @@ -13,7 +13,7 @@ def test_post(self, client, user, signature): "/django-admin/login/", data={"email": "spiderman@avengers.com"} ) assert response.status_code == 302, response.content.decode() - assert signature in mail.outbox[-1].body + assert mail.outbox def test_post__user_does_not_exist(self, db, client): response = client.post( diff --git a/tests/test_signing.py b/tests/test_signing.py index cef908b..9067894 100644 --- a/tests/test_signing.py +++ b/tests/test_signing.py @@ -1,3 +1,5 @@ +import zoneinfo + import pytest from django.contrib.auth import get_user_model from django.core.signing import SignatureExpired @@ -14,7 +16,7 @@ def test_unsign(self, db, signer, signature): user = get_user_model().objects.create_user( pk=1337, email="spiderman@avengers.com", - last_login=timezone.datetime(2002, 5, 3, tzinfo=timezone.utc), + last_login=timezone.datetime(2002, 5, 3, tzinfo=zoneinfo.ZoneInfo("UTC")), ) assert user == signer.unsign(signature) @@ -29,7 +31,7 @@ def test_unsign__last_login(self, db, signer, signature): pk=1337, email="spiderman@avengers.com", # later date, that does not match the signature - last_login=timezone.datetime(2012, 7, 3, tzinfo=timezone.utc), + last_login=timezone.datetime(2012, 7, 3, tzinfo=zoneinfo.ZoneInfo("UTC")), ) with pytest.raises( SignatureExpired, @@ -42,7 +44,7 @@ def test_unsing__single_use(self, db, signer, signature): pk=1337, email="spiderman@avengers.com", # later date, that does not match the signature (token was used) - last_login=timezone.datetime(2012, 7, 3, tzinfo=timezone.utc), + last_login=timezone.datetime(2012, 7, 3, tzinfo=zoneinfo.ZoneInfo("UTC")), ) assert user == signer.unsign(signature, single_use=False) # test a second time to make sure token can be used more than one time @@ -54,7 +56,7 @@ def test_unsing__single_use(self, db, signer, signature): signer.unsign(signature, single_use=True) def test_to_timestamp(self): - value = timezone.datetime(2002, 5, 3, tzinfo=timezone.utc) + value = timezone.datetime(2002, 5, 3, tzinfo=zoneinfo.ZoneInfo("UTC")) base62_value = signing.UserSigner.to_timestamp(value=value) assert base62_value == "173QUS"