Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[web] Use webargs instead of flask_restful.reqparse #667

Merged
merged 6 commits into from
Oct 1, 2023
Merged

[web] Use webargs instead of flask_restful.reqparse #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87d01d7
[web] Use webargs instead of flask_restful.reqparse
FestplattenSchnitzel Sep 28, 2023
bf4dbe2
Remove now superfluous lines
lukasjuhrich Sep 30, 2023
682bf9e
Add suppression for missing `__init__` annotation in `marshmallow`
lukasjuhrich Sep 30, 2023
36bb0ec
use `docker compose` v2
lukasjuhrich Oct 1, 2023
8111465
[ci] wait for containers on startup
lukasjuhrich Oct 1, 2023
621e349
[ci] pin `openldap` to <2.5
lukasjuhrich Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ jobs:
- name: Build
run: docker buildx bake --load
- name: Run test-app entrypoints
run: docker-compose -f docker-compose.test.yml run --rm --no-deps test-app
run: docker compose -f docker-compose.test.yml run --rm --no-deps test-app
- name: Start
run: docker-compose -f docker-compose.test.yml up test-app
run: docker compose -f docker-compose.test.yml up --wait --wait-timeout=30 test-app
- name: Run webpack
run: docker-compose -f docker-compose.test.yml run --rm test-app webpack --mode production
run: docker compose -f docker-compose.test.yml run --rm test-app webpack --mode production
- name: Run tests
run: >
docker-compose -f docker-compose.test.yml run --rm test-app
docker compose -f docker-compose.test.yml run --rm test-app
test -m "not legacy"
--junitxml=junit/test-results.xml
--cov=pycroft --cov=web --cov=ldap_sync --cov=hades_logs --cov-append
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ services:
interval: 2s
timeout: 2m
ldap:
image: dinkel/openldap
image: dinkel/openldap:2.4.44
environment:
- SLAPD_PASSWORD=password
- SLAPD_DOMAIN=agdsn.de
Expand Down
3 changes: 2 additions & 1 deletion pycroft/lib/swdd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import hmac
import os
import unicodedata
from datetime import date

from sqlalchemy import func

Expand All @@ -13,7 +14,7 @@
swdd_hmac_key = os.environ.get('SWDD_HASH_KEY')


def get_swdd_person_id(first_name: str, last_name: str, birthdate: str) -> int | None:
lukasjuhrich marked this conversation as resolved.
Show resolved Hide resolved
def get_swdd_person_id(first_name: str, last_name: str, birthdate: date) -> int | None:
"""
Builds a hmac hash from the given parameters and searches for a match in the Tenancy view

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ipaddr~=2.2.0
jsonschema~=3.2.0
passlib~=1.7.1
psycopg2~=2.8.6
webargs~=8.3.0
wrapt~=1.12.1
# only needed for ldap caching
ldap3~=2.5.1
Expand Down
Loading
Loading