Rename e2xgrader_base_app to e2xcore

e2xgrader/server_extensions/apps/assignment_list/assignmentlist.py

@@ -1,4 +1,4 @@
-from e2xgrader_base_app import BaseApp
+from e2xcore import BaseApp
 
 from .handlers import default_handlers
 

e2xgrader/server_extensions/apps/authoring/apihandlers.py

@@ -1,6 +1,7 @@
 import json
 import os
 
+from e2xcore import urljoin
 from jupyter_client.kernelspec import KernelSpecManager
 from nbgrader.server_extensions.formgrader.base import check_xsrf
 from tornado import web
@@ -14,9 +15,9 @@
     TaskPoolModel,
     TemplateModel,
 )
-from e2xgrader.utils import NotebookVariableExtractor, urljoin
 
 from ..e2xgraderapi.base import E2xApiHandler
+from .notebookvariableextractor import NotebookVariableExtractor
 
 
 class BaseApiManageHandler(E2xApiHandler):

e2xgrader/server_extensions/apps/authoring/authoring.py

@@ -1,6 +1,6 @@
 import os
 
-from e2xgrader_base_app import BaseApp
+from e2xcore import BaseApp
 from nbgrader.apps.baseapp import NbGrader
 from tornado import web
 

e2xgrader/server_extensions/apps/authoring/handlers.py

@@ -1,6 +1,7 @@
 import os
 import sys
 
+from e2xcore import urljoin
 from nbgrader.server_extensions.formgrader.base import (
     BaseHandler,
     check_notebook_dir,
@@ -9,7 +10,6 @@
 from tornado import web
 
 from e2xgrader.models import ExerciseModel, TaskPoolModel, TemplateModel
-from e2xgrader.utils import urljoin
 
 app_url = urljoin("e2x", "authoring", "app")
 

e2xgrader/server_extensions/apps/authoring/notebookvariableextractor.py

@@ -0,0 +1,16 @@
+import re
+
+import nbformat
+
+
+class NotebookVariableExtractor:
+    def __init__(self):
+        self.__pattern = re.compile(r"{{\s*(\w+)\s*}}")
+
+    def extract(self, nb_path):
+        nb = nbformat.read(nb_path, as_version=4)
+        variables = []
+        for cell in nb.cells:
+            source = cell.source
+            variables.extend(self.__pattern.findall(source))
+        return variables

e2xgrader/server_extensions/apps/e2xgraderapi/e2xgraderapi.py

@@ -1,6 +1,6 @@
 import os
 
-from e2xgrader_base_app import BaseApp
+from e2xcore import BaseApp
 from nbgrader.apps.baseapp import NbGrader
 
 from .apihandlers import default_handlers

e2xgrader/server_extensions/apps/formgrader/formgrader.py

@@ -1,6 +1,6 @@
 import os
 
-from e2xgrader_base_app import BaseApp
+from e2xcore import BaseApp
 from nbgrader.apps.baseapp import NbGrader
 from nbgrader.server_extensions.formgrader import handlers as nbgrader_handlers
 from tornado import web

e2xgrader/server_extensions/apps/formgrader/handlers.py

@@ -1,5 +1,6 @@
 import os
 
+from e2xcore import format_url
 from nbgrader.api import MissingEntry
 from nbgrader.server_extensions.formgrader.base import (
     BaseHandler,
@@ -11,8 +12,6 @@
 )
 from tornado import web
 
-from e2xgrader.utils import format_url
-
 
 class ExportGradesHandler(BaseHandler):
     @web.authenticated

e2xgrader/server_extensions/apps/nbgraderapi/nbgraderapi.py

@@ -1,6 +1,6 @@
 import os
 
-from e2xgrader_base_app import BaseApp
+from e2xcore import BaseApp
 from nbgrader.apps.baseapp import NbGrader
 from nbgrader.server_extensions.formgrader.apihandlers import default_handlers
 

e2xgrader/server_extensions/apps/validate_assignment/validateassignment.py

@@ -1,4 +1,4 @@
-from e2xgrader_base_app import BaseApp
+from e2xcore import BaseApp
 
 from .handlers import default_handlers
 

pyproject.toml

@@ -20,7 +20,7 @@ classifiers=[
     "Programming Language :: Python :: 3.9",
 ]
 dependencies = [
-    "e2xgrader_base_app",
+    "e2xcore",
     "nbgrader==0.7.*",
     "nbconvert>=6.5",
     "notebook>=6,<7",