otter-service-stdalone 1.1.16__tar.gz → 1.1.18__tar.gz

{otter_service_stdalone-1.1.16 → otter_service_stdalone-1.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.16
+Version: 1.1.18
 Summary: Grading Service for Instructors using Otter Grader
 Home-page: https://github.com/sean-morris/otter-service-stdalone
 Author: Sean Morris

otter_service_stdalone-1.1.18/src/otter_service_stdalone/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.1.18"

{otter_service_stdalone-1.1.16 → otter_service_stdalone-1.1.18}/src/otter_service_stdalone/grade_notebooks.py

@@ -2,7 +2,8 @@ import asyncio
 import logging
 from otter_service_stdalone import fs_logging as log, upload_handle as uh
 import os
-from otter.grade import main as grade, loggers
+from otter.grade import main as grade
+from otter import logging as loggers
 from multiprocessing import Process
 from tornado.ioloop import PeriodicCallback
 

{otter_service_stdalone-1.1.16 → otter_service_stdalone-1.1.18}/src/otter_service_stdalone/util.py

@@ -8,7 +8,7 @@ def is_version_5_or_greater(zip_ref, target_file, reg):
             content = file.read().decode('utf-8')
             match = reg.search(content)
             if match:
-                version = match.group(1)
+                version = match.group(2)
                 version_nums = version.split(".")
                 if len(version_nums) > 0 and int(version_nums[0]) >= 5:
                     return True
@@ -16,8 +16,8 @@ def is_version_5_or_greater(zip_ref, target_file, reg):
 
 
 def otter_version_correct(autograder_path):
-    requirements_regex = re.compile(r"(otter-grader)(\[[\w,]+\])?==([\d\.]+)")
-    environment_regex = re.compile(r"(otter-grader)(\[[\w,]+\])?==([\d\.]+)")
+    requirements_regex = re.compile(r"otter-grader(\[.*?\])?==([\d.]+)")
+    environment_regex = re.compile(r"otter-grader(\[.*?\])?==([\d.]+)")
     # Open the zip file
     with zipfile.ZipFile(autograder_path, 'r') as zip_ref:
         # Get a list of files in the zip

{otter_service_stdalone-1.1.16 → otter_service_stdalone-1.1.18}/src/otter_service_stdalone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.16
+Version: 1.1.18
 Summary: Grading Service for Instructors using Otter Grader
 Home-page: https://github.com/sean-morris/otter-service-stdalone
 Author: Sean Morris

otter_service_stdalone-1.1.16/src/otter_service_stdalone/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.1.16"