fixing problems

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.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: coursebox
-Version: 0.1.20.1
+Version: 0.1.20.3
 Summary: A course management system currently used at DTU
 Home-page: https://lab.compute.dtu.dk/tuhe/coursebox
 Author: Tue Herlau

src/coursebox/student_files/student_files.py

@@ -23,22 +23,30 @@ def setup_student_files(run_files=True,
                         midterms=None, # Can be a list: [0, 1]
                         include_docs=False, # Include the documentation directory, i.e. 02465public/src/docs.
                         convert_svg=True, # Whether to convert SVG file when deploying. Leave to true, unless we are doing CI/CD in which case inkscape may not be installed.
-                        package="cp",
+                        # package="cp",
                         # fix_shared_files_func=None,
                         ):
 
     if midterms is None:
         midterms = []
     from coursebox.core import info_paths
-    # from coursebox.core.info import class_information
+    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."
@@ -162,8 +170,6 @@ def setup_student_files(run_files=True,
 
     if len(hws) >  0:
         info = class_information(verbose=verbose)
-        # print("references") # Bad idea because of the very long output.
-        # print(info['references']['commands'])
     else:
         info = None
     for hw in hws: