From a67b7cb4b4a3a4c2a13d3acd3aee9c9e958242b7 Mon Sep 17 00:00:00 2001
From: ViaFerrata <michimoser@onlinehome.de>
Date: Mon, 4 Feb 2019 10:44:38 +0100
Subject: [PATCH] - Added orcasong_contrib to docs - Added command line tools
to setup.py
---
docs/conf.py | 2 +-
.../data_tools/make_data_split/make_data_split.py | 6 +++---
orcasong_contrib/data_tools/shuffle/shuffle_h5.py | 4 ++--
setup.py | 5 ++++-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index b61b2a3..28bdfa8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,7 +57,7 @@ autosummary_generate = True
# Document Python Code
autoapi_type = 'python'
-autoapi_dirs = ['../orcasong']
+autoapi_dirs = ['../orcasong', '../orcasong_contrib']
autoapi_options = [
'members', 'undoc-members'
# , 'private-members', 'special-members'
diff --git a/orcasong_contrib/data_tools/make_data_split/make_data_split.py b/orcasong_contrib/data_tools/make_data_split/make_data_split.py
index 1ec7b4b..b97b10e 100644
--- a/orcasong_contrib/data_tools/make_data_split/make_data_split.py
+++ b/orcasong_contrib/data_tools/make_data_split/make_data_split.py
@@ -344,9 +344,9 @@ def make_concatenate_and_shuffle_list_files(cfg):
+ ' ' + conc_outputfile_fpath)
-def make_data_split():
+def main():
"""
- Main function.
+ Main function to make the data split.
"""
cfg = parse_input()
@@ -379,4 +379,4 @@ def make_data_split():
if __name__ == '__main__':
- make_data_split()
+ main()
diff --git a/orcasong_contrib/data_tools/shuffle/shuffle_h5.py b/orcasong_contrib/data_tools/shuffle/shuffle_h5.py
index a3c1c0f..7b57dc0 100644
--- a/orcasong_contrib/data_tools/shuffle/shuffle_h5.py
+++ b/orcasong_contrib/data_tools/shuffle/shuffle_h5.py
@@ -271,7 +271,7 @@ def shuffle_h5(filepath_input, tool=False, seed=42, delete=True, chunksize=None,
return output_file_shuffled
-def shuffle_h5_tool():
+def main():
"""
Frontend for the shuffle_h5 function that can be used in a bash environment.
@@ -297,4 +297,4 @@ def shuffle_h5_tool():
if __name__ == '__main__':
- shuffle_h5_tool()
+ main()
diff --git a/setup.py b/setup.py
index 106bd21..ca3b6e1 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,10 @@ setup(
install_requires=requirements,
packages=find_packages(),
include_package_data=True,
- entry_points={'console_scripts': ['make_nn_images=orcasong.make_nn_images:main']},
+ entry_points={'console_scripts': ['make_nn_images=orcasong.make_nn_images:main',
+ 'shuffle=orcasong_contrib.data_tools.shuffle.shuffle_h5:main',
+ 'concatenate=orcasong_contrib.data_tools.concatenate.concatenate_h5:main',
+ 'make_dsplit=orcasong_contrib.data_tools.make_data_split.make_data_split:main']},
setup_requires=['setuptools_scm'],
use_scm_version={
'write_to': 'orcasong/version.txt',
--
GitLab