Compare commits

..

No commits in common. "6e73c50ff63881940c48f95f20fc83e77ee05490" and "1ad0733fe4ec165585e17e842107685b72d29885" have entirely different histories.

7 changed files with 16 additions and 17 deletions

View file

@ -31,7 +31,7 @@ repos:
- id: django-upgrade - id: django-upgrade
args: [--target-version, "4.1"] args: [--target-version, "4.1"]
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 24.1.1 rev: 23.12.1
hooks: hooks:
- id: black - id: black
args: [--target-version, py311] args: [--target-version, py311]
@ -50,7 +50,7 @@ repos:
- id: prettier - id: prettier
types_or: [javascript, css] types_or: [javascript, css]
- repo: https://github.com/pre-commit/mirrors-eslint - repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.0.0-alpha.2 rev: v9.0.0-alpha.1
hooks: hooks:
- id: eslint - id: eslint
args: [--fix] args: [--fix]

View file

@ -22,7 +22,7 @@ charset-normalizer==3.3.2
# via requests # via requests
confusable-homoglyphs==3.2.0 confusable-homoglyphs==3.2.0
# via django-registration # via django-registration
cryptography==42.0.1 cryptography==41.0.7
# via django-anymail # via django-anymail
django==4.2.9 django==4.2.9
# via # via
@ -39,7 +39,7 @@ django-anymail==10.2
# django-anymail # django-anymail
django-bootstrap5==23.4 django-bootstrap5==23.4
# via -r requirements.in # via -r requirements.in
django-cleanup==8.1.0 django-cleanup==8.0.0
# via -r requirements.in # via -r requirements.in
django-environ==0.11.2 django-environ==0.11.2
# via -r requirements.in # via -r requirements.in

View file

@ -15,7 +15,7 @@ attrs==23.2.0
# hypothesis # hypothesis
# outcome # outcome
# trio # trio
black==24.1.1 black==23.12.1
# via -r requirements-dev.in # via -r requirements-dev.in
blessed==1.20.0 blessed==1.20.0
# via curtsies # via curtsies
@ -38,7 +38,7 @@ click==8.1.7
# via # via
# black # black
# pip-tools # pip-tools
coverage[toml]==7.4.1 coverage[toml]==7.4.0
# via # via
# coverage # coverage
# pytest-cov # pytest-cov
@ -68,7 +68,7 @@ h11==0.14.0
# via # via
# -c constraints.txt # -c constraints.txt
# wsproto # wsproto
hypothesis==6.97.1 hypothesis==6.96.2
# via -r requirements-dev.in # via -r requirements-dev.in
identify==2.5.33 identify==2.5.33
# via pre-commit # via pre-commit
@ -109,7 +109,7 @@ platformdirs==4.1.0
# via # via
# black # black
# virtualenv # virtualenv
pluggy==1.4.0 pluggy==1.3.0
# via pytest # via pytest
pre-commit==3.6.0 pre-commit==3.6.0
# via -r requirements-dev.in # via -r requirements-dev.in

View file

@ -22,7 +22,7 @@ charset-normalizer==3.3.2
# via requests # via requests
confusable-homoglyphs==3.2.0 confusable-homoglyphs==3.2.0
# via django-registration # via django-registration
cryptography==42.0.1 cryptography==41.0.7
# via django-anymail # via django-anymail
django==4.2.9 django==4.2.9
# via # via
@ -39,7 +39,7 @@ django-anymail[mailgun]==10.2
# django-anymail # django-anymail
django-bootstrap5==23.4 django-bootstrap5==23.4
# via -r requirements.in # via -r requirements.in
django-cleanup==8.1.0 django-cleanup==8.0.0
# via -r requirements.in # via -r requirements.in
django-environ==0.11.2 django-environ==0.11.2
# via -r requirements.in # via -r requirements.in

View file

@ -101,9 +101,9 @@ class CharacterAdminForm(ModelForm):
"path__race", "path__race",
"path__profile", "path__profile",
) )
self.fields["racial_capability"].queryset = ( self.fields[
models.RacialCapability.objects.select_related("race") "racial_capability"
) ].queryset = models.RacialCapability.objects.select_related("race")
class PartyInline(admin.TabularInline): class PartyInline(admin.TabularInline):

View file

@ -54,9 +54,9 @@ class AddPathForm(forms.Form):
class CharacterForm(forms.ModelForm): class CharacterForm(forms.ModelForm):
def __init__(self, *args, **kwargs) -> None: def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields["racial_capability"].queryset = ( self.fields[
RacialCapability.objects.select_related("race") "racial_capability"
) ].queryset = RacialCapability.objects.select_related("race")
self.fields["damage_reduction"].widget.attrs.update({"rows": 2}) self.fields["damage_reduction"].widget.attrs.update({"rows": 2})
self.fields["equipment"].widget.attrs.update({"rows": 3}) self.fields["equipment"].widget.attrs.update({"rows": 3})

View file

@ -13,7 +13,6 @@ Including another URLconf
1. Import the include() function: from django.urls import include, path 1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
""" """
from django.conf import settings from django.conf import settings
from django.conf.urls.static import static from django.conf.urls.static import static
from django.contrib import admin from django.contrib import admin