setup.py

@@ -13,7 +13,11 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="coursebox",
+<<<<<<< HEAD
+    version="0.1.20.2",
+=======
     version="0.1.20.3",
+>>>>>>> 47e544f39ea04a5f82e9d153ffd8bd57a6f553e9
     author="Tue Herlau",
     author_email="tuhe@dtu.dk",
     description="A course management system currently used at DTU",

src/coursebox/material/documentation.py

@@ -92,6 +92,7 @@ def build_sphinx_documentation(cut_files=False, open_browser=True, build_and_cop
         x[k]['files'] = files
         # print(">>> k class is: ")
         # print(info_paths.core_conf['projects_all'][k])
+
         f = info_paths.core_conf['projects_all'][k]['class'].mfile()
         with open(f.split("_grade.py")[0], 'r') as ff:
             l = [l for l in ff.read().splitlines() if "(Report)" in l].pop().split("(")[0].split(" ")[-1]

src/coursebox/student_files/student_files.py

@@ -33,11 +33,20 @@ 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
+    try:
+        PACKAGE = list(core_conf['projects_all'].values()).pop()['module_public'].split(".")[0]
+    except Exception as e:
+        PACKAGE = core_conf['package']
+
+
+=======
     # 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 = list(core_conf['weeks_all'].values()).pop()['module_public'].split(".")[0]
+>>>>>>> 47e544f39ea04a5f82e9d153ffd8bd57a6f553e9
 
     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."