Merge pull request #70 from cglewis/master

release v0.2.0
IQTLabs · Sep 1, 2020 · 476879a · 476879a
2 parents 7979c21 + 479ec87
commit 476879a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,5 @@ include *.md
 include LICENSE
 include requirements.txt
 include bin/portunus
-include VERSION
+include portunus/VERSION
 recursive-include portunus *.py
diff --git a/VERSION b/VERSION
diff --git a/portunus/VERSION b/portunus/VERSION
@@ -0,0 +1 @@
+0.2.0
diff --git a/portunus/portunus.py b/portunus/portunus.py
@@ -1145,12 +1145,20 @@ def main(self):
             description='Portunus - A tool for creating multi-tenant environments to run experiments in')
         parser.add_argument('--viz', '-z', action='store_true',
                             help='Show serve up current state of the Portunus environment as a diagram')
+        parser.add_argument('--version', '-V', action='store_true',
+                            help='Show version')
         args = parser.parse_args()
+        if args.version:
+            with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'VERSION'), 'r') as f:
+                print(f.read().strip())
+            sys.exit()
+
         if args.viz:
             self.simple_command('mkdir -p viz_output')
             path = os.getcwd()
             os.chdir('viz_output')
-            self.simple_command('python3 /opt/dovesnap/graph_dovesnap/graph_dovesnap.py')
+            self.simple_command(
+                'python3 /opt/dovesnap/graph_dovesnap/graph_dovesnap.py')
             self.simple_command('python3 -m http.server')
             os.chdir(path)
         else:

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='portunus',
-    version=open('VERSION', 'r').read().strip(),
+    version=open('portunus/VERSION', 'r').read().strip(),
     include_package_data=True,
     packages=find_packages(),
     install_requires=open('requirements.txt', 'r').read().splitlines(),