Merge branch 'main' into calendar_frontend

.pre-commit-config.yaml

@@ -51,13 +51,13 @@ repos:
       - id: python-check-blanket-noqa
       - id: python-use-type-annotations
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.4
+    rev: v0.5.0
     hooks:
       - id: ruff
         args: [ --fix ]
       - id: ruff-format
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.8
+    rev: 1.7.9
     hooks:
       - id: bandit
         args: [ "-c", "pyproject.toml" ]

data/external/scrapers/tumonline.py

@@ -76,7 +76,7 @@ def _sanitise_room_value(val: dict) -> dict:
             "zip_code": val.pop("address_zip_code"),
         }
         if "alt_name" in val:
-            val["alt_name"] = _clean_spaces(val["alt_name"])
+            val["alt_name"] = _clean_spaces(val["alt_name"]).replace(" ( ", " (")
         val["floor_level"] = val.pop("address_floor")
         val["seats"] = {
             "sitting": val.pop("seats", None),

data/processors/tumonline.py

@@ -344,3 +344,4 @@ def _maybe_set_alt_name(room_code: str, arch_name_parts: tuple[str, str], room:
         logging.debug(
             f"(alt_name / arch_name mismatch): {alt_parts[0]=} {arch_name_parts[0]=} {room_code=}",
         )
+    room.alt_name = room.alt_name.strip()

data/requirements.txt

@@ -1,13 +1,13 @@
-backoff~=2.2.1
-beautifulsoup4~=4.12.2
-defusedxml~=0.7.1
-lxml~=5.2.0
-numba~=0.60.0
-Pillow~=10.3.0
-pydantic~=2.7.0
-pyyaml~=6.0
-requests~=2.32.2
-requests-oauthlib~=2.0.0
-ruamel.yaml~=0.18.5
-tqdm~=4.66.0
-utm~=0.7.0
+backoff==2.2.1
+beautifulsoup4==4.12.3
+defusedxml==0.7.1
+lxml==5.2.2
+numba==0.60.0
+Pillow==10.3.0
+pydantic==2.7.4
+pyyaml==6.0.1
+requests==2.32.3
+requests-oauthlib==2.0.0
+ruamel.yaml==0.18.6
+tqdm==4.66.4
+utm==0.7.0

requirements-dev.txt

@@ -1,8 +1,8 @@
-mypy~=1.10.0
-pre-commit~=3.7.0
-pytest~=8.2.0
-ruff~=0.5.0
-types-Pillow~=10.2.0.20240111
-types-PyYAML~=6.0.12.10
-types-requests~=2.32.0.20240521
-types-termcolor~=1.1.6.2
+mypy==1.10.1
+pre-commit==3.7.1
+pytest==8.2.2
+ruff==0.5.0
+types-Pillow==10.2.0.20240520
+types-PyYAML==6.0.12.20240311
+types-requests==2.32.0.20240622
+types-termcolor==1.1.6.2