Merge pull request #23 from crccheck/maintenance

Maintenance tweaks

.travis.yml

@@ -4,3 +4,4 @@ env:
   - TOX_ENV=py34
 install: "pip install tox"
 script: tox -e $TOX_ENV
+sudo: false

LICENSE

@@ -192,7 +192,7 @@ APPENDIX: How to apply the Apache License to your work
     on the same "printed page" as the copyright notice for easier
     identification within third-party archives.
 
-        Copyright 2014 crccheck
+        Copyright 2015 Chris Chang
 
         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.

Makefile

@@ -2,12 +2,13 @@ VERSION=0.5.0
 
 
 help:
-	@echo "make commands:"
-	@echo "  make help    - this help"
-	@echo "  make clean   - remove temporary files"
-	@echo "  make test    - run test suite"
-	@echo "  make install - install this package"
-	@echo "  make release - prep a release and upload to PyPI"
+	@echo "help"
+	@echo "-------------------------------------------------------"
+	@echo "make help     this help"
+	@echo "make clean    remove temporary files"
+	@echo "make test     run test suite"
+	@echo "make install  install this package locally"
+	@echo "make release  prep a release and upload to PyPI"
 
 
 clean:
@@ -19,26 +20,24 @@ clean:
 	rm -rf build
 	rm -rf dist
 
-
 test:
 	python -m unittest discover
 
-
-# Release Instructions:
-#
-# 1. bump version number above
-# 4. `make release`
-#
-# If this doesn't work, make sure you have wheels installed:
-#     pip install wheel
-release:
+version:
 	@sed -i -r /version/s/[0-9.]+/$(VERSION)/ setup.py
 	@sed -i -r /__version__/s/[0-9.]+/$(VERSION)/ leadbutt.py
 	@sed -i -r /__version__/s/[0-9.]+/$(VERSION)/ plumbum.py
-	@git commit -am "bump version to v$(VERSION)"
-	@git tag v$(VERSION)
-	python setup.py sdist bdist_wheel upload
 
+# Release instructions
+# 1. bump VERSION above
+# 2. run `make release`
+# 3. `git push --tags origin master`
+# 4. update release notes
+release: clean version
+	@-git commit -am "bump version to v$(VERSION)"
+	@-git tag $(VERSION)
+	@-pip install wheel > /dev/null
+	python setup.py sdist bdist_wheel upload
 
 # makes it easier to test setup.py's entry points
 install:

requirements.txt

@@ -1,8 +1,8 @@
-boto==2.33.0
+boto==2.38.0
 PyYAML==3.11
 docopt==0.6.2
-Jinja2==2.7.3
+Jinja2==2.8
 
 # tests
-tox==1.8.0
-mock==1.0.1
+tox==2.1.1
+mock==1.3.0