diff --git a/.idea/unitgrade.iml b/.idea/unitgrade.iml index 31d9ea0beb90196fb36d7fcd08a2c2b2887a0fb4..176956ae5ff6d9e2731585672015ebc8437e3bf3 100644 --- a/.idea/unitgrade.iml +++ b/.idea/unitgrade.iml @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="PYTHON_MODULE" version="4"> <component name="NewModuleRootManager"> - <content url="file://$MODULE_DIR$" /> + <content url="file://$MODULE_DIR$/../snipper"> + <excludeFolder url="file://$MODULE_DIR$/../snipper" /> + </content> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + </content> <content url="file://$MODULE_DIR$/../unitgrade_private" /> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0c5ec36c45a0282c51b1e1a0e061dffedc0d043f..4b8adf39f2037cdbd1a4a69a667a07fd957b46f3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,10 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="5c346737-53d8-4e87-88c5-7be2c8e7baeb" name="Default" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/unitgrade.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/unitgrade.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cs101courseware_example/Report1_resources_do_not_hand_in.dat" beforeDir="false" afterPath="$PROJECT_DIR$/cs101courseware_example/Report1_resources_do_not_hand_in.dat" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cs101courseware_example/cs101report1_grade.py" beforeDir="false" afterPath="$PROJECT_DIR$/cs101courseware_example/cs101report1_grade.py" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/cs101courseware_example/cs101report2_grade.py" beforeDir="false" afterPath="$PROJECT_DIR$/cs101courseware_example/cs101report2_grade.py" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/unitgrade/unitgrade_helpers.py" beforeDir="false" afterPath="$PROJECT_DIR$/unitgrade/unitgrade_helpers.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/unitgrade/framework.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade/framework.py" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/unitgrade/version.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade/version.py" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -127,7 +126,7 @@ <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../snipper" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PythonContentEntriesConfigurable" /> @@ -270,11 +269,11 @@ </configuration> <list> <item itemvalue="Python.cs101report1" /> - <item itemvalue="Python.submission_autograder" /> - <item itemvalue="Python.shopSmart" /> - <item itemvalue="Python.fruit_project" /> - <item itemvalue="Python.deploy_cs101" /> <item itemvalue="Python.cs101report2" /> + <item itemvalue="Python.deploy_cs101" /> + <item itemvalue="Python.fruit_project" /> + <item itemvalue="Python.shopSmart" /> + <item itemvalue="Python.submission_autograder" /> </list> <recent_temporary> <list> diff --git a/src/unitgrade/framework.py b/src/unitgrade/framework.py index f1d16b8352f844202746bba3b81ef8523868afd4..5fb1520f55eb6432621c2b5c82100f913cea8074 100644 --- a/src/unitgrade/framework.py +++ b/src/unitgrade/framework.py @@ -89,7 +89,7 @@ class Report: total = time.time() - start q.time = total - def _setup_answers(self, with_coverage=False): + def _setup_answers(self, with_coverage=False, verbose=True): if with_coverage: for q, _ in self.questions: q._with_coverage = True @@ -98,7 +98,7 @@ class Report: q._setup_answers_mode = True from unitgrade import evaluate_report_student - evaluate_report_student(self, unmute=True) + evaluate_report_student(self, unmute=True,noprogress=not verbose) # self.main() # Run all tests in class just to get that out of the way... report_cache = {} diff --git a/src/unitgrade/version.py b/src/unitgrade/version.py index 272bafdb5017dfe3417cda6bcaa162ea26bc5754..676775cb56fc453c3f30dd8cb4559b0f2dbe70b9 100644 --- a/src/unitgrade/version.py +++ b/src/unitgrade/version.py @@ -1 +1 @@ -__version__ = "0.1.23" \ No newline at end of file +__version__ = "0.1.24" \ No newline at end of file