From 0bc09087f7d330a4b3d7015e008987c5e8e1f38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Mon, 17 Apr 2023 15:00:02 +0200
Subject: [PATCH] restructured for project packaging

---
 .../distance_batsim_output.py                       |  0
 swf.py => batmenTools/swf.py                        |  0
 .../swf2batsim_split_by_user.py                     |  2 +-
 swf_filter.py => batmenTools/swf_filter.py          |  2 +-
 pyproject.toml                                      | 13 +++++++++----
 test/test_distance.py                               |  4 +++-
 6 files changed, 14 insertions(+), 7 deletions(-)
 rename distance_batsim_output.py => batmenTools/distance_batsim_output.py (100%)
 rename swf.py => batmenTools/swf.py (100%)
 rename swf2batsim_split_by_user.py => batmenTools/swf2batsim_split_by_user.py (99%)
 rename swf_filter.py => batmenTools/swf_filter.py (99%)

diff --git a/distance_batsim_output.py b/batmenTools/distance_batsim_output.py
similarity index 100%
rename from distance_batsim_output.py
rename to batmenTools/distance_batsim_output.py
diff --git a/swf.py b/batmenTools/swf.py
similarity index 100%
rename from swf.py
rename to batmenTools/swf.py
diff --git a/swf2batsim_split_by_user.py b/batmenTools/swf2batsim_split_by_user.py
similarity index 99%
rename from swf2batsim_split_by_user.py
rename to batmenTools/swf2batsim_split_by_user.py
index 399499a..c2f3403 100755
--- a/swf2batsim_split_by_user.py
+++ b/batmenTools/swf2batsim_split_by_user.py
@@ -13,7 +13,7 @@ import datetime
 import os
 from math import ceil
 
-from swf import SwfField
+from batmenTools.swf import SwfField
 
 
 def generate_workload(input_swf, output_folder,
diff --git a/swf_filter.py b/batmenTools/swf_filter.py
similarity index 99%
rename from swf_filter.py
rename to batmenTools/swf_filter.py
index fbd043d..fe56ba6 100755
--- a/swf_filter.py
+++ b/batmenTools/swf_filter.py
@@ -9,7 +9,7 @@ import argparse
 import json
 import re
 
-from swf import SwfField
+from batmenTools.swf import SwfField
 
 
 def filter_workload(input_swf, output_swf=None,
diff --git a/pyproject.toml b/pyproject.toml
index f803424..257d22b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ build-backend = "flit_core.buildapi"
 requires = ["flit_core>=3.4"]
 
 [project]
-name = "batmen-tool"
+name = "batmenTools"
 version = "0.0.1"
 authors = [
   { name="Maƫl Madon", email="mael.madon@irit.fr" },
@@ -16,10 +16,15 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 
+dependencies = [
+    "pandas",
+    "numpy",
+]
+
 [project.urls]
 "gitlab" = "https://gitlab.irit.fr/sepia-pub/mael/batmen-tools"
 
 [project.scripts]
-swfFilter = "swf_filter:main"
-distance_batsim_output = "distance_batsim_output:main"
-swf2batsim_split_by_user = "swf2batsim_split_by_user:main"
\ No newline at end of file
+swfFilter = "batmenTools.swf_filter:main"
+distance_batsim_output = "batmenTools.distance_batsim_output:main"
+swf2batsim_split_by_user = "batmenTools.swf2batsim_split_by_user:main"
\ No newline at end of file
diff --git a/test/test_distance.py b/test/test_distance.py
index 0be21d0..c905bda 100644
--- a/test/test_distance.py
+++ b/test/test_distance.py
@@ -1,4 +1,6 @@
-from distance_batsim_output import *
+from batmenTools.distance_batsim_output import euclidean_distance, lateness_distance, distances
+import pandas as pd
+import numpy as np
 import pytest
 
 empty = pd.Series([], dtype="float64")
-- 
GitLab