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 399499aa703044e61d6214358d271d9ff5e785ab..c2f3403d771d377a40efe5249ad907b1c5443e35 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 fbd043dbb4a249f09023f37e064011e30bbe1df4..fe56ba6ec40aa3f134dd6e953fd37c03fd99e015 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 f803424a3ea2dcd9b9b9669127a3fdf4c50ceb76..257d22b4bebd5f28cbdf8d6b0991aff41b626ddc 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 0be21d0cba34cedd1bbcc4c2a773813c3b32cd0d..c905bda323b0af9da19d3923e7527bf13467d4d5 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")