Merge pull request #774 from jhamrick/config-options

Add missing config options

nbgrader/apps/baseapp.py

@@ -211,6 +211,17 @@ def _load_config(self, cfg, **kwargs):
             cfg.Exchange.merge(cfg.TransferApp)
             del cfg.TransferApp
 
+        if 'BaseNbConvertApp' in cfg:
+            self.log.warning(
+                "Use BaseConverter in config, not BaseNbConvertApp. Outdated config:\n%s",
+                '\n'.join(
+                    'BaseNbConvertApp.{key} = {value!r}'.format(key=key, value=value)
+                    for key, value in cfg.BaseNbConvertApp.items()
+                )
+            )
+            cfg.BaseConverter.merge(cfg.BaseNbConvertApp)
+            del cfg.BaseNbConvertApp
+
         super(NbGrader, self)._load_config(cfg, **kwargs)
         if self.coursedir:
             self.coursedir._load_config(cfg)

nbgrader/apps/nbgraderapp.py

@@ -15,6 +15,7 @@
 from .. import plugins
 from ..coursedir import CourseDirectory
 from .. import exchange
+from .. import converters
 from .baseapp import nbgrader_aliases, nbgrader_flags
 from . import (
     NbGrader,
@@ -266,6 +267,12 @@ def _classes_default(self):
             if hasattr(ex, "class_traits") and ex.class_traits(config=True):
                 classes.append(ex)
 
+        # include all the converters
+        for ex_name in converters.__all__:
+            ex = getattr(converters, ex_name)
+            if hasattr(ex, "class_traits") and ex.class_traits(config=True):
+                classes.append(ex)
+
         return classes
 
     @catch_config_error