diff --git a/setup.py b/setup.py index b8728b1678822f8e48b2d61025d3300f721d22d5..60825aa0cd5413b825dd4fc584cef8477005b6c2 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.19.6", + version="0.1.19.7", author="Tue Herlau", author_email="tuhe@dtu.dk", description="A course management system currently used at DTU", diff --git a/src/coursebox.egg-info/PKG-INFO b/src/coursebox.egg-info/PKG-INFO index 9308c52893204fe82071e6771b2662bc53558b40..00f24e8b321e7611d65ee037ad1a14bec306d937 100644 --- a/src/coursebox.egg-info/PKG-INFO +++ b/src/coursebox.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: coursebox -Version: 0.1.19.5 +Version: 0.1.19.7 Summary: A course management system currently used at DTU Home-page: https://lab.compute.dtu.dk/tuhe/coursebox Author: Tue Herlau diff --git a/src/coursebox/core/info.py b/src/coursebox/core/info.py index 9ccfaf1a9f62d13dc80724825ba4ed5db19bcb73..2eb65c5d9c987fb449473e9faa16f0cf992cc7aa 100644 --- a/src/coursebox/core/info.py +++ b/src/coursebox/core/info.py @@ -398,9 +398,7 @@ def class_information(verbose=False, nd = d['lectures'][r-1]['date'] + timedelta(days=int(d['handin_day_delta'])) ri['date'] = nd ri['html'] = f"{nd.day} {nd.strftime('%b')}" - ri = {**ri, **date2format(nd)} - d['reports_info'][k] = ri diff --git a/src/coursebox/material/documentation.py b/src/coursebox/material/documentation.py index 9b9dff5b5cfcec84ad539e25024fb1196ce101e1..40c0fdaa9efc58816092d6c16118b788f61426a9 100644 --- a/src/coursebox/material/documentation.py +++ b/src/coursebox/material/documentation.py @@ -426,6 +426,7 @@ def fix_all_shared_files(paths=None, dosvg=False,compile_templates=True, verbose if os.path.isdir(out): # I feel we need to convert the SVG images? fix_shared(paths, out, pdf2png=dosvg, dosvg=dosvg, compile_templates=compile_templates, verbose=verbose) # , dosvg=dosvg <--- please update coursebox (script broken as is) - + else: + print("Coursebox> No documentation shared directory. This is very, very odd indeed. I am stopping now. ") diff --git a/src/coursebox/student_files/student_files.py b/src/coursebox/student_files/student_files.py index ef310ac719f75d0e1988cc17bffc254f9d6747fb..5d9c782c431761293905df0c9c03031515fa926f 100644 --- a/src/coursebox/student_files/student_files.py +++ b/src/coursebox/student_files/student_files.py @@ -72,9 +72,10 @@ def setup_student_files(run_files=True, censor_file(init_dest) # Check for exclusion mask. - exclude = info_paths.core_conf.get('student_files', {}).get('exclude', []) + exclude = list( info_paths.core_conf.get('student_files', {}).get('exclude', []) ) + if extra_dirs is None: - extra_dirs = info_paths.core_conf.get('student_files', {}).get('extra_dirs', []) + extra_dirs = list(info_paths.core_conf.get('student_files', {}).get('extra_dirs', [])) print("Extra dirs are", extra_dirs) exclude += [f'tests_week{w if w >= 10 else f"0{w}"}.py' for w in range(0,14) if w not in week] @@ -222,6 +223,10 @@ def fix_hw(paths, info, hw, out, output_dir, run_files=False, cut_files=False, c run_files=run_files, cut_files=cut_files, license_head=info.get('code_copyright', None), censor_files=censor_files,verbose=verbose,package_base_dir=package_base_dir) + if "tests" in hw['base']: + print(hw) + print("Doing the base.") + if include_solutions: wk = hw['base'].split("/")[-1] sp = paths['02450students'] + "/solutions/"