Merge pull request #20 from convidev-tud/9-testsuite

9 testsuite

.gitignore

@@ -6,10 +6,14 @@ __pycache__/
 # C extensions
 *.so
 
+*.code-workspace
+
 tmp/
 env/
 *env/
-volume/
+volume/*
+!.gitkeep
+!volume/config.template.yaml
 
 test-config*
 config-*

deb_run.sh

@@ -23,4 +23,4 @@ echo preparing analysis
 ls -l
 
 source env/bin/activate
-python3 -W ignore main.py $1
+python3 -W ignore driftool/main.py $1

lib/analysis/analysis.py → driftool/analysis/analysis.py

@@ -17,13 +17,13 @@
 from sklearn.manifold import MDS
 import math
 
-from lib.data.pairwise_distance import PairwiseDistance, distance_avg
-from lib.analysis.repository_handler import RepositoryHandler
-from lib.data.measured_environment import MeasuredEnvironment
-from lib.analysis.csv_data import read_branches_from_csv, read_distances_from_csv
-from lib.data.sysconf import SysConf
-from lib.analysis.async_exec import async_execute
-from lib.data.config_file import ConfigFile
+from data.pairwise_distance import PairwiseDistance, distance_avg
+from analysis.repository_handler import RepositoryHandler
+from data.measured_environment import MeasuredEnvironment
+from analysis.csv_data import read_branches_from_csv, read_distances_from_csv
+from data.sysconf import SysConf
+from analysis.async_exec import async_execute
+from data.config_file import ConfigFile
 
 def calculate_median_distance_avg(embeddings: np.ndarray[float]) -> float:
     '''

lib/analysis/async_exec.py → driftool/analysis/async_exec.py

@@ -14,7 +14,7 @@
 
 import asyncio
 
-from lib.data.pairwise_distance import PairwiseDistance
+from data.pairwise_distance import PairwiseDistance
 
 
 def async_execute(threads: list[list[str]], reference_dir: str) -> list[tuple[str, str, PairwiseDistance]]:
@@ -45,7 +45,7 @@ def async_execute(threads: list[list[str]], reference_dir: str) -> list[tuple[st
 async def run(combinations: str, reference_dir: str):
         print("Async thread started, please wait...")
         proc = await asyncio.create_subprocess_shell(
-            "python thread.py " + combinations + " " + reference_dir,
+            "python driftool/thread.py " + combinations + " " + reference_dir,
             stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
 
         stdout, stderr = await proc.communicate()

lib/analysis/csv_data.py → driftool/analysis/csv_data.py

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from lib.data.pairwise_distance import PairwiseDistance
+from data.pairwise_distance import PairwiseDistance
 import csv 
 
 def read_branches_from_csv(csv_input_file: str) -> list[str]:

lib/analysis/plot.py → driftool/analysis/plot.py

@@ -13,7 +13,7 @@
 #  limitations under the License.
 
 from matplotlib import pyplot as plt
-from lib.data.measured_environment import MeasuredEnvironment
+from data.measured_environment import MeasuredEnvironment
 
 def visualise_embeddings(me: MeasuredEnvironment):
     '''

lib/analysis/repository_handler.py → driftool/analysis/repository_handler.py

@@ -22,8 +22,8 @@
 import re
 import stat
 
-from lib.data.pairwise_distance import PairwiseDistance
-from lib.analysis.directory import purge_blacklist, keep_whitelist
+from data.pairwise_distance import PairwiseDistance
+from analysis.directory import purge_blacklist, keep_whitelist
 
 class RepositoryHandler:
 

main.py → driftool/main.py

@@ -19,12 +19,12 @@
 
 from datetime import datetime
 
-from lib.data.measured_environment import MeasuredEnvironment
-from lib.data.config_file import ConfigFile
-from lib.data.sysconf import SysConf
-from lib.analysis.analysis import analyze_with_config
-from lib.analysis.plot import visualise_embeddings
-from lib.webview.render.renderer import render_html
+from data.measured_environment import MeasuredEnvironment
+from data.config_file import ConfigFile
+from data.sysconf import SysConf
+from analysis.analysis import analyze_with_config
+from analysis.plot import visualise_embeddings
+from webview.render.renderer import render_html
 
 
 if __name__ == '__main__':

thread.py → driftool/thread.py

@@ -14,8 +14,8 @@
 
 import sys
 
-from lib.analysis.analysis import calculate_partial_distance_relation
-from lib.analysis.repository_handler import RepositoryHandler
+from analysis.analysis import calculate_partial_distance_relation
+from analysis.repository_handler import RepositoryHandler
 
 argv = sys.argv[1:]
 

lib/webview/render/renderer.py → driftool/webview/render/renderer.py

@@ -17,8 +17,8 @@
 from io import StringIO
 import json
 
-from lib.data.measured_environment import MeasuredEnvironment
-from lib.data.distance import BranchDistance, BranchEnvironment
+from data.measured_environment import MeasuredEnvironment
+from data.distance import BranchDistance, BranchEnvironment
 
 
 def generate_branch_distance_map(me: MeasuredEnvironment) -> list[BranchEnvironment]:
@@ -52,7 +52,7 @@ def render_html(me: MeasuredEnvironment, report_title: str, branch_ignore: list[
     This template file contains placeholders for the data values.
     Data objects are preprocessed and passed to the tmplate engine
     '''
-    mytemplate = Template(filename='resources/report.template.html')
+    mytemplate = Template(filename='driftool/resources/report.template.html')
     buf = StringIO()
 
     sd_embeddings = (me.embedding_lines * 10).astype(int)

volume/config.template.yaml

@@ -0,0 +1,14 @@
+input_repository: volume/my-repository
+output_directory: volume/
+fetch_updates: false
+report_title: My Report
+print_plot: false
+html: true
+show_html: false
+simple_export: false
+branch_ignore:
+    - "^release\\-"
+    - "^v\\."
+blacklist: []
+whitelist:
+    - "\\.java"