diff --git a/exercise_utils/test.py b/exercise_utils/test.py index 0653dd02..bed433c9 100644 --- a/exercise_utils/test.py +++ b/exercise_utils/test.py @@ -30,6 +30,7 @@ def __init__(self, repo: Repo, verbose: bool) -> None: def create_start_tag(self) -> None: # TODO: Reconsider if this should be inlined within repo-smith or separated out """Creates the Git-Mastery start tag.""" + assert self.repo is not None all_commits = list(self.repo.iter_commits()) first_commit = list(reversed(all_commits))[0] first_commit_hash = first_commit.hexsha[:7] diff --git a/hands_on/move_tags.py b/hands_on/move_tags.py index 5070427e..358aabca 100644 --- a/hands_on/move_tags.py +++ b/hands_on/move_tags.py @@ -1,5 +1,8 @@ import os -from exercise_utils.git import tag_with_options +from exercise_utils.git import ( + tag, + tag_with_options, +) from exercise_utils.github_cli import ( get_github_username, has_repo, @@ -27,5 +30,5 @@ def download(verbose: bool): clone_repo_with_gh(full_repo_name, verbose) os.chdir(LOCAL_DIR) - tag_with_options("v1.0", ["HEAD~1"], verbose) + tag("v1.0", verbose) tag_with_options("v0.9", ["HEAD~2", "-a", "-m", "First beta release"], verbose) diff --git a/sensors_checkout/.gitmastery-exercise.json b/sensors_checkout/.gitmastery-exercise.json index 1f91d7bd..5f5f4099 100644 --- a/sensors_checkout/.gitmastery-exercise.json +++ b/sensors_checkout/.gitmastery-exercise.json @@ -5,7 +5,9 @@ ], "requires_git": true, "requires_github": true, - "base_files": {}, + "base_files": { + "answers.txt": "answers.txt" + }, "exercise_repo": { "repo_type": "remote", "repo_name": "sensors", diff --git a/sensors_diff/res/answers.txt b/sensors_diff/res/answers.txt index 6219e379..504373e8 100644 --- a/sensors_diff/res/answers.txt +++ b/sensors_diff/res/answers.txt @@ -3,9 +3,14 @@ A: Q: Which are the new values in modified but unstaged files? A: +- ans1 +- ans2 Q: Which files have changed from Jan 09th to Jan 15th? A: +- ans1 +- ans2 +- ans3 Q: Which new values are new in north.csv on Jan 10th, compared to Jan 01st? A: diff --git a/sensors_diff/res/north.csv b/sensors_diff/res/north.csv index 93a6a925..0e1903d6 100644 --- a/sensors_diff/res/north.csv +++ b/sensors_diff/res/north.csv @@ -17,4 +17,4 @@ 5789 6940 1235 -8890 \ No newline at end of file +8890 diff --git a/sensors_diff/res/south.csv b/sensors_diff/res/south.csv index 60eabd43..ecad4984 100644 --- a/sensors_diff/res/south.csv +++ b/sensors_diff/res/south.csv @@ -17,4 +17,4 @@ 8745 4069 1592 -6831 \ No newline at end of file +6831 diff --git a/view_commits/verify.py b/view_commits/verify.py index 012a0a4b..2c17aa9b 100644 --- a/view_commits/verify.py +++ b/view_commits/verify.py @@ -12,8 +12,8 @@ QUESTION_ONE = "In February, who was replaced in the Wednesday duty roster?" QUESTION_TWO = "In February, who joined the Tuesday duty roster?" -QUESTION_THREE = "In April, what were the new names added to the duty rosters? Give the list of names as one line, separated by spaces." -QUESTION_FOUR = "In January, who were in the Tuesday duty roster? Give the list of names as one line, separated by spaces." +QUESTION_THREE = "In April, what were the new names added to the duty rosters? Remove/add extra rows where appropriate." +QUESTION_FOUR = "In January, who were in the Tuesday duty roster? Remove/add extra rows where appropriate." def verify(exercise: GitAutograderExercise) -> GitAutograderOutput: