diff --git a/bin/__init__.py b/diva_evaluation_cli/__init__.py similarity index 100% rename from bin/__init__.py rename to diva_evaluation_cli/__init__.py diff --git a/src/__init__.py b/diva_evaluation_cli/bin/__init__.py similarity index 100% rename from src/__init__.py rename to diva_evaluation_cli/bin/__init__.py diff --git a/bin/actev_command.py b/diva_evaluation_cli/bin/actev_command.py similarity index 100% rename from bin/actev_command.py rename to diva_evaluation_cli/bin/actev_command.py diff --git a/bin/actev_design_chunks.py b/diva_evaluation_cli/bin/actev_design_chunks.py similarity index 90% rename from bin/actev_design_chunks.py rename to diva_evaluation_cli/bin/actev_design_chunks.py index 3e05d343f118a09476da944a02fcbf2ac958551d..cc80e16a7b5c27f744f158d1aa468402cd87599e 100644 --- a/bin/actev_design_chunks.py +++ b/diva_evaluation_cli/bin/actev_design_chunks.py @@ -15,8 +15,8 @@ video-per-chunk : number of videos in the chunk Warning: this file should not be modified: see src/entry_points to add your source code. """ -from bin.actev_command import ActevCommand -from src.entry_points.actev_design_chunks import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_design_chunks import entry_point class ActevDesignChunks(ActevCommand): diff --git a/bin/actev_experiment_cleanup.py b/diva_evaluation_cli/bin/actev_experiment_cleanup.py similarity index 84% rename from bin/actev_experiment_cleanup.py rename to diva_evaluation_cli/bin/actev_experiment_cleanup.py index 22202692881ed5b4735ec2eff09b04270647da46..4995799217a50e38ca57aef781bca5c2bb59b85f 100644 --- a/bin/actev_experiment_cleanup.py +++ b/diva_evaluation_cli/bin/actev_experiment_cleanup.py @@ -10,8 +10,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_experiment_cleanup import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_experiment_cleanup import entry_point class ActevExperimentCleanup(ActevCommand): diff --git a/bin/actev_experiment_init.py b/diva_evaluation_cli/bin/actev_experiment_init.py similarity index 91% rename from bin/actev_experiment_init.py rename to diva_evaluation_cli/bin/actev_experiment_init.py index 0e0780a49494b07624c1539dc090fd51f44ef1d9..4e64be518b9cb05c6dd863ad911a347e39a0284e 100644 --- a/bin/actev_experiment_init.py +++ b/diva_evaluation_cli/bin/actev_experiment_init.py @@ -19,8 +19,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_experiment_init import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_experiment_init import entry_point class ActevExperimentInit(ActevCommand): diff --git a/bin/actev_merge_chunks.py b/diva_evaluation_cli/bin/actev_merge_chunks.py similarity index 89% rename from bin/actev_merge_chunks.py rename to diva_evaluation_cli/bin/actev_merge_chunks.py index c9fdf78b2fb5858489b6888f49913873df85853b..145cc1c0cbcdf065843c3090cfe574ad0de29741 100644 --- a/bin/actev_merge_chunks.py +++ b/diva_evaluation_cli/bin/actev_merge_chunks.py @@ -13,8 +13,8 @@ output_file: path to the output file generated Warning: this file should not be modified: see src/entry_points to add your source code. """ -from bin.actev_command import ActevCommand -from src.entry_points.actev_merge_chunks import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_merge_chunks import entry_point class ActevMergeChunks(ActevCommand): diff --git a/bin/actev_post_process_chunk.py b/diva_evaluation_cli/bin/actev_post_process_chunk.py similarity index 84% rename from bin/actev_post_process_chunk.py rename to diva_evaluation_cli/bin/actev_post_process_chunk.py index 75cb1679592d4403acf416ac090612d62b6ed96e..3ada3aeaa6976aefc7ebddd3c70670d17ad5d79d 100644 --- a/bin/actev_post_process_chunk.py +++ b/diva_evaluation_cli/bin/actev_post_process_chunk.py @@ -14,8 +14,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_post_process_chunk import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_post_process_chunk import entry_point class ActevPostProcessChunk(ActevCommand): diff --git a/bin/actev_pre_process_chunk.py b/diva_evaluation_cli/bin/actev_pre_process_chunk.py similarity index 84% rename from bin/actev_pre_process_chunk.py rename to diva_evaluation_cli/bin/actev_pre_process_chunk.py index 1c19405c4444cd0c22753132b6b9f1ba611371cc..9ac50763f7302e2b57d472e6165654504a31d482 100644 --- a/bin/actev_pre_process_chunk.py +++ b/diva_evaluation_cli/bin/actev_pre_process_chunk.py @@ -14,8 +14,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_pre_process_chunk import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_pre_process_chunk import entry_point class ActevPreProcessChunk(ActevCommand): diff --git a/bin/actev_process_chunk.py b/diva_evaluation_cli/bin/actev_process_chunk.py similarity index 84% rename from bin/actev_process_chunk.py rename to diva_evaluation_cli/bin/actev_process_chunk.py index 91b74946494904069d83a816063b010688000f08..30194e4e2a449a3b9aea7a834510fc36530f8d37 100644 --- a/bin/actev_process_chunk.py +++ b/diva_evaluation_cli/bin/actev_process_chunk.py @@ -14,8 +14,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_process_chunk import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_process_chunk import entry_point class ActevProcessChunk(ActevCommand): diff --git a/bin/actev_reset_chunk.py b/diva_evaluation_cli/bin/actev_reset_chunk.py similarity index 85% rename from bin/actev_reset_chunk.py rename to diva_evaluation_cli/bin/actev_reset_chunk.py index 78c0d6b3c46c9068353ecb303b073c6101d6e879..e5d5903156edec8d90c0423a22ae07189c1d22a4 100644 --- a/bin/actev_reset_chunk.py +++ b/diva_evaluation_cli/bin/actev_reset_chunk.py @@ -14,8 +14,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_process_chunk import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_process_chunk import entry_point class ActevResetChunk(ActevCommand): diff --git a/bin/actev_system_setup.py b/diva_evaluation_cli/bin/actev_system_setup.py similarity index 83% rename from bin/actev_system_setup.py rename to diva_evaluation_cli/bin/actev_system_setup.py index 9dffe0783bf720c09c8e0a5e03051e5fb085e42e..c8edb1c382e61034b25c0d693dda2cbb30c840d4 100644 --- a/bin/actev_system_setup.py +++ b/diva_evaluation_cli/bin/actev_system_setup.py @@ -10,8 +10,8 @@ Warning: this file should not be modified: see src/entry_points to add your sour """ import logging -from bin.actev_command import ActevCommand -from src.entry_points.actev_system_setup import entry_point +from diva_evaluation_cli.bin.actev_command import ActevCommand +from diva_evaluation_cli.src.entry_points.actev_system_setup import entry_point class ActevSystemSetup(ActevCommand): diff --git a/bin/cli.py b/diva_evaluation_cli/bin/cli.py similarity index 67% rename from bin/cli.py rename to diva_evaluation_cli/bin/cli.py index 007d28cb096d055f8e6f681496e72c11ad3c3fcf..54986cee5c04e4e2333dd67e014913eaa2890cc1 100644 --- a/bin/cli.py +++ b/diva_evaluation_cli/bin/cli.py @@ -20,14 +20,14 @@ Warning: this file should not be modified: see src/entry_points to add your sour import logging import argparse -from bin.actev_system_setup import ActevSystemSetup -from bin.actev_design_chunks import ActevDesignChunks -from bin.actev_experiment_init import ActevExperimentInit -from bin.actev_pre_process_chunk import ActevPreProcessChunk -from bin.actev_process_chunk import ActevProcessChunk -from bin.actev_post_process_chunk import ActevPostProcessChunk -from bin.actev_experiment_cleanup import ActevExperimentCleanup -from bin.actev_merge_chunks import ActevMergeChunks +from diva_evaluation_cli.bin.actev_system_setup import ActevSystemSetup +from diva_evaluation_cli.bin.actev_design_chunks import ActevDesignChunks +from diva_evaluation_cli.bin.actev_experiment_init import ActevExperimentInit +from diva_evaluation_cli.bin.actev_pre_process_chunk import ActevPreProcessChunk +from diva_evaluation_cli.bin.actev_process_chunk import ActevProcessChunk +from diva_evaluation_cli.bin.actev_post_process_chunk import ActevPostProcessChunk +from diva_evaluation_cli.bin.actev_experiment_cleanup import ActevExperimentCleanup +from diva_evaluation_cli.bin.actev_merge_chunks import ActevMergeChunks subcommands = [ ActevSystemSetup(), diff --git a/src/entry_points/__init__.py b/diva_evaluation_cli/src/__init__.py similarity index 100% rename from src/entry_points/__init__.py rename to diva_evaluation_cli/src/__init__.py diff --git a/src/clean_up.sh b/diva_evaluation_cli/src/clean_up.sh similarity index 100% rename from src/clean_up.sh rename to diva_evaluation_cli/src/clean_up.sh diff --git a/src/design_chunks.py b/diva_evaluation_cli/src/design_chunks.py similarity index 100% rename from src/design_chunks.py rename to diva_evaluation_cli/src/design_chunks.py diff --git a/diva_evaluation_cli/src/entry_points/__init__.py b/diva_evaluation_cli/src/entry_points/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/entry_points/actev_design_chunks.py b/diva_evaluation_cli/src/entry_points/actev_design_chunks.py similarity index 85% rename from src/entry_points/actev_design_chunks.py rename to diva_evaluation_cli/src/entry_points/actev_design_chunks.py index c9218d7ad5c370d6760c4f0ae0a28280678171fc..d9fb2208f839e0fec7176e8221c68644bd8468bc 100644 --- a/src/entry_points/actev_design_chunks.py +++ b/diva_evaluation_cli/src/entry_points/actev_design_chunks.py @@ -6,7 +6,7 @@ Implements the entry-point by using Python or any other languages. import argparse import json -from src.design_chunks import design_chunks +from diva_evaluation_cli.src.design_chunks import design_chunks def entry_point(file_index, activity_index, output, videos_per_chunk): """ Method to complete: you have to raise an exception if an error occured in the program. diff --git a/src/entry_points/actev_experiment_cleanup.py b/diva_evaluation_cli/src/entry_points/actev_experiment_cleanup.py similarity index 100% rename from src/entry_points/actev_experiment_cleanup.py rename to diva_evaluation_cli/src/entry_points/actev_experiment_cleanup.py diff --git a/src/entry_points/actev_experiment_init.py b/diva_evaluation_cli/src/entry_points/actev_experiment_init.py similarity index 100% rename from src/entry_points/actev_experiment_init.py rename to diva_evaluation_cli/src/entry_points/actev_experiment_init.py diff --git a/src/entry_points/actev_merge_chunks.py b/diva_evaluation_cli/src/entry_points/actev_merge_chunks.py similarity index 83% rename from src/entry_points/actev_merge_chunks.py rename to diva_evaluation_cli/src/entry_points/actev_merge_chunks.py index e039da4accbaf47741d4818ed31f3bf1c332cba4..309c3d051c31ce6fe9234fc33a31dd5c3a8981a7 100644 --- a/src/entry_points/actev_merge_chunks.py +++ b/diva_evaluation_cli/src/entry_points/actev_merge_chunks.py @@ -6,7 +6,7 @@ Implements the entry-point by using Python or any other languages. import argparse import json -from src.merge_chunks import merge_chunks +from diva_evaluation_cli.src.merge_chunks import merge_chunks def entry_point(chunk_dir, output_file): """ Method to complete: you have to raise an exception if an error occured in the program. diff --git a/src/entry_points/actev_post_process_chunk.py b/diva_evaluation_cli/src/entry_points/actev_post_process_chunk.py similarity index 100% rename from src/entry_points/actev_post_process_chunk.py rename to diva_evaluation_cli/src/entry_points/actev_post_process_chunk.py diff --git a/src/entry_points/actev_pre_process_chunk.py b/diva_evaluation_cli/src/entry_points/actev_pre_process_chunk.py similarity index 100% rename from src/entry_points/actev_pre_process_chunk.py rename to diva_evaluation_cli/src/entry_points/actev_pre_process_chunk.py diff --git a/src/entry_points/actev_process_chunk.py b/diva_evaluation_cli/src/entry_points/actev_process_chunk.py similarity index 100% rename from src/entry_points/actev_process_chunk.py rename to diva_evaluation_cli/src/entry_points/actev_process_chunk.py diff --git a/src/entry_points/actev_system_setup.py b/diva_evaluation_cli/src/entry_points/actev_system_setup.py similarity index 100% rename from src/entry_points/actev_system_setup.py rename to diva_evaluation_cli/src/entry_points/actev_system_setup.py diff --git a/src/init_experiment.sh b/diva_evaluation_cli/src/init_experiment.sh similarity index 100% rename from src/init_experiment.sh rename to diva_evaluation_cli/src/init_experiment.sh diff --git a/src/merge_chunks.py b/diva_evaluation_cli/src/merge_chunks.py similarity index 100% rename from src/merge_chunks.py rename to diva_evaluation_cli/src/merge_chunks.py diff --git a/src/post_process_chunk.sh b/diva_evaluation_cli/src/post_process_chunk.sh similarity index 100% rename from src/post_process_chunk.sh rename to diva_evaluation_cli/src/post_process_chunk.sh diff --git a/src/pre_process_chunk.sh b/diva_evaluation_cli/src/pre_process_chunk.sh similarity index 100% rename from src/pre_process_chunk.sh rename to diva_evaluation_cli/src/pre_process_chunk.sh diff --git a/src/process_chunk.sh b/diva_evaluation_cli/src/process_chunk.sh similarity index 100% rename from src/process_chunk.sh rename to diva_evaluation_cli/src/process_chunk.sh diff --git a/src/setup.sh b/diva_evaluation_cli/src/setup.sh similarity index 100% rename from src/setup.sh rename to diva_evaluation_cli/src/setup.sh diff --git a/setup.py b/setup.py index c2998722e174f6b836f07a0a37215ccb7829e65f..c401e359002de79921e41e458a899b717c346f12 100644 --- a/setup.py +++ b/setup.py @@ -5,24 +5,17 @@ Description ----------- Generate the package for the CLI. -Args ----- ---file-index or -f: path to file index json file for test set ---activity-index or -a: path to activity index json file for test set ---output or -o: path to save chunks file - -Warning: this file should not be modified: see src/entry_points to add your source code. +Warning: this file should not be modified. """ from setuptools import setup, find_packages - setup(name='diva_evaluation_cli', - version='0.1', - package=find_packages(), - include_package_data=True, - entry_points= - ''' + version='0.1', + package=find_packages(), + include_package_data=True, + entry_points= + ''' [console_scripts] - actev=bin.cli:main + actev=diva_evaluation_cli.bin.cli:main ''' )