Merge 546cf4df0c into fdd7b22cd3

Clarify and/or conditions in AXES_LOCKOUT_PARAMETERS examples
chore(deps): bump black from 26.1.0 to 26.3.1
2026-03-16 22:30:23 +00:00 · 2026-03-16 19:01:30 +02:00 · 2026-03-16 18:55:20 +02:00 · 2026-03-16 18:54:27 +02:00 · 2026-03-16 18:54:17 +02:00 · 2026-03-16 18:54:13 +02:00
2 changed files with 5 additions and 5 deletions
--- a/docs/5_customization.rst
+++ b/docs/5_customization.rst
@ -188,7 +188,7 @@ Example ``AXES_LOCKOUT_PARAMETERS`` configuration:

    AXES_LOCKOUT_PARAMETERS = ["ip_address", ["username", "user_agent"]]

-This way, axes will lock out users using ip_address and/or combination of username and user agent
+This way, axes will lock out users using ip_address or combination of username and user_agent

 Example of callable ``AXES_LOCKOUT_PARAMETERS``:

@ -213,7 +213,7 @@ Example of callable ``AXES_LOCKOUT_PARAMETERS``:

    AXES_LOCKOUT_PARAMETERS = "example.utils.get_lockout_parameters"

-This way, if client ip_address is localhost, axes will lockout client only by username. In other case, axes will lockout client by username and/or ip_address.
+This way, if client ip_address is localhost, axes will lockout client only by username. In other case, axes will lockout client by username or ip_address.

 Customizing client ip address lookups
 -------------------------------------
--- a/requirements.txt
+++ b/requirements.txt
@ -1,12 +1,12 @@
 -e .
-black==26.1.0
+black==26.3.1
 coverage==7.13.4
 django-ipware>=3
 mypy==1.19.1
 prospector==1.18.0
 pytest-cov==7.0.0
-pytest-django==4.11.1
+pytest-django==4.12.0
 pytest-subtests==0.15.0
 pytest==9.0.2
 sphinx_rtd_theme==3.1.0
-tox==4.34.1
+tox==4.49.1
Author	SHA1	Message	Date
Rodrigo Nogueira	725a79ecd1	Merge `546cf4df0c` into `fdd7b22cd3`	2026-03-16 19:01:30 +02:00
Enrico Tröger	fdd7b22cd3	Clarify and/or conditions in AXES_LOCKOUT_PARAMETERS examples Some checks are pending Test / build (Python 3.10, Django 4.2) (push) Waiting to run Details Test / build (Python 3.11, Django 4.2) (push) Waiting to run Details Test / build (Python 3.12, Django 4.2) (push) Waiting to run Details Test / build (Python 3.14, Django 4.2) (push) Waiting to run Details Test / build (Python 3.10, Django 5.2) (push) Waiting to run Details Test / build (Python 3.11, Django 5.2) (push) Waiting to run Details Test / build (Python 3.12, Django 5.2) (push) Waiting to run Details Test / build (Python 3.13, Django 5.2) (push) Waiting to run Details Test / build (Python 3.14, Django 5.2) (push) Waiting to run Details Test / build (Python 3.12, Django 6.0) (push) Waiting to run Details Test / build (Python 3.13, Django 6.0) (push) Waiting to run Details Test / build (Python 3.14, Django 6.0) (push) Waiting to run Details Test / build (Python 3.14, Django main) (push) Waiting to run Details Test / build (Python 3.14, Django qa) (push) Waiting to run Details	2026-03-16 18:55:20 +02:00
dependabot[bot]	a5d14cd630	chore(deps): bump black from 26.1.0 to 26.3.1 Bumps [black](https://github.com/psf/black) from 26.1.0 to 26.3.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/26.1.0...26.3.1) --- updated-dependencies: - dependency-name: black dependency-version: 26.3.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-16 18:54:27 +02:00
dependabot[bot]	2a31c0133f	chore(deps): bump tox from 4.34.1 to 4.49.1 Bumps [tox](https://github.com/tox-dev/tox) from 4.34.1 to 4.49.1. - [Release notes](https://github.com/tox-dev/tox/releases) - [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/tox/compare/4.34.1...4.49.1) --- updated-dependencies: - dependency-name: tox dependency-version: 4.49.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-16 18:54:17 +02:00
dependabot[bot]	4624eed684	chore(deps): bump pytest-django from 4.11.1 to 4.12.0 Bumps [pytest-django](https://github.com/pytest-dev/pytest-django) from 4.11.1 to 4.12.0. - [Release notes](https://github.com/pytest-dev/pytest-django/releases) - [Changelog](https://github.com/pytest-dev/pytest-django/blob/main/docs/changelog.rst) - [Commits](https://github.com/pytest-dev/pytest-django/compare/v4.11.1...v4.12.0) --- updated-dependencies: - dependency-name: pytest-django dependency-version: 4.12.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-16 18:54:13 +02:00