Skip to content

Commit

Permalink
Merge branch 'main' into data-update
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm authored Oct 18, 2023
2 parents 3ce052e + 653c76e commit 9c6b5d9
Show file tree
Hide file tree
Showing 15 changed files with 378 additions and 291 deletions.
2 changes: 1 addition & 1 deletion data/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ beautifulsoup4~=4.12.2
defusedxml~=0.7.1
lxml~=4.9.2
numba~=0.58.0
Pillow~=10.0.0
Pillow~=10.1.0
pydantic~=2.4.2
pyyaml~=6.0
requests~=2.31.0
Expand Down
16 changes: 16 additions & 0 deletions data/sources/02_rooms-extended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,22 @@
comment:
de: Unter dieser Treppe existiert ein WC, dessen Raumnummer und designierung (men/women/unisex) unklar ist
en: Under this staircase there is a toilet whose room number and designation (men/women/unisex) is unclear
"0504.03.407":
name: Büro # previously: Kartensammlung
usage: # previously: Lehrmittelraum
name:
de: Büro
en: Office
din_277: NF2.1
din_277_desc: Büroräume
"0504.03.409":
name: Büro # previously: Kartensammlung
usage: # previously: Lehrmittelraum
name:
de: Büro
en: Office
din_277: NF2.1
din_277_desc: Büroräume
"0509.EG.980":
name: Audimax, Werner-von-Siemens-Hörsaal
ranking_factors:
Expand Down
1 change: 0 additions & 1 deletion deployment/k3s/templates/networking/https-cert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ spec:
{{ if eq "nav.tum.de" $.Values.url }}
- www.nav.tum.de
- nav.tum.sexy
- nav.tum.app
{{ end }}
secretName: {{ $.Values.url }}
issuerRef:
Expand Down
4 changes: 2 additions & 2 deletions deployment/k3s/templates/networking/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
- name: webclient-svc
port: 9000
- kind: Rule
match: Host(`nav.tum.app`) || Host(`nav.tum.sexy`) || Host(`www.nav.tum.de`)
match: Host(`nav.tum.sexy`) || Host(`www.nav.tum.de`)
services:
- name: noop@internal
kind: TraefikService
Expand Down Expand Up @@ -73,7 +73,7 @@ spec:
middlewares:
- name: https
- kind: Rule
match: Host(`nav.tum.app`) || Host(`nav.tum.sexy`) || Host(`www.nav.tum.de`)
match: Host(`nav.tum.sexy`) || Host(`www.nav.tum.de`)
services:
- name: noop@internal
kind: TraefikService
Expand Down
2 changes: 1 addition & 1 deletion deployment/k3s/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ server:
mielisearch:
image:
repository: 'getmeili/meilisearch'
tag: v1.4.0
tag: v1.4.1
calendar:
scrape_tasks:
- name: refresh-calendar-slow # takes ~6m to complete
Expand Down
2 changes: 1 addition & 1 deletion openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ paths:
Some fields support highlighting the query terms and it uses \x19 and \x17 to mark the beginning/end of a highlighted sequence.
(See [Wikipedia](https://en.wikipedia.org/wiki/C0_and_C1_control_codes#Modified_C0_control_code_sets)).
Some text-renderers will ignore them, but in case you do not want to use them, you might want to remove them from the responses via empty `pre_highlight` and `pre_highlight` query parameters.
Some text-renderers will ignore them, but in case you do not want to use them, you might want to remove them from the responses via empty `pre_highlight` and `post_highlight` query parameters.
parameters:
- name: q
in: query
Expand Down
10 changes: 5 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
mypy~=1.5.0
pre-commit~=3.4.0
pylint~=2.17.4
sourcery~=1.10.0
types-Pillow~=10.0.0.2
mypy~=1.6.0
pre-commit~=3.5.0
pylint~=3.0.0
sourcery~=1.11.0
types-Pillow~=10.1.0.0
types-PyYAML~=6.0.12.10
types-requests~=2.31.0.1
types-termcolor~=1.1.6.2
Loading

0 comments on commit 9c6b5d9

Please sign in to comment.