Merge pull request #1276 from HanTeo/refactor/remove-db-assignments-db-students

remove db_assignments db_students

Author: jhamrick

nbgrader/apps/baseapp.py

@@ -222,8 +222,6 @@ def _load_config(self, cfg, **kwargs):
             ("autograded_directory", "autograded_directory"),
             ("feedback_directory", "feedback_directory"),
             ("db_url", "db_url"),
-            ("db_assignments", "db_assignments"),
-            ("db_students", "db_students"),
             ("course_directory", "root"),
             ("ignore", "ignore")
         ]

nbgrader/apps/quickstartapp.py

@@ -129,6 +129,19 @@ def start(self):
         os.chdir(currdir)
         with open(os.path.join(course_path, "nbgrader_config.py"), "r") as fh:
             config = fh.read()
+
+        subprocess.call([sys.executable, "-m", "nbgrader", "db", "assignment", "add", "ps1"], stdout=subprocess.PIPE,
+                        stderr=subprocess.STDOUT)
+        subprocess.call([sys.executable, "-m", "nbgrader", "db", "student", "add", "bitdiddle", "--first-name", "Ben",
+                         "--last-name", "Bitdiddle"],
+                        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        subprocess.call([sys.executable, "-m", "nbgrader", "db", "student", "add", "hacker", "--first-name", "Alyssa",
+                         "--last-name", "Hacker"],
+                        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        subprocess.call([sys.executable, "-m", "nbgrader", "db", "student", "add", "reasoner", "--first-name", "Louis",
+                         "--last-name", "Reasoner"],
+                        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
         with open(os.path.join(course_path, "nbgrader_config.py"), "w") as fh:
             fh.write("c = get_config()\n\n")
             fh.write("#" * 79 + "\n")
@@ -140,17 +153,6 @@ def start(self):
                 # server set up.
                 c.CourseDirectory.course_id = "{}"
 
-                # Update this list with other assignments you want
-                c.CourseDirectory.db_assignments = [dict(name="ps1")]
-
-                # Change the students in this list with that actual students in
-                # your course
-                c.CourseDirectory.db_students = [
-                    dict(id="bitdiddle", first_name="Ben", last_name="Bitdiddle"),
-                    dict(id="hacker", first_name="Alyssa", last_name="Hacker"),
-                    dict(id="reasoner", first_name="Louis", last_name="Reasoner")
-                ]
-
                 c.IncludeHeaderFooter.header = "source/header.ipynb"
                 """
             ).format(course_id))

nbgrader/converters/autograde.py

@@ -72,10 +72,6 @@ def init_assignment(self, assignment_id, student_id):
         # try to get the student from the database, and throw an error if it
         # doesn't exist
         student = {}
-        for s in self.coursedir.db_students:
-            if s['id'] == student_id:
-                student = s.copy()
-                break
 
         if student or self.create_student:
             if 'id' in student:

nbgrader/converters/generate_assignment.py

@@ -129,10 +129,6 @@ def init_assignment(self, assignment_id, student_id):
         # doesn't exist
         if not self.no_database:
             assignment = {}
-            for a in self.coursedir.db_assignments:
-                if a['name'] == assignment_id:
-                    assignment = a.copy()
-                    break
 
             if assignment or self.create_assignment:
                 if 'name' in assignment:

nbgrader/coursedir.py

@@ -190,39 +190,6 @@ def _db_url_default(self):
         return "sqlite:///{}".format(
             os.path.abspath(os.path.join(self.root, "gradebook.db")))
 
-    db_assignments = List(
-        help=dedent(
-            """
-            A list of assignments that will be created in the database. Each
-            item in the list should be a dictionary with the following keys:
-
-                - name
-                - duedate (optional)
-
-            The values will be stored in the database. Please see the API
-            documentation on the `Assignment` database model for details on
-            these fields.
-            """
-        )
-    ).tag(config=True)
-
-    db_students = List(
-        help=dedent(
-            """
-            A list of student that will be created in the database. Each
-            item in the list should be a dictionary with the following keys:
-
-                - id
-                - first_name (optional)
-                - last_name (optional)
-                - email (optional)
-
-            The values will be stored in the database. Please see the API
-            documentation on the `Student` database model for details on
-            these fields.
-            """
-        )
-    ).tag(config=True)
 
     root = Unicode(
         '',

nbgrader/docs/source/user_guide/managing_the_database.ipynb

@@ -50,23 +50,14 @@
    "source": [
     "Most of the important information that nbgrader has access to---information about students, assignments, grades, etc.---is stored in the nbgrader database. Much of this is added to the database automatically by nbgrader, with the exception of two types of information: which students are in your class, and which assignments you have.\n",
     "\n",
-    "There are three methods for adding students and assignments to the database. The first is by declaring them explicitly in the `nbgrader_config.py` file, such as:\n",
-    "\n",
-    "```python\n",
-    "c = get_config()\n",
-    "c.CourseDirectory.db_assignments = [dict(name=\"ps1\", duedate=\"2015-02-02 17:00:00 UTC\")]\n",
-    "c.CourseDirectory.db_students = [\n",
-    "    dict(id=\"bitdiddle\", first_name=\"Ben\", last_name=\"Bitdiddle\"),\n",
-    "    dict(id=\"hacker\", first_name=\"Alyssa\", last_name=\"Hacker\")\n",
-    "]\n",
-    "```"
+    "There are two methods for adding students and assignments to the database."
    ]
   },
   {
    "cell_type": "raw",
    "metadata": {},
    "source": [
-    "The second is by writing a Python script and using the :doc:`API </api/index>`. The third way is to use the command line tool ``nbgrader db``, which provides limited command line access to some of the API functionality."
+    "The first is by writing a Python script and using the :doc:`API </api/index>`. The second way is to use the command line tool ``nbgrader db``, which provides limited command line access to some of the API functionality."
    ]
   },
   {