Skip to content

Commit

Permalink
Merge branch 'webargs2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasjuhrich committed Oct 1, 2023
2 parents af930b7 + 621e349 commit fb9ff7f
Show file tree
Hide file tree
Showing 6 changed files with 239 additions and 158 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker-image.yml
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
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
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:
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
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

0 comments on commit fb9ff7f

Please sign in to comment.