Skip to content

Commit 60f2964

Browse files
Merge branch 'refs/heads/main' into chore/data-update
# Conflicts: # data/external/results/rooms_tumonline.json
2 parents 987a6a9 + 34f5269 commit 60f2964

File tree

5 files changed

+4340
-5856
lines changed

5 files changed

+4340
-5856
lines changed

data/external/scrapers/tumonline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def scrape_rooms() -> None:
147147
rooms.append(room_index[roomcode])
148148
usage_id += 1
149149

150-
rooms = sorted(rooms, key=lambda r: (r["roomcode"],r["list_index"]))
150+
rooms = sorted(rooms, key=lambda r: (r["roomcode"], r["list_index"]))
151151
with open(CACHE_PATH / "rooms_tumonline.json", "w", encoding="utf-8") as file:
152152
json.dump(rooms, file, indent=2, sort_keys=True)
153153

renovate.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@
1414
"groupName": "devDependencies"
1515
},
1616
{
17-
"matchPackagePatterns": ["ruff", "cypress", "pretty_assertions"],
17+
"matchPackagePatterns": ["pytest", "cypress", "pretty_assertions"],
1818
"groupName": "testing",
1919
"automerge": true
2020
},
2121
{
22-
"matchPackagePatterns": ["eslint", "prettier", "ruff", "pretty_assertions", "pre-commit", "mypy", "sourcery", "@types/.*", "types-.*"],
22+
"matchPackagePatterns": ["serde", "base64"],
23+
"groupName": "rust-stable",
24+
"automerge": true
25+
},
26+
{
27+
"matchPackagePatterns": ["eslint", "prettier", "ruff", "pretty_assertions", "pre-commit", "mypy", "sourcery", "@types/.*", "types-.*", "scss"],
2328
"groupName": "linting",
2429
"automerge": true
2530
},

webclient/.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ tsconfig.json
22
.output
33
.nuxt
44
node_modules
5+
pnpm-lock.yaml

webclient/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@nuxt/eslint": "0.3.10",
3636
"@nuxtjs/i18n": "8.3.1",
3737
"@nuxtjs/tailwindcss": "6.12.0",
38-
"@types/node": "20.12.7",
38+
"@types/node": "20.12.8",
3939
"@types/swagger-ui": "3.52.4",
4040
"@vue/tsconfig": "0.5.1",
4141
"autoprefixer": "10.4.19",

0 commit comments

Comments
 (0)