Fix packaging to include version tags

Author: Sam Briesemeister

.gitignore

@@ -1,5 +1,4 @@
 *.pyc
-release-tag
 commit-tag
 dist/
 build/

MANIFEST.in

@@ -0,0 +1,2 @@
+include commit-version
+include DESCRIPTION.rst

Makefile

@@ -1,25 +1,36 @@
 
-.PHONY: install clean remove build upload test release-tag commit-tag git-status-clean push-release release-checkout
+.PHONY: install clean uninstall build upload test release-version commit-version git-status-clean push-release release-checkout
 
 GIT_COMMIT = $(shell git log -1 "--pretty=format:%H")
 GIT_BRANCH = $(shell git describe --contains --all HEAD)
 GIT_STATUS = $(shell git status -sb --untracked=no | wc -l | awk '{ if($$1 == 1){ print "clean" } else { print "pending" } }')
 
 VERSION_PATTERN = "^[0-9]+\.[0-9]+\.[0-9]+$$"
 
+DRYRUN ?= false
 
-install:
-	python setup.py install
+ifeq ($(DRYRUN),false)
+	DRYRUN_ARG=
+else
+	DRYRUN_ARG=--dry-run
+endif
+
+install: test commit-version
+	sudo python setup.py check install
+
+remove uninstall:
+	sudo pip uninstall universal-analytics-python
 
 clean:
-	@rm -rf dist build universal_analytics_python.egg-info/
-	@rm RELEASE_VERSION 
+	@rm -rvf dist build universal_analytics_python.egg-info/
+	@rm -vf RELEASE_VERSION 
 
 build: test 
-	python setup.py build 
+	python setup.py check build sdist bdist 
 
-upload: git-status-clean test commit-tag
-	python setup.py sdist upload
+upload: git-status-clean test commit-version build
+	test -n `cat commit-version` 
+	python setup.py ${DRYRUN_ARG} sdist bdist upload
 
 
 push-release: release upload
@@ -29,21 +40,21 @@ git-status-clean:
 	test "${GIT_STATUS}" == "clean" || (echo "GIT STATUS NOT CLEAN"; exit 1) >&2
 
 
-release: release-tag
-	echo "## Tagging release " `cat release-tag`
-	git tag `cat release-tag`
+release: release-version
+	echo "## Tagging release " `cat release-version`
+	git tag `cat release-version`
 
 release-checkout:
 	git checkout release
 
 
-release-tag: git-status-clean release-checkout test
+release-version: git-status-clean release-checkout test
 	(echo "0.0.0"; git tag --list) | egrep "${VERSION_PATTERN}" | \
 		sort -n | tail -n 1 | \
 		awk -F '.' '{ printf("%d.%d.%d\n", ($$1), ($$2), ($$3) + 1 ) }' > $@
 
 
-commit-tag: git-status-clean
+commit-version: git-status-clean
 	git tag --list --points-at=${GIT_COMMIT} | egrep "${VERSION_PATTERN}" | \
 		sort -n | tail -n 1 > $@
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 import sys
 
-VERSION=open('commit-tag').read().strip()
+VERSION=open('commit-version').read().strip()
 print >>sys.stderr, "Preparing version {0}\n".format(VERSION or "NOTFOUND")
 
 
@@ -17,7 +17,7 @@
     description = "Universal Analytics Python Module",
     long_description = long_description,
 
-    version = VERSION,
+    version = VERSION or 'NOTFOUND',
 
     author = 'Sam Briesemeister',
     author_email = '[email protected]',
@@ -28,5 +28,7 @@
     license = 'BSD',
     packages = ["UniversalAnalytics"],
 
+    install_requires = [],
+
     zip_safe = True,
 )