Merge branch 'refs/heads/main' into chore/data-update

# Conflicts: # data/external/results/rooms_tumonline.json
TUM-Dev · May 2, 2024 · 60f2964 · 60f2964
2 parents 987a6a9 + 34f5269
commit 60f2964
Show file tree

Hide file tree

Showing 5 changed files with 4,340 additions and 5,856 deletions.
diff --git a/data/external/scrapers/tumonline.py b/data/external/scrapers/tumonline.py
@@ -147,7 +147,7 @@ def scrape_rooms() -> None:
             rooms.append(room_index[roomcode])
         usage_id += 1
 
-    rooms = sorted(rooms, key=lambda r: (r["roomcode"],r["list_index"]))
+    rooms = sorted(rooms, key=lambda r: (r["roomcode"], r["list_index"]))
     with open(CACHE_PATH / "rooms_tumonline.json", "w", encoding="utf-8") as file:
         json.dump(rooms, file, indent=2, sort_keys=True)
 

diff --git a/renovate.json b/renovate.json
@@ -14,12 +14,17 @@
       "groupName": "devDependencies"
     },
     {
-      "matchPackagePatterns": ["ruff", "cypress", "pretty_assertions"],
+      "matchPackagePatterns": ["pytest", "cypress", "pretty_assertions"],
       "groupName": "testing",
       "automerge": true
     },
     {
-      "matchPackagePatterns": ["eslint", "prettier", "ruff", "pretty_assertions", "pre-commit", "mypy", "sourcery", "@types/.*", "types-.*"],
+      "matchPackagePatterns": ["serde", "base64"],
+      "groupName": "rust-stable",
+      "automerge": true
+    },
+    {
+      "matchPackagePatterns": ["eslint", "prettier", "ruff", "pretty_assertions", "pre-commit", "mypy", "sourcery", "@types/.*", "types-.*", "scss"],
       "groupName": "linting",
       "automerge": true
     },

diff --git a/webclient/.prettierignore b/webclient/.prettierignore
@@ -2,3 +2,4 @@ tsconfig.json
 .output
 .nuxt
 node_modules
+pnpm-lock.yaml
diff --git a/webclient/package.json b/webclient/package.json
@@ -35,7 +35,7 @@
     "@nuxt/eslint": "0.3.10",
     "@nuxtjs/i18n": "8.3.1",
     "@nuxtjs/tailwindcss": "6.12.0",
-    "@types/node": "20.12.7",
+    "@types/node": "20.12.8",
     "@types/swagger-ui": "3.52.4",
     "@vue/tsconfig": "0.5.1",
     "autoprefixer": "10.4.19",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ tsconfig.json @@
     .output
     .nuxt
     node_modules
+    pnpm-lock.yaml