otter-service-stdalone 1.1.9__py3-none-any.whl → 1.1.11__py3-none-any.whl

otter_service_stdalone/__init__.py

@@ -1 +1 @@
-__version__ = "1.1.9"
+__version__ = "1.1.11"

otter_service_stdalone/app.py

@@ -275,9 +275,9 @@ class Upload(BaseHandler):
             m = "Step 3A: Uploaded autograder.zip files written to disk - now checking otter version"
             log.write_logs(results_path, m, f"Results Code: {results_path}", "debug", log_debug)
             if not otter_version_correct(auto_p):
-                m = "Step 3A-1: autograder.zip is wrong version of otter-grader; must be > 5.5.0"
+                m = "Step 3A-1: autograder.zip is wrong version of otter-grader; must be >= 5.5.0"
                 log.write_logs(results_path, m, f"Results Code: {results_path}", "debug", log_debug)
-                m = "You need to make sure the autograder.zip uses otter-grader version >5.5.0. BUT you do not need "
+                m = "You need to make sure the autograder.zip uses otter-grader version >=5.5.0. BUT you do not need "
                 m += "to re-generate your autograder.zip; un-archive autograder.zip and change the version in either "
                 m += "requirements.txt or environmental.yaml depending on the version of otter-grader the autograder.zip "
                 m += "is created with."

otter_service_stdalone/grade_notebooks.py

@@ -1,7 +1,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
+from otter.grade import main as grade, loggers
 from multiprocessing import Process
 from tornado.ioloop import PeriodicCallback
 
@@ -49,6 +50,7 @@ class GradeNotebooks():
                            f"Notebook Folder: {notebook_folder}",
                            "debug",
                            log_debug)
+            loggers.set_level(logging.INFO)
             p = Process(target=grade,
                         kwargs = {
                             "name": "grader",

otter_service_stdalone/util.py

@@ -17,7 +17,7 @@ def is_version_5(zip_ref, target_file, reg):
 
 def otter_version_correct(autograder_path):
     requirements_regex = re.compile(r"otter-grader==([\d\.]+)")
-    environment_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
@@ -28,8 +28,8 @@ def otter_version_correct(autograder_path):
         env_target_file = None
         if 'requirements.txt' in file_list:
             req_target_file = 'requirements.txt'
-        if 'environment.yaml' in file_list:
-            env_target_file = 'environment.yaml'
+        if 'environment.yml' in file_list:
+            env_target_file = 'environment.yml'
 
         otter_in_req = is_version_5(zip_ref, req_target_file, requirements_regex)
         otter_in_env = is_version_5(zip_ref, env_target_file, environment_regex)

{otter_service_stdalone-1.1.9.dist-info → otter_service_stdalone-1.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.9
+Version: 1.1.11
 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.9.dist-info → otter_service_stdalone-1.1.11.dist-info}/RECORD

@@ -1,12 +1,12 @@
-otter_service_stdalone/__init__.py,sha256=lnHAM_YSOt5TvtAm4ZVs32T0TpsCQ5kOOznnQlur1YE,22
+otter_service_stdalone/__init__.py,sha256=onvMxIPKVCA4yl5UqyZ5erfVCfX2V2Tl84vB4lkYg0M,23
 otter_service_stdalone/access_sops_keys.py,sha256=nboU5aZ84Elrm5vO0dMgpIF5LLcnecpNAwpxKvj6DvU,2129
-otter_service_stdalone/app.py,sha256=X_u4V02uOiFBTwM9FR0bQjXK6YcsO3Jieuji-UBwgSw,15588
+otter_service_stdalone/app.py,sha256=uEuCKRa5_MFe591KcbWghyIn2YHeroi-9zGRyjSFY9I,15590
 otter_service_stdalone/fs_logging.py,sha256=IKFZkc5TmpI6G3vTYFAU9jDjQ-GT5aRxk8kdZ0h0kJE,2390
-otter_service_stdalone/grade_notebooks.py,sha256=s-nequcOnpsZD4aQeUx_EFbnfKurVj7J8oCTK6Dix1E,3596
+otter_service_stdalone/grade_notebooks.py,sha256=VPH7m2IIiioJIHMTMSTwI5CnCKaR9RkdkPOmj0suMcA,3664
 otter_service_stdalone/index.html,sha256=eEbFGxbV-plE5bAggGYHTv1q7yqoTN4kJbzL729uMmk,7276
 otter_service_stdalone/upload_handle.py,sha256=PbpQEyUIPKercJ9hegKwvxHBvSc9uylhIfwjvHybjs0,5061
 otter_service_stdalone/user_auth.py,sha256=L9Kfj1BsQttAteHhRn71IUY8WX9nvBy3MXVGq1yjTtE,4253
-otter_service_stdalone/util.py,sha256=ptsV1_W-IwpBVVk9oPJWNjaqdh8DJKWVpVqXHaQrUO0,1324
+otter_service_stdalone/util.py,sha256=FR2b_HXV7mrp7V5qytOULaTxcEh8S3gqZAgRNw_mTFs,1322
 otter_service_stdalone/scripts/web_socket.js,sha256=VYbwPE6is1BINQ9ToY1HS3I6VWWIVcpCi1sVmxaxdwg,6209
 otter_service_stdalone/secrets/gh_key.dev.yaml,sha256=ORUVDu8SDcv0OE2ThwROppeg7y8oLkJJbPTCMn0s5l0,1138
 otter_service_stdalone/secrets/gh_key.local.yaml,sha256=NtPXXyGf1iSgJ9Oa2ahvIEf_fcmflB3dwd3LWyCgxis,1138
@@ -15,8 +15,8 @@ otter_service_stdalone/secrets/gh_key.staging.yaml,sha256=cKVqj4dcwuz2LhXwMNQy_1
 otter_service_stdalone/static_files/README_DO_NOT_DISTRIBUTE.txt,sha256=eMqBa1du1u0c07fuG3Eu9DDHuixRTFEbiQwrlvAnL1Y,353
 otter_service_stdalone/static_templates/403.html,sha256=7eO3XQsEkl4nF8PEeFkLwCzGBfdZ3kkkeu_Kgpgbh0k,1440
 otter_service_stdalone/static_templates/500.html,sha256=t6DeEMp8piSWyBToHb_JpTrw3GStAHFrozlmeuXyamg,1421
-otter_service_stdalone-1.1.9.dist-info/METADATA,sha256=wKJrBRrfS6-09EtWyq6P4m1Ba7o5ltbat8UUhnyiOH8,1467
-otter_service_stdalone-1.1.9.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-otter_service_stdalone-1.1.9.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
-otter_service_stdalone-1.1.9.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
-otter_service_stdalone-1.1.9.dist-info/RECORD,,
+otter_service_stdalone-1.1.11.dist-info/METADATA,sha256=lrDfRaLD-zoD7JQD0cIrZVEPLwtV8xX_xVazKhLkc50,1468
+otter_service_stdalone-1.1.11.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+otter_service_stdalone-1.1.11.dist-info/entry_points.txt,sha256=cx447chuIEl8ly9jEoF5-2xNhaKsWcIMDdhUMH_00qQ,75
+otter_service_stdalone-1.1.11.dist-info/top_level.txt,sha256=6UP22fD4OhbLt23E01v8Kvjn44vPRbyTIg_GqMYL-Ng,23
+otter_service_stdalone-1.1.11.dist-info/RECORD,,

{otter_service_stdalone-1.1.9.dist-info → otter_service_stdalone-1.1.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any