From e708411ee5563238468d8d1e96f2ac11333dce3a Mon Sep 17 00:00:00 2001
From: Tue Herlau <tuhe@dtu.dk>
Date: Fri, 19 Jul 2024 14:52:00 +0200
Subject: [PATCH] updates
---
setup.py | 2 +-
src/coursebox/student_files/student_files.py | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/setup.py b/setup.py
index 18baff2..103b79a 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
setuptools.setup(
name="coursebox",
- version="0.1.20.5",
+ version="0.1.20.6",
author="Tue Herlau",
author_email="tuhe@dtu.dk",
description="A course management system currently used at DTU",
diff --git a/src/coursebox/student_files/student_files.py b/src/coursebox/student_files/student_files.py
index 7a9def4..69ada71 100644
--- a/src/coursebox/student_files/student_files.py
+++ b/src/coursebox/student_files/student_files.py
@@ -33,21 +33,21 @@ def setup_student_files(run_files=True,
from coursebox.core.info import class_information
# info = class_information()
from coursebox.core.info import core_conf
-<<<<<<< HEAD
+ # <<<<<<< HEAD
# if 'package' not in core_conf:
if len(core_conf['projects_all']) > 0:
PACKAGE = list(core_conf['projects_all'].values()).pop()['module_public'].split(".")[0]
else:
PACKAGE = [w for w in core_conf['weeks_all'].values() if 'module_public' in w][0]['module_public'].split(".")[0]
-=======
- try:
- if len(core_conf['projects_all']) > 0:
- PACKAGE = list(core_conf['projects_all'].values()).pop()['module_public'].split(".")[0]
- else:
- PACKAGE = list(core_conf['weeks_all'].values()).pop()['module_public'].split(".")[0]
- except Exception as e:
- PACKAGE = core_conf['package']
->>>>>>> 5f0cf05ea2c51749713d10331847fbe062613bab
+ # =======
+ # try:
+ # if len(core_conf['projects_all']) > 0:
+ # PACKAGE = list(core_conf['projects_all'].values()).pop()['module_public'].split(".")[0]
+ # else:
+ # PACKAGE = list(core_conf['weeks_all'].values()).pop()['module_public'].split(".")[0]
+ # except Exception as e:
+ # PACKAGE = core_conf['package']
+ # >>>>>>> 5f0cf05ea2c51749713d10331847fbe062613bab
if censor_files:
assert not run_files, "You cannot run files while you are censoring them -- your scripts will crash. Call with run_files=False."
--
GitLab