otter-service-stdalone 1.1.14__tar.gz → 1.1.16__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/PKG-INFO +1 -1
- otter_service_stdalone-1.1.16/src/otter_service_stdalone/__init__.py +1 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/util.py +5 -5
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone.egg-info/PKG-INFO +1 -1
- otter_service_stdalone-1.1.14/src/otter_service_stdalone/__init__.py +0 -1
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/README.md +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/pyproject.toml +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/setup.cfg +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/access_sops_keys.py +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/app.py +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/fs_logging.py +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/grade_notebooks.py +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/index.html +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/scripts/web_socket.js +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/secrets/gh_key.dev.yaml +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/secrets/gh_key.local.yaml +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/secrets/gh_key.prod.yaml +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/secrets/gh_key.staging.yaml +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/static_files/README_DO_NOT_DISTRIBUTE.txt +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/static_templates/403.html +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/static_templates/500.html +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/upload_handle.py +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/user_auth.py +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone.egg-info/SOURCES.txt +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone.egg-info/dependency_links.txt +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone.egg-info/entry_points.txt +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone.egg-info/top_level.txt +0 -0
- {otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/tests/test_upload_handle.py +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "1.1.16"
|
{otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/util.py
RENAMED
|
@@ -2,7 +2,7 @@ import re
|
|
|
2
2
|
import zipfile
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
def
|
|
5
|
+
def is_version_5_or_greater(zip_ref, target_file, reg):
|
|
6
6
|
if target_file:
|
|
7
7
|
with zip_ref.open(target_file) as file:
|
|
8
8
|
content = file.read().decode('utf-8')
|
|
@@ -16,8 +16,8 @@ def is_version_5(zip_ref, target_file, reg):
|
|
|
16
16
|
|
|
17
17
|
|
|
18
18
|
def otter_version_correct(autograder_path):
|
|
19
|
-
requirements_regex = re.compile(r"otter-grader
|
|
20
|
-
environment_regex = re.compile(r"otter-grader
|
|
19
|
+
requirements_regex = re.compile(r"(otter-grader)(\[[\w,]+\])?==([\d\.]+)")
|
|
20
|
+
environment_regex = re.compile(r"(otter-grader)(\[[\w,]+\])?==([\d\.]+)")
|
|
21
21
|
# Open the zip file
|
|
22
22
|
with zipfile.ZipFile(autograder_path, 'r') as zip_ref:
|
|
23
23
|
# Get a list of files in the zip
|
|
@@ -31,6 +31,6 @@ def otter_version_correct(autograder_path):
|
|
|
31
31
|
if 'environment.yml' in file_list:
|
|
32
32
|
env_target_file = 'environment.yml'
|
|
33
33
|
|
|
34
|
-
otter_in_req =
|
|
35
|
-
otter_in_env =
|
|
34
|
+
otter_in_req = is_version_5_or_greater(zip_ref, req_target_file, requirements_regex)
|
|
35
|
+
otter_in_env = is_version_5_or_greater(zip_ref, env_target_file, environment_regex)
|
|
36
36
|
return otter_in_req or otter_in_env
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "1.1.14"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{otter_service_stdalone-1.1.14 → otter_service_stdalone-1.1.16}/src/otter_service_stdalone/app.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|