diff --git a/.idea/misc.xml b/.idea/misc.xml
index 399908725e98df33985c097a1987083c3b85a580..5c81ab34550c964a507a9b6f16d1d698a7cf8529 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,4 +4,7 @@
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
+ <component name="PyCharmProfessionalAdvertiser">
+ <option name="shown" value="true" />
+ </component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 66ee18d0a320f590103b135c72db561ade7ea1f0..46c367c1047c297eced2eed801f6ea7338c50af0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5c346737-53d8-4e87-88c5-7be2c8e7baeb" name="Default" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/unitgrade.egg-info/PKG-INFO" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade.egg-info/PKG-INFO" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/unitgrade/version.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade/version.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade.egg-info/SOURCES.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade.egg-info/SOURCES.txt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade.egg-info/dependency_links.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade.egg-info/dependency_links.txt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade.egg-info/requires.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade.egg-info/requires.txt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade.egg-info/top_level.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade.egg-info/top_level.txt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade/dashboard/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade/dashboard/app.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade/dashboard/app_helpers.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade/dashboard/app_helpers.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/unitgrade/dashboard/watcher.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/unitgrade/dashboard/watcher.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -363,12 +368,12 @@
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/src/unitgrade/framework.py</url>
- <line>103</line>
+ <line>118</line>
<option name="timeStamp" value="91" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/src/unitgrade/framework.py</url>
- <line>100</line>
+ <line>115</line>
<option name="timeStamp" value="92" />
</line-breakpoint>
</breakpoints>
diff --git a/src/unitgrade.egg-info/PKG-INFO b/src/unitgrade.egg-info/PKG-INFO
index f6f4c008d1f1b6359ba80c730231c88ea153dbc0..64b0ff861660ef4286e46c63de570a3d859b333b 100644
--- a/src/unitgrade.egg-info/PKG-INFO
+++ b/src/unitgrade.egg-info/PKG-INFO
@@ -7,7 +7,6 @@ Author: Tue Herlau
Author-email: tuhe@dtu.dk
License: MIT
Project-URL: Bug Tracker, https://lab.compute.dtu.dk/tuhe/unitgrade/issues
-Platform: UNKNOWN
Classifier: Programming Language :: Python :: 3
Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: OS Independent
@@ -191,4 +190,3 @@ Please contact me and we can discuss your specific concerns.
year={2022},
}
```
-
diff --git a/src/unitgrade.egg-info/requires.txt b/src/unitgrade.egg-info/requires.txt
index 26ed8c6de6d30b0a59f110956f35c47f6b5f9b64..88a0855ec923bfbf33400b03ac7380f248c54601 100644
--- a/src/unitgrade.egg-info/requires.txt
+++ b/src/unitgrade.egg-info/requires.txt
@@ -1,8 +1,8 @@
-colorama
-coverage
-importnb
numpy
-pyfiglet
-requests
tabulate
+pyfiglet
+coverage
+colorama
tqdm
+importnb
+requests
diff --git a/src/unitgrade/dashboard/app.py b/src/unitgrade/dashboard/app.py
index 0349c58f53ee2ddca3085063040268982d8a60a3..1e8bfd4ff22faa74d198bad23c4e1ec7d23e6050 100644
--- a/src/unitgrade/dashboard/app.py
+++ b/src/unitgrade/dashboard/app.py
@@ -117,6 +117,8 @@ def mkapp(base_dir="./"):
rs['local_base_dir_for_test_module'] = str(Path(*base))
rs['test_module'] = ".".join(db.get('modules'))
+
+ del rs['root_dir'] # Don't overwrite this one.
return rs
def select_report_file(json):
@@ -124,9 +126,13 @@ def mkapp(base_dir="./"):
for k, v in available_reports[json].items():
current_report[k] = v
+ print(f"{current_report['root_dir']=}")
+
for k, v in get_report_database().items():
current_report[k] = v
+ print(f"{current_report['root_dir']=}")
+
def mkempty(pattern, type):
fls = glob.glob(current_report['root_dir'] + pattern)
fls.sort(key=os.path.getmtime)
diff --git a/src/unitgrade/dashboard/app_helpers.py b/src/unitgrade/dashboard/app_helpers.py
index d0ec3ef947f5fee35bd8d543f8a3c92321eb55dc..90431791b7337fe98036777d7bb605d3618c0ded 100644
--- a/src/unitgrade/dashboard/app_helpers.py
+++ b/src/unitgrade/dashboard/app_helpers.py
@@ -1,25 +1,17 @@
#!/usr/bin/env python3
-from queue import Queue
-from threading import Lock
-import argparse
-import datetime
-import subprocess
-from flask import Flask, render_template
-from flask_socketio import SocketIO
-import pty
+# from queue import Queue
+# from threading import Lock
+# import argparse
+# import datetime
+# import subprocess
+# from flask import Flask, render_template
+# from flask_socketio import SocketIO
+# import pty
import os
-import subprocess
-import select
-import termios
-import struct
-import fcntl
-import shlex
-import logging
-import sys
import glob
from pupdb.core import PupDB
-from unitgrade_private.hidden_gather_upload import picklestring2dict
-from unitgrade_private.hidden_gather_upload import dict2picklestring, picklestring2dict
+# from unitgrade_private.hidden_gather_upload import picklestring2dict
+# from unitgrade_private.hidden_gather_upload import dict2picklestring, picklestring2dict
from pathlib import Path
def get_available_reports(jobfolder):
@@ -41,7 +33,13 @@ def get_available_reports(jobfolder):
base = lpath_full.parts[:-len(Path(report_py).parts)]
# rs['local_base_dir_for_test_module'] = str(Path(*base))
+ print("root_dir", base)
+ print(f"{lpath_full=}")
root_dir = str(Path(*base))
+ print(f"{root_dir=}")
+ print(f"{base=}")
+ print(f"{report_py=}")
+
token = report_py[:-3] + "_grade.py"
available_reports[f] = {'json': f,
'relative_path': report_py,
diff --git a/src/unitgrade/dashboard/watcher.py b/src/unitgrade/dashboard/watcher.py
index f8b9c3c0e4e1adc6ea94ce4badd760031015c2a9..5ff3413d11ef1eb7f87c750c5f484d07ef3c210b 100644
--- a/src/unitgrade/dashboard/watcher.py
+++ b/src/unitgrade/dashboard/watcher.py
@@ -18,6 +18,7 @@ class Watcher:
def run(self):
event_handler = Handler(self.watched_files_dictionary, self.watched_files_lock)
# directory = os.path.commonpath([os.path.dirname(f) for f in self.watched_files_dictionary.keys()])
+ print("self.base_directory", self.base_directory)
self.observer.schedule(event_handler, self.base_directory, recursive=True)
self.observer.start()