diff --git a/setup.py b/setup.py index 98e942edd0c359b6c8629efbecf1625d7b1ee4e0..854990fa444293f331a6172acf1543c2baeed6d6 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ # Use pipreqs.exe to get requirements list. """ Windows> py -m build && twine upload dist/* -Linux> python -m build && twine upload dist/* +Linux> python -m build && python -m twine upload dist/* """ @@ -15,7 +15,7 @@ with open("README.md", "r", encoding="utf-8") as fh: # beamer-slider setuptools.setup( name="coursebox", - version="0.1.18.3", + version="0.1.18.5", 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 6c13ff80a7ee50f0c91fc71828c7d39338428983..5fd3021c5a6e9b787aeb41761e53d30f5ae6a26f 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.18.3 +Version: 0.1.18.5 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 b541f5e2f171e5efb895b6312c989a8ee9e43237..c3d81c1565a060c1a9315e76ba366bf0829fffff 100644 --- a/src/coursebox/core/info.py +++ b/src/coursebox/core/info.py @@ -97,7 +97,7 @@ def first_day_of_class(info): mo_first = datetime(year=year(), month=1 if semester() == 'spring' else 8, day=1, hour=13, minute=0) # scroll to monday while mo_first.weekday() != 0: #strftime('%A') is not 'Monday': - mo_first += timedelta(days=1) + mo_first -= timedelta(days=1) # add 4 weeks to get into 13 week period for _ in range(4): mo_first += timedelta(days=7) @@ -270,16 +270,19 @@ def get_forum(paths): def class_information(verbose=False, update_with_core_conf=False, # Whether to include (module) level core-conf items. Nearly always yes, but core is likely to include classes that are not easily pickled. so when 0xxxxprivate is excluded, this should be False. ): + paths = get_paths() + # print("Coursebox> Config file is", paths['information.xlsx']) if not os.path.isfile(paths['information.xlsx']): - print("Tried loading", paths['information.xlsx']) + # raise Exception() + print("Coursebox> Tried loading configuration file:", paths['information.xlsx']) cf = _info_cache_file() - print("Information configuration file not found. Loading from cache:", cf) + print("Coursebox> Information configuration file not found. Loading from cache:", cf) if not os.path.isfile(cf): raise Exception("No configuration found. Please set up configuration file at: " + paths['information.xlsx']) else: with open(cf, 'rb') as f: - print("Loaded cached configuration from", cf) + print("Coursebox> Loaded cached configuration from", cf) info = pickle.load(f) info = _update_with_core_conf(info) return info diff --git a/src/coursebox/student_files/student_files.py b/src/coursebox/student_files/student_files.py index 2a248f53914fa43225aa2959098150eab965094f..fe14b08578eff0c6532584311d7dde4ea25e266e 100644 --- a/src/coursebox/student_files/student_files.py +++ b/src/coursebox/student_files/student_files.py @@ -87,7 +87,7 @@ def setup_student_files(run_files=True, # 'lectures/chapter0pythonB', # 'lectures/chapter1', 'lectures', - 'workshop' + # 'workshop' ] import coursebox.core.info