Fix version chars and add pypi release make target (#366)

Makefile

@@ -7,7 +7,7 @@
 #SHELL = $(warning [$@ ($^) ($?) ])$(OLD_SHELL)
 
 WD := $(shell pwd)
-DESTDIR = 
+DESTDIR =
 prefix = /usr
 DDIR = $(DESTDIR)$(prefix)
 bindir = $(DDIR)/bin
@@ -17,7 +17,7 @@ helperdir = $(DDIR)/share/charm-helper
 confdir = $(DESTDIR)/etc
 INSTALL = install
 
-develop: 
+develop:
 	tox --develop --notest
 
 build: deps develop
@@ -40,7 +40,8 @@ clean:
 	find . -name '*.py[co]' -delete
 	find . -type f -name '*~' -delete
 	find . -name '*.bak' -delete
-	rm -rf bin include lib local man dependencies
+	rm -rf bin include lib local man dependencies dist
+	rm -f charmtools/VERSION
 
 install:
 	$(INSTALL) -d $(mandir)
@@ -56,6 +57,9 @@ install:
 	cp -rf scripts templates $(datadir)
 	cp -rf helpers/* $(helperdir)
 
+pypi: clean
+	python setup.py sdist upload
+
 integration: build
 	tests_functional/helpers/helpers.sh || sh -x tests_functional/helpers/helpers.sh timeout
 	@echo Test shell helpers with bash
@@ -70,7 +74,7 @@ integration: build
 	tests_functional/create/test.sh
 	tests_functional/add/test.sh
 
-coverage: build 
+coverage: build
 	tox
 
 check: build integration test
@@ -81,6 +85,7 @@ define phony
   clean
   deps
   install
+  pypi
   tags
   test
 endef

charmtools/git_version.py

@@ -22,10 +22,10 @@ def get_version_info():
         gitn = 0
         if len(version_parts) > 1:
             git = version_parts[1]
-            gitn = int(git.split('_')[1])
+            gitn = int(git.split('-')[1])
         version_info = {
             'version': version_parts[0],
-            'snap': '+snap_{}'.format(os.environ['SNAP_REVISION']),
+            'snap': '+snap-{}'.format(os.environ['SNAP_REVISION']),
             'git': '+{}'.format(git),
             'gitn': gitn,
         }
@@ -38,8 +38,8 @@ def get_version_info():
             snaprev = os.environ.get('SNAP_REVISION', None)
             version_info = {
                 'version': version,
-                'snap': '+snap_{}'.format(snaprev) if snaprev else '',
-                'git': '+git_{}_{}'.format(gitn, gitsha),
+                'snap': '+snap-{}'.format(snaprev) if snaprev else '',
+                'git': '+git-{}-{}'.format(gitn, gitsha),
                 'gitn': int(gitn),
             }
         except CalledProcessError: