Merge branch 'main' into course_titles

Author: jeflem

.gitignore

@@ -92,6 +92,8 @@ nbgrader/docs/source/user_guide/release/ps1/problem2.html
 nbgrader/docs/source/user_guide/source/header.html
 nbgrader/docs/source/user_guide/source/ps1/problem1.html
 nbgrader/docs/source/user_guide/source/ps1/problem2.html
+nbgrader/docs/source/user_guide/source/ps1_autotest/problem1.html
+nbgrader/docs/source/user_guide/source/ps1_autotest/problem2.html
 
 # components stuff
 node_modules

CHANGELOG.md

@@ -1,7 +1,5 @@
 A summary of changes to nbgrader.
 
-## 0.7.x
-
 <!-- <START NEW CHANGELOG ENTRY> -->
 
 ## 0.9.0a1
@@ -267,6 +265,8 @@ A summary of changes to nbgrader.
 
 [@brichet](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Abrichet+updated%3A2022-05-07..2022-06-28&type=Issues) | [@jhamrick](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Ajhamrick+updated%3A2022-05-07..2022-06-28&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Ajtpio+updated%3A2022-05-07..2022-06-28&type=Issues) | [@minrk](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Aminrk+updated%3A2022-05-07..2022-06-28&type=Issues) | [@perllaghu](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Aperllaghu+updated%3A2022-05-07..2022-06-28&type=Issues) | [@rkdarst](https://github.com/search?q=repo%3Ajupyter%2Fnbgrader+involves%3Arkdarst+updated%3A2022-05-07..2022-06-28&type=Issues)
 
+## 0.7.x
+
 ### 0.7.1
 
 The following PRs were merged for the 0.7.1 milestone:

demos/demo_multiple_classes/jupyterhub_config.py

@@ -101,8 +101,8 @@
         'user': 'grader-course101',
         'cwd': '/home/grader-course101',
         'environment': {
-            # specify formgrader as default landing page
-            'JUPYTERHUB_DEFAULT_URL': '/formgrader'
+            # specify lab as default landing page
+            'JUPYTERHUB_DEFAULT_URL': '/lab'
         },
         'api_token': '{{course101_token}}',
     },
@@ -116,8 +116,8 @@
         'user': 'grader-course123',
         'cwd': '/home/grader-course123',
         'environment': {
-            # specify formgrader as default landing page
-            'JUPYTERHUB_DEFAULT_URL': '/formgrader'
+            # specify lab as default landing page
+            'JUPYTERHUB_DEFAULT_URL': '/lab'
         },
         'api_token': '{{course123_token}}',
     },

demos/demo_one_class_multiple_graders/jupyterhub_config.py

@@ -65,8 +65,8 @@
         ],
         'user': 'grader-course101',
         'environment': {
-            # specify formgrader as default landing page
-            'JUPYTERHUB_DEFAULT_URL': '/formgrader'
+            # specify lab as default landing page
+            'JUPYTERHUB_DEFAULT_URL': '/lab'
         },
         'cwd': '/home/grader-course101',
     }

demos/formgrader_workspace.json

@@ -42,10 +42,6 @@ setup_nbgrader () {
     ${runas} mkdir -p "${HOME}/.jupyter"
     ${runas} cp "${config}" "${HOME}/.jupyter/nbgrader_config.py"
     ${runas} chown "${USER}:${USER}" "${HOME}/.jupyter/nbgrader_config.py"
-
-    cp "/root/formgrader_workspace.json" "${HOME}/formgrader_workspace.json"
-    chown "${USER}:${USER}" "${HOME}/formgrader_workspace.json"
-    ${runas} jupyter lab workspaces import "${HOME}/formgrader_workspace.json"
 }
 
 setup_jupyterhub () {

demos/utils.sh

@@ -9,7 +9,7 @@
                         DateTime, Interval, Float, Enum, UniqueConstraint,
                         Boolean, inspect, text)
 from sqlalchemy.orm import (sessionmaker, scoped_session, relationship,
-                            column_property, DeclarativeBase)
+                            column_property, declarative_base)
 from sqlalchemy.orm.exc import NoResultFound, FlushError
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.exc import IntegrityError, StatementError
@@ -25,8 +25,7 @@
 from .auth import Authenticator
 
 
-class Base(DeclarativeBase):
-    pass
+Base = declarative_base()
 
 
 def new_uuid() -> str:

nbgrader/api.py

@@ -2,10 +2,11 @@
 
 import sys
 
-from traitlets import default
+from traitlets import default, Bool
+from textwrap import dedent
 
 from .baseapp import NbGrader, nbgrader_aliases, nbgrader_flags
-from ..converters import BaseConverter, GenerateAssignment, NbGraderException
+from ..converters import BaseConverter, GenerateAssignment, NbGraderException, GenerateSourceWithTests
 from traitlets.traitlets import MetaHasTraits
 from typing import List, Any
 from traitlets.config.loader import Config
@@ -51,6 +52,12 @@
         {'BaseConverter': {'force': True}},
         "Overwrite an assignment/submission if it already exists."
     ),
+    'source_with_tests': (
+        {'GenerateAssignmentApp': {'source_with_tests': True}},
+        "Generate intermediate notebooks that contain both the autogenerated test code and the solutions. "
+        "Results will be saved in the source_with_tests/ folder. "
+        "This is useful for instructors to debug problematic autogenerated test code."
+    ),
 })
 
 
@@ -62,6 +69,17 @@ class GenerateAssignmentApp(NbGrader):
     aliases = aliases
     flags = flags
 
+    source_with_tests = Bool(
+        False,
+        help=dedent(
+            """
+            Generate intermediate notebooks that contain both the autogenerated test code and the solutions.
+            Results will be saved in the source_with_tests/ folder.
+            This is useful for instructors to debug issues in autogenerated test code.
+            """
+        )
+    ).tag(config=True)
+
     examples = """
         Produce the version of the assignment that is intended to be released to
         students. This performs several modifications to the original assignment:
@@ -112,7 +130,7 @@ class GenerateAssignmentApp(NbGrader):
     @default("classes")
     def _classes_default(self) -> List[MetaHasTraits]:
         classes = super(GenerateAssignmentApp, self)._classes_default()
-        classes.extend([BaseConverter, GenerateAssignment])
+        classes.extend([BaseConverter, GenerateAssignment, GenerateSourceWithTests])
         return classes
 
     def _load_config(self, cfg: Config, **kwargs: Any) -> None:
@@ -141,6 +159,14 @@ def start(self) -> None:
         elif len(self.extra_args) == 1:
             self.coursedir.assignment_id = self.extra_args[0]
 
+
+        if self.source_with_tests:
+            converter = GenerateSourceWithTests(coursedir=self.coursedir, parent=self)
+            try:
+                converter.start()
+            except NbGraderException:
+                sys.exit(1)
+
         converter = GenerateAssignment(coursedir=self.coursedir, parent=self)
         try:
             converter.start()

nbgrader/apps/generateassignmentapp.py

@@ -40,6 +40,15 @@
             """
         )
     ),
+    'autotest': (
+        {'QuickStartApp': {'autotest': True}},
+        dedent(
+            """
+            Create notebook assignments that have examples of automatic test generation via
+            ### AUTOTEST and ### HASHED AUTOTEST statements.
+            """
+        )
+    ),
 }
 
 class QuickStartApp(NbGrader):
@@ -73,6 +82,8 @@ class QuickStartApp(NbGrader):
 
     force = Bool(False, help="Whether to overwrite existing files").tag(config=True)
 
+    autotest = Bool(False, help="Whether to use automatic test generation in example files").tag(config=True)
+
     @default("classes")
     def _classes_default(self):
         classes = super(QuickStartApp, self)._classes_default()
@@ -115,12 +126,20 @@ def start(self):
         if not os.path.isdir(course_path):
             os.mkdir(course_path)
 
-        # populating it with an example
+        # populate it with an example
         self.log.info("Copying example from the user guide...")
         example = os.path.abspath(os.path.join(
             os.path.dirname(__file__), '..', 'docs', 'source', 'user_guide', 'source'))
-        ignore_html = shutil.ignore_patterns("*.html")
-        shutil.copytree(example, os.path.join(course_path, "source"), ignore=ignore_html)
+        if self.autotest:
+            tests_file_path = os.path.abspath(os.path.join(
+                os.path.dirname(__file__), '..', 'docs', 'source', 'user_guide', 'autotests.yml'))
+            shutil.copyfile(tests_file_path, os.path.join(course_path, 'autotests.yml'))
+            ignored_files = shutil.ignore_patterns("*.html", "ps1")
+            shutil.copytree(example, os.path.join(course_path, "source"), ignore=ignored_files)
+            os.rename(os.path.join(course_path, "source", "ps1_autotest"), os.path.join(course_path, "source", "ps1"))
+        else:
+            ignored_files = shutil.ignore_patterns("*.html", "autotests.yml", "ps1_autotest")
+            shutil.copytree(example, os.path.join(course_path, "source"), ignore=ignored_files)
 
         # create the config file
         self.log.info("Generating example config file...")

nbgrader/apps/quickstartapp.py

@@ -5,6 +5,7 @@
 from .feedback import Feedback
 from .generate_feedback import GenerateFeedback
 from .generate_solution import GenerateSolution
+from .generate_source_with_tests import GenerateSourceWithTests
 
 __all__ = [
     "BaseConverter",
@@ -14,5 +15,6 @@
     "Autograde",
     "Feedback",
     "GenerateFeedback",
-    "GenerateSolution"
+    "GenerateSolution",
+    "GenerateSourceWithTests"
 ]