version string now includes the v

Author: jpswinski

RELEASE.sh

@@ -5,11 +5,11 @@
 # the tags annotation in git.
 #
 VERSION=$1
-if [[ "$VERSION" != *"."*"."* ]]; then
+if [[ "$VERSION" != "v"*"."*"."* ]]; then
     echo "Invalid version number"
     exit 1
 fi
-if git tag -l | grep -w v$VERSION; then
+if git tag -l | grep -w $VERSION; then
     echo "Git tag already exists"
 	exit 1
 fi
@@ -24,11 +24,11 @@ rm sliderule-python-$VERSION.tar.gz 2> /dev/null
 #
 echo $VERSION > version.txt
 git add version.txt
-git commit -m "Version v$VERSION"
+git commit -m "Version $VERSION"
 
 #
 # Create tag and acrhive
 #
-git tag -a v$VERSION -m "version $VERSION"
-git archive --format=tar.gz --prefix=sliderule-python/ v$VERSION > sliderule-python-$VERSION.tar.gz
+git tag -a $VERSION -m "version $VERSION"
+git archive --format=tar.gz --prefix=sliderule-python/ $VERSION > sliderule-python-$VERSION.tar.gz
 

setup.py

@@ -12,6 +12,8 @@
 # get version
 with open('version.txt') as fh:
     version = fh.read().strip()
+    if version[0] == 'v':
+        version = version[1:]
 
 # list of all utility scripts to be included with package
 scripts=[os.path.join('utils',f) for f in os.listdir('utils') if f.endswith('.py')]