mirror of
https://github.com/Crocmagnon/charasheet.git
synced 2024-11-22 22:48:03 +01:00
Compare commits
8 commits
e3a0f5ca89
...
cffeab71c8
Author | SHA1 | Date | |
---|---|---|---|
|
cffeab71c8 | ||
|
8ee83dfeb7 | ||
|
ddb7b53c73 | ||
|
6e73c50ff6 | ||
|
d844f54f82 | ||
|
99cb7c4ac7 | ||
|
1ad0733fe4 | ||
|
2ab0056a55 |
9 changed files with 23 additions and 22 deletions
2
.github/workflows/publish.yaml
vendored
2
.github/workflows/publish.yaml
vendored
|
@ -44,7 +44,7 @@ jobs:
|
|||
echo "${{ secrets.DEPLOY_KEY }}" > $TEMP
|
||||
ssh -o StrictHostKeyChecking=no -i $TEMP -p ${{ secrets.DEPLOY_PORT }} ${{ secrets.DEPLOY_USERNAME }}@${{ secrets.DEPLOY_HOST }} /mnt/data/charasheet/update
|
||||
- name: Check
|
||||
uses: nick-fields/retry@v2
|
||||
uses: nick-fields/retry@v3
|
||||
with:
|
||||
timeout_seconds: 30
|
||||
max_attempts: 5
|
||||
|
|
2
.github/workflows/update-dependencies.yaml
vendored
2
.github/workflows/update-dependencies.yaml
vendored
|
@ -33,7 +33,7 @@ jobs:
|
|||
app_id: ${{ secrets.PR_APP_ID }}
|
||||
private_key: ${{ secrets.PR_APP_PRIVATE_KEY }}
|
||||
- name: Create Pull Request
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
uses: peter-evans/create-pull-request@v6
|
||||
id: create-pull-request
|
||||
with:
|
||||
token: ${{ steps.generate-token.outputs.token }}
|
||||
|
|
|
@ -31,7 +31,7 @@ repos:
|
|||
- id: django-upgrade
|
||||
args: [--target-version, "4.1"]
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 23.12.1
|
||||
rev: 24.1.1
|
||||
hooks:
|
||||
- id: black
|
||||
args: [--target-version, py311]
|
||||
|
@ -40,7 +40,7 @@ repos:
|
|||
hooks:
|
||||
- id: djhtml
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.1.13
|
||||
rev: v0.1.14
|
||||
hooks:
|
||||
- id: ruff
|
||||
args: [--fix]
|
||||
|
@ -50,7 +50,7 @@ repos:
|
|||
- id: prettier
|
||||
types_or: [javascript, css]
|
||||
- repo: https://github.com/pre-commit/mirrors-eslint
|
||||
rev: v9.0.0-alpha.1
|
||||
rev: v9.0.0-alpha.2
|
||||
hooks:
|
||||
- id: eslint
|
||||
args: [--fix]
|
||||
|
@ -59,7 +59,7 @@ repos:
|
|||
- eslint@8.36.0
|
||||
- eslint-config-prettier@8.5.0
|
||||
- repo: https://github.com/tox-dev/pyproject-fmt
|
||||
rev: 1.6.0
|
||||
rev: 1.7.0
|
||||
hooks:
|
||||
- id: pyproject-fmt
|
||||
- repo: https://github.com/jazzband/pip-tools
|
||||
|
|
|
@ -22,7 +22,7 @@ charset-normalizer==3.3.2
|
|||
# via requests
|
||||
confusable-homoglyphs==3.2.0
|
||||
# via django-registration
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.1
|
||||
# via django-anymail
|
||||
django==4.2.9
|
||||
# via
|
||||
|
@ -39,7 +39,7 @@ django-anymail==10.2
|
|||
# django-anymail
|
||||
django-bootstrap5==23.4
|
||||
# via -r requirements.in
|
||||
django-cleanup==8.0.0
|
||||
django-cleanup==8.1.0
|
||||
# via -r requirements.in
|
||||
django-environ==0.11.2
|
||||
# via -r requirements.in
|
||||
|
|
|
@ -15,7 +15,7 @@ attrs==23.2.0
|
|||
# hypothesis
|
||||
# outcome
|
||||
# trio
|
||||
black==23.12.1
|
||||
black==24.1.1
|
||||
# via -r requirements-dev.in
|
||||
blessed==1.20.0
|
||||
# via curtsies
|
||||
|
@ -38,7 +38,7 @@ click==8.1.7
|
|||
# via
|
||||
# black
|
||||
# pip-tools
|
||||
coverage[toml]==7.4.0
|
||||
coverage[toml]==7.4.1
|
||||
# via
|
||||
# coverage
|
||||
# pytest-cov
|
||||
|
@ -68,7 +68,7 @@ h11==0.14.0
|
|||
# via
|
||||
# -c constraints.txt
|
||||
# wsproto
|
||||
hypothesis==6.93.1
|
||||
hypothesis==6.97.1
|
||||
# via -r requirements-dev.in
|
||||
identify==2.5.33
|
||||
# via pre-commit
|
||||
|
@ -83,7 +83,7 @@ invoke==2.2.0
|
|||
# via -r requirements-dev.in
|
||||
jinja2==3.1.3
|
||||
# via pytest-html
|
||||
markupsafe==2.1.3
|
||||
markupsafe==2.1.4
|
||||
# via jinja2
|
||||
model-bakery==1.17.0
|
||||
# via -r requirements-dev.in
|
||||
|
@ -109,7 +109,7 @@ platformdirs==4.1.0
|
|||
# via
|
||||
# black
|
||||
# virtualenv
|
||||
pluggy==1.3.0
|
||||
pluggy==1.4.0
|
||||
# via pytest
|
||||
pre-commit==3.6.0
|
||||
# via -r requirements-dev.in
|
||||
|
@ -157,7 +157,7 @@ requests==2.31.0
|
|||
# bpython
|
||||
# pytest-base-url
|
||||
# pytest-selenium
|
||||
ruff==0.1.13
|
||||
ruff==0.1.14
|
||||
# via -r requirements-dev.in
|
||||
selenium==4.9.1
|
||||
# via
|
||||
|
|
|
@ -22,7 +22,7 @@ charset-normalizer==3.3.2
|
|||
# via requests
|
||||
confusable-homoglyphs==3.2.0
|
||||
# via django-registration
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.1
|
||||
# via django-anymail
|
||||
django==4.2.9
|
||||
# via
|
||||
|
@ -39,7 +39,7 @@ django-anymail[mailgun]==10.2
|
|||
# django-anymail
|
||||
django-bootstrap5==23.4
|
||||
# via -r requirements.in
|
||||
django-cleanup==8.0.0
|
||||
django-cleanup==8.1.0
|
||||
# via -r requirements.in
|
||||
django-environ==0.11.2
|
||||
# via -r requirements.in
|
||||
|
|
|
@ -101,9 +101,9 @@ class CharacterAdminForm(ModelForm):
|
|||
"path__race",
|
||||
"path__profile",
|
||||
)
|
||||
self.fields[
|
||||
"racial_capability"
|
||||
].queryset = models.RacialCapability.objects.select_related("race")
|
||||
self.fields["racial_capability"].queryset = (
|
||||
models.RacialCapability.objects.select_related("race")
|
||||
)
|
||||
|
||||
|
||||
class PartyInline(admin.TabularInline):
|
||||
|
|
|
@ -54,9 +54,9 @@ class AddPathForm(forms.Form):
|
|||
class CharacterForm(forms.ModelForm):
|
||||
def __init__(self, *args, **kwargs) -> None:
|
||||
super().__init__(*args, **kwargs)
|
||||
self.fields[
|
||||
"racial_capability"
|
||||
].queryset = RacialCapability.objects.select_related("race")
|
||||
self.fields["racial_capability"].queryset = (
|
||||
RacialCapability.objects.select_related("race")
|
||||
)
|
||||
self.fields["damage_reduction"].widget.attrs.update({"rows": 2})
|
||||
self.fields["equipment"].widget.attrs.update({"rows": 3})
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ Including another URLconf
|
|||
1. Import the include() function: from django.urls import include, path
|
||||
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
|
||||
"""
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib import admin
|
||||
|
|
Loading…
Reference in a new issue