From 17697d7e353b28b73378438c85dd15214f52c630 Mon Sep 17 00:00:00 2001 From: Nuvole Date: Sat, 26 Oct 2024 15:43:43 +0800 Subject: [PATCH] fix: gradingreponame schema --- joj3_config_generator/lib/repo.py | 11 +++-------- tests/convert/basic/task.json | 8 ++++---- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/joj3_config_generator/lib/repo.py b/joj3_config_generator/lib/repo.py index e9a8d33..1c39a0c 100644 --- a/joj3_config_generator/lib/repo.py +++ b/joj3_config_generator/lib/repo.py @@ -1,5 +1,5 @@ import hashlib -import os +import socket import tempfile from dotenv import load_dotenv @@ -24,13 +24,8 @@ def get_temp_directory() -> str: def getGradingRepoName() -> str: - path = os.path.expanduser("~/.config/teapot/teapot.env") - if os.path.exists(path): - load_dotenv(path) - repo_name = os.environ.get("GITEA_ORG_NAME") - if repo_name is not None: - return f"{repo_name.split('-')[0]}-joj" - return "ece482-joj" + host_name = socket.gethostname() + return f"{host_name.split('-')[0]}-joj" def getTeapotConfig(repo_conf: Repo, task_conf: Task) -> TeapotConfig: diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index 0cc5ccf..4ffc375 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -18,7 +18,7 @@ "//repo-health-checker", + "0x7fc3921ab1a0>/repo-health-checker", "-root=.", "-repoSize=50.5", "-meta=main.py", @@ -71,8 +71,8 @@ "cpuRateLimit": 0, "cpuSetLimit": "", "copyIn": { - "//tmp/repo-checker-5xkj4dm4/repo-health-checker": { - "src": "//tmp/repo-checker-k3fmck15/repo-health-checker", + "//tmp/repo-checker-u3awlhwg/repo-health-checker": { + "src": "//tmp/repo-checker-mc0n0t1l/repo-health-checker", "content": null, "fileId": null, "name": null, @@ -1320,7 +1320,7 @@ "logPath": "h4-ex1-joint-teapot-debug.log", "scoreboardPath": "h4-ex1-scoreboard.csv", "failedTablePath": "h4-ex1-failed-table.md", - "gradingRepoName": "engr151-joj", + "gradingRepoName": "Nuvole-joj", "skipIssue": false, "skipScoreboard": false, "skipFailedTable": false