diff options
| -rw-r--r-- | settings.example.py | 2 | ||||
| -rw-r--r-- | worker/GitWorker.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/settings.example.py b/settings.example.py index 486e188..100a7f6 100644 --- a/settings.example.py +++ b/settings.example.py @@ -10,7 +10,7 @@ RUBRIC = { "indvFailSubmit": [-0.5, 'individual submit absence, -0.5'], "indvUntidy": [-0.25, 'individual branch untidy, -0.25'], "groupFailSubmit": [-2.5, 'group submit absence, -2.5'], - "groupUntidy": [-0.25, 'master branch untidy, -0.25'], + "groupUntidy": [-0.25, 'group submit untidy, -0.25'], "jojFailHomework": [-0.5, 'JOJ homework not passed, -0.5'], "jojFailExercise": [-0.25, 'JOJ exercise not passed, -0.25'], "jojFailCompile": [-1, 'JOJ fail to compile, -1'], diff --git a/worker/GitWorker.py b/worker/GitWorker.py index 0d49313..3914f3c 100644 --- a/worker/GitWorker.py +++ b/worker/GitWorker.py @@ -162,7 +162,7 @@ class GitWorker(): for _, stuName in self.hgroups[repoName]: scores[stuName]['groupFailSubmit'] = 1 scores[stuName]['groupComment'].append( - f"master branch h{hwNum} dir missing") + f"tags/h{hwNum} h{hwNum} dir missing") else: for fn, path in [(fn, os.path.join(hwDir, fn)) for fn in self.mandatoryFiles]: @@ -171,13 +171,13 @@ class GitWorker(): for _, stuName in self.hgroups[repoName]: scores[stuName]['groupFailSubmit'] = 1 scores[stuName]['groupComment'].append( - f"master branch h{hwNum}/{fn} missing") + f"tags/h{hwNum} h{hwNum}/{fn} missing") if not list(filter(GitWorker.isREADME, os.listdir(hwDir))): self.logger.warning(f"{repoName} h{hwNum}/README file missing") for _, stuName in self.hgroups[repoName]: scores[stuName]['groupFailSubmit'] = 1 scores[stuName]['groupComment'].append( - f"master branch h{hwNum}/README file missing") + f"tags/h{hwNum} h{hwNum}/README file missing") self.logger.debug(f"{repoName} checkout to tags/h{hwNum} succeed") if not tidy: return scores dirList = os.listdir(repoDir) @@ -191,7 +191,7 @@ class GitWorker(): for _, stuName in self.hgroups[repoName]: scores[stuName]['groupUntidy'] = 1 scores[stuName]['groupComment'].append( - f"master branch redundant files: {', '.join(dirList)}") + f"tags/h{hwNum} redundant files: {', '.join(dirList)}") if os.path.exists(hwDir): dirList = os.listdir(hwDir) dirList = list( @@ -204,7 +204,7 @@ class GitWorker(): for _, stuName in self.hgroups[repoName]: scores[stuName]['groupUntidy'] = 1 scores[stuName]['groupComment'].append( - f"master branch redundant files: {', '.join(dirList)}") + f"tags/h{hwNum} redundant files: {', '.join(dirList)}") return scores def checkProjProcess(self, id_, name, projNum, milestoneNum): |