Skip to content

Commit 5efaddc

Browse files
author
Your Name
committed
Fixes some failing checks.
1 parent aad2ddf commit 5efaddc

File tree

231 files changed

+1158
-1312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+1158
-1312
lines changed
Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
1-
name: Docker-pr-deploy
1+
name: Documentation
2+
23
on:
3-
workflow_dispatch:
4-
inputs:
5-
repository:
6-
description: "Repository name with owner. For example, actions/checkout"
7-
ref:
8-
description: "The branch, tag or SHA to checkout."
4+
push:
5+
branches: [ development, master ]
6+
paths-ignore:
7+
- 'src/pretix/locale/**'
8+
- 'src/pretix/static/**'
9+
- 'src/tests/**'
10+
pull_request:
11+
branches: [ development, master ]
12+
paths-ignore:
13+
- 'src/pretix/locale/**'
14+
- 'src/pretix/static/**'
15+
- 'src/tests/**'
916

1017
jobs:
11-
push_to_registry:
12-
name: Push Docker image to Docker hub
18+
spelling:
19+
name: Spellcheck
1320
runs-on: ubuntu-latest
1421
steps:
15-
- name: Check out the repo
16-
uses: actions/checkout@v4
17-
with:
18-
repository: ${{ inputs.repository }}
19-
ref: ${{ inputs.ref }}
20-
21-
- name: Log in to Docker Hub
22-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
22+
- uses: actions/checkout@v2
23+
- name: Set up Python 3.11
24+
uses: actions/setup-python@v1
2325
with:
24-
username: ${{ secrets.DOCKER_USERNAME }}
25-
password: ${{ secrets.DOCKER_PASSWORD }}
26-
27-
- name: Build and push Docker image
28-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
26+
python-version: 3.11
27+
- uses: actions/cache@v3
2928
with:
30-
context: .
31-
push: true
32-
tags: eventyay/eventyay-ticket:development
33-
labels: manual
34-
build-args: GITHUB_TOKEN=${{ secrets.EVENTYAY_TOKEN }}
29+
path: ~/.cache/pip
30+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
31+
restore-keys: |
32+
${{ runner.os }}-pip-
33+
- name: Install system packages
34+
run: sudo apt update && sudo apt install enchant hunspell aspell-en
35+
- name: Install Dependencies
36+
run: pip3 install -Ur doc/requirements.txt
37+
- name: Spellcheck docs
38+
run: make spelling
39+
working-directory: ./doc
40+
- name:
41+
run: '[ ! -s _build/spelling/output.txt ]'
42+
working-directory: ./doc

doc/checkin_filter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from enchant.tokenize import get_tokenizer, Filter, unit_tokenize
1+
from enchant.tokenize import Filter, get_tokenizer, unit_tokenize
2+
23

34
class CheckinFilter(Filter):
45
""" If a word looks like checkin_count, it refers to a so-called variable in

doc/conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
from docutils.parsers.rst.directives.admonitions import BaseAdmonition
1717
from sphinx.util import compat
18+
1819
compat.make_admonition = BaseAdmonition # See https://github.com/spinus/sphinxcontrib-images/issues/41
1920

20-
import sys
2121
import os
22-
22+
import sys
2323
# If extensions (or modules to document with autodoc) are in another directory,
2424
# add these directories to sys.path here. If the directory is relative to the
2525
# documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -28,6 +28,7 @@
2828
sys.path.insert(0, os.path.abspath('../src'))
2929

3030
import django
31+
3132
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.testutils.settings")
3233
django.setup()
3334

@@ -79,6 +80,7 @@
7980
#
8081
# The short X.Y version.
8182
from pretix import __version__
83+
8284
version = '.'.join(__version__.split('.')[:2])
8385
# The full version, including alpha/beta/rc tags.
8486
release = __version__

src/pretix/api/auth/device.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
from rest_framework import exceptions
44
from rest_framework.authentication import TokenAuthentication
55

6-
from pretix.api.auth.devicesecurity import (
7-
DEVICE_SECURITY_PROFILES, FullAccessSecurityProfile,
8-
)
6+
from pretix.api.auth.devicesecurity import (DEVICE_SECURITY_PROFILES,
7+
FullAccessSecurityProfile)
98
from pretix.base.models import Device
109

1110

src/pretix/api/auth/permission.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
from pretix.base.models import Device, Event, User
55
from pretix.base.models.auth import SuperuserPermissionSet
66
from pretix.base.models.organizer import TeamAPIToken
7-
from pretix.helpers.security import (
8-
SessionInvalid, SessionReauthRequired, assert_session_valid,
9-
)
7+
from pretix.helpers.security import (SessionInvalid, SessionReauthRequired,
8+
assert_session_valid)
109

1110

1211
class EventPermission(BasePermission):

src/pretix/api/models.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
from django.urls import reverse
55
from django.utils.timezone import now
66
from django.utils.translation import gettext_lazy as _
7-
from oauth2_provider.generators import (
8-
generate_client_id, generate_client_secret,
9-
)
10-
from oauth2_provider.models import (
11-
AbstractAccessToken, AbstractApplication, AbstractGrant, AbstractIDToken,
12-
AbstractRefreshToken, ClientSecretField,
13-
)
7+
from oauth2_provider.generators import (generate_client_id,
8+
generate_client_secret)
9+
from oauth2_provider.models import (AbstractAccessToken, AbstractApplication,
10+
AbstractGrant, AbstractIDToken,
11+
AbstractRefreshToken, ClientSecretField)
1412
from oauth2_provider.validators import URIValidator
1513

1614

src/pretix/api/serializers/cart.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from rest_framework.exceptions import ValidationError
99

1010
from pretix.api.serializers.i18n import I18nAwareModelSerializer
11-
from pretix.api.serializers.order import (
12-
AnswerCreateSerializer, AnswerSerializer, InlineSeatSerializer,
13-
)
11+
from pretix.api.serializers.order import (AnswerCreateSerializer,
12+
AnswerSerializer,
13+
InlineSeatSerializer)
1414
from pretix.base.models import Quota, Seat
1515
from pretix.base.models.orders import CartPosition
1616

src/pretix/api/serializers/event.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
from pretix.base.models import Device, Event, TaxRule, TeamAPIToken
1717
from pretix.base.models.event import SubEvent
1818
from pretix.base.models.items import SubEventItem, SubEventItemVariation
19-
from pretix.base.services.seating import (
20-
SeatProtected, generate_seats, validate_plan_change,
21-
)
19+
from pretix.base.services.seating import (SeatProtected, generate_seats,
20+
validate_plan_change)
2221
from pretix.base.settings import validate_event_settings
2322
from pretix.base.signals import api_event_settings_fields
2423

src/pretix/api/serializers/item.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
from pretix.api.serializers.event import MetaDataField
1010
from pretix.api.serializers.fields import UploadedFileField
1111
from pretix.api.serializers.i18n import I18nAwareModelSerializer
12-
from pretix.base.models import (
13-
Item, ItemAddOn, ItemBundle, ItemCategory, ItemMetaValue, ItemVariation,
14-
Question, QuestionOption, Quota,
15-
)
12+
from pretix.base.models import (Item, ItemAddOn, ItemBundle, ItemCategory,
13+
ItemMetaValue, ItemVariation, Question,
14+
QuestionOption, Quota)
1615

1716

1817
class InlineItemVariationSerializer(I18nAwareModelSerializer):

src/pretix/api/serializers/order.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,17 @@
1515

1616
from pretix.api.serializers.event import SubEventSerializer
1717
from pretix.api.serializers.i18n import I18nAwareModelSerializer
18-
from pretix.api.serializers.item import (
19-
InlineItemVariationSerializer, ItemSerializer,
20-
)
18+
from pretix.api.serializers.item import (InlineItemVariationSerializer,
19+
ItemSerializer)
2120
from pretix.base.channels import get_all_sales_channels
2221
from pretix.base.decimal import round_decimal
2322
from pretix.base.i18n import language
24-
from pretix.base.models import (
25-
CachedFile, Checkin, Invoice, InvoiceAddress, InvoiceLine, Item,
26-
ItemVariation, Order, OrderPosition, Question, QuestionAnswer, Seat,
27-
SubEvent, TaxRule, Voucher,
28-
)
29-
from pretix.base.models.orders import (
30-
CartPosition, OrderFee, OrderPayment, OrderRefund, RevokedTicketSecret,
31-
)
23+
from pretix.base.models import (CachedFile, Checkin, Invoice, InvoiceAddress,
24+
InvoiceLine, Item, ItemVariation, Order,
25+
OrderPosition, Question, QuestionAnswer, Seat,
26+
SubEvent, TaxRule, Voucher)
27+
from pretix.base.models.orders import (CartPosition, OrderFee, OrderPayment,
28+
OrderRefund, RevokedTicketSecret)
3229
from pretix.base.pdf import get_images, get_variables
3330
from pretix.base.services.cart import error_messages
3431
from pretix.base.services.locking import NoLockManager

0 commit comments

Comments
 (0)