Merge branch 'feature/installation' into proposed_master

1bc177ce · Dimitris Lampridis · 4e14376d · 5a146ff9 · 1bc177ce · 1bc177ce
Commit 1bc177ce authored Oct 11, 2019 by Dimitris Lampridis
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 1 deletion

CHANGELOG.md CHANGELOG.md +2 -0

setup.py software/tools/setup.py +23 -0

wrtd_tool.py software/tools/wrtd_tool.py +1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

 ## [Unreleased]
+### Added
+- Python installation of wrtd-tool (via setup-tools)

 ## [1.0.0] - 2019-10-01
 ### Added

--- a/software/tools/setup.py
+++ b/software/tools/setup.py
+from setuptools import setup, find_packages
+
+setup(
+    name="wrtd-tool",
+    version="1.0",
+    packages=find_packages(),
+    description='WRTD Tool',
+    author="Dimitris Lampridis",
+    author_email="dimitris.lampridis@cern.ch",
+    maintainer="Dimitris Lampridis",
+    maintainer_email="dimitris.lampridis@cern.ch",
+    url='http://www.ohwr.org/projects/wrtd',
+    project_urls={
+        "Documentation": "https://wrtd.readthedocs.io",
+        "Forum"        : "https://forums.ohwr.org/c/wrtd",
+    },
+    license='LGPLv3',
+    entry_points = {
+        'console_scripts': [
+            "wrtd-tool = wrtd_tool:main"
+        ]
+    }
+)
--- a/software/tools/wrtd-tool.py
+++ b/software/tools/wrtd-tool.py
@@ -306,6 +306,7 @@ def time_interval_help():
    to the value to set it explicitly to nano, micro, milli or full seconds"""

 def main():
+    signal.signal(signal.SIGINT, signal_handler)

    parser = argparse.ArgumentParser(description='WRTD Node configuration tool')

@@ -489,5 +490,4 @@ def main():
        args.func(args)

 if __name__ == "__main__":
-    signal.signal(signal.SIGINT, signal_handler)
    main()