Merge pull request #4 from TACC/dev

Minor update

.gitignore

@@ -7,16 +7,12 @@ __pycache__/
 *.so
 
 # Distribution / packaging
-hw_reporting/hw_report*
-auth/*
 .Python
-build/*
-!build/modulefiles/builder.lua
 results/*
 .history
 .outputs
-.validated
 develop-eggs/
+build/
 dist/
 downloads/
 eggs/

.version

@@ -1,2 +1,2 @@
-benchtool v0.9.9
-Mon May 17 11:32:18 CDT 2021
+benchtool v1.0.1
+Tue Jul 20 18:32:00 CDT 2021

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include src *

dev/clean.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Clean build files
+rm -rf benchtool.egg-info
+rm -rf build
+rm -rf dist
+

dev/reinstall.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Clean user files
+benchtool --uninstall
+
+# Remove python package
+pip uninstall -y benchtool
+
+# Clean build files
+rm -rf benchtool.egg-info
+rm -rf build
+rm -rf dist
+
+# Install python package
+python3 setup.py install
+
+# Install user files
+benchtool --install
+benchtool --validate
+
+# Check version
+benchtool --version

dev/test.ini

@@ -0,0 +1,3 @@
+[sect]
+wget = something, something else, last
+cp = another

dev/test.py

@@ -0,0 +1,21 @@
+import configparser as cp
+import os
+
+ini_parser    = cp.ConfigParser( strict=False )
+ini_parser.optionxform=str
+ini_parser.read("test.ini")
+
+stage_dict = dict(ini_parser.items('sect'))
+
+for op in stage_dict:
+    print("This op:", op)
+    for loc in stage_dict[op].split(","):
+        if os.path.isfile(loc.strip()):
+            print("src", loc)
+        else:
+            print("File not found")
+
+
+
+
+

dev/unit_test.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source sourceme
-
 APP=lammps
 BENCH=ljmelt
 

dev/version.sh

@@ -1,11 +1,22 @@
 #!/bin/bash
 
-if [ -z $1 ]; then
+if [ -z ${1} ]; then
     echo "Provide version label"
     exit 1
 fi
 
-echo "benchtool v$1" > $BENCHTOOL/.version
-date >> $BENCHTOOL/.version
+# Update module filename
+mv src/data/modulefiles/benchtool/*.lua src/data/modulefiles/benchtool/${1}.lua
 
-echo "Version file updated."
+# Update version in settings.ini
+sed -i "/version =/c\version = ${1}" src/data/settings.ini
+
+
+# Update version in setup.py
+sed -i "/version=/c\    version=\'${1}\'," setup.py
+
+# Update version file
+echo "benchtool v${1}" > src/data/.version
+date >> src/data/.version
+
+echo "Version info updated."