otter-service-stdalone 1.1.21__tar.gz → 1.1.23__tar.gz

{otter_service_stdalone-1.1.21 → otter_service_stdalone-1.1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.21
+Version: 1.1.23
 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.23/src/otter_service_stdalone/__init__.py

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

{otter_service_stdalone-1.1.21 → otter_service_stdalone-1.1.23}/src/otter_service_stdalone/app.py

@@ -277,12 +277,13 @@ 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 >= 6.0.4"
                 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 += "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."
+                m = "If you are teaching Data 8, please get the latest autograder.zips from materials-sp22-private. "
+                m += "If you are NOT teaching Berkeley's Data 8, you need to make sure the autograder.zip uses "
+                m += "otter-grader version >=6.0.4; due to breaking changes in "
+                m += "otter-grader dependencies you need to run otter assign with otter-grader >= 6.0.4 to generate working "
+                m += "solution files(autograder.zips)."
                 self.render("index.html", message=m)
             else:
                 fh = open(notebooks_path, 'wb')

{otter_service_stdalone-1.1.21 → otter_service_stdalone-1.1.23}/src/otter_service_stdalone/util.py

@@ -2,7 +2,7 @@ import re
 import zipfile
 
 
-def is_version_5_or_greater(zip_ref, target_file, reg):
+def is_version_6_or_greater(zip_ref, target_file, reg):
     if target_file:
         with zip_ref.open(target_file) as file:
             content = file.read().decode('utf-8')
@@ -10,7 +10,7 @@ def is_version_5_or_greater(zip_ref, target_file, reg):
             if match:
                 version = match.group(2)
                 version_nums = version.split(".")
-                if len(version_nums) > 0 and int(version_nums[0]) >= 5:
+                if len(version_nums) >= 3 and int(version_nums[0]) >= 6 and int(version_nums[2]) >= 4:
                     return True
     return False
 
@@ -31,6 +31,6 @@ def otter_version_correct(autograder_path):
         if 'environment.yml' in file_list:
             env_target_file = 'environment.yml'
 
-        otter_in_req = is_version_5_or_greater(zip_ref, req_target_file, requirements_regex)
-        otter_in_env = is_version_5_or_greater(zip_ref, env_target_file, environment_regex)
+        otter_in_req = is_version_6_or_greater(zip_ref, req_target_file, requirements_regex)
+        otter_in_env = is_version_6_or_greater(zip_ref, env_target_file, environment_regex)
         return otter_in_req or otter_in_env

{otter_service_stdalone-1.1.21 → otter_service_stdalone-1.1.23}/src/otter_service_stdalone.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otter_service_stdalone
-Version: 1.1.21
+Version: 1.1.23
 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.21/src/otter_service_stdalone/__init__.py

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