Skip to content

Commit

Permalink
Merge branch 'valohai:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pbadeer authored Nov 13, 2023
2 parents b8b6257 + a6a239b commit 22ce777
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.280
rev: v0.0.288
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/psf/black
rev: 23.7.0
rev: 23.9.1
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand All @@ -21,7 +21,7 @@ repos:
- id: fix-encoding-pragma
args: ["--remove"]
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.14.0
rev: 1.14.1
hooks:
- id: django-upgrade
args:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Setup you virtual environment with hatch:
Running tests
'''''''''''''

Tests can be run using [pytest](https://docs.pytest.org/en/6.2.x/).
Tests can be run using `pytest <https://docs.pytest.org/en/6.2.x/>`_

.. code-block:: bash
Expand Down
4 changes: 4 additions & 0 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
"django_otp.middleware.OTPMiddleware",
# Reset login flow middleware.
"allauth_2fa.middleware.AllauthTwoFactorMiddleware",
# Allauth account middleware.
"allauth.account.middleware.AccountMiddleware",
)

if django.VERSION < (2,):
Expand All @@ -83,3 +85,5 @@

# Enable two-factor auth.
ACCOUNT_ADAPTER = "allauth_2fa.adapter.OTPAdapter"

STATIC_URL = "/static/"

0 comments on commit 22ce777

Please sign in to comment.