Improve tooling

Author: amotl

CHANGES.rst

@@ -5,9 +5,12 @@ Minesoft PatBase REST API client CHANGES
 
 development
 ===========
+
+2018-06-12 0.1.0
+================
 - Persistently store user credentials for convenient usage with subsequent API operations
 - Add basic implementation of PatBase API methods "query" and "searchresults"
-
+- Improve tooling
 
 2018-06-11 0.0.0
 ================

Makefile

@@ -1,25 +1,48 @@
+# ------
+# Common
+# ------
+
+$(eval venvpath     := .venv_util)
+$(eval pip          := $(venvpath)/bin/pip)
+$(eval python       := $(venvpath)/bin/python)
+$(eval bumpversion  := $(venvpath)/bin/bumpversion)
+$(eval twine        := $(venvpath)/bin/twine)
+$(eval sphinx       := $(venvpath)/bin/sphinx-build)
+
+setup-virtualenv:
+	@test -e $(python) || `command -v virtualenv` --python=`command -v python` --no-site-packages $(venvpath)
+
+
+# -------
+# Release
+# -------
+
+setup-release: setup-virtualenv
+	$(pip) install --quiet --requirement requirements-release.txt
+
 bumpversion:
-	bumpversion $(bump)
+	$(bumpversion) $(bump)
 
 push:
 	git push && git push --tags
 
 sdist:
-	python setup.py sdist
+	$(python) setup.py sdist
 
 upload:
-	twine upload --skip-existing dist/minesoft-patbase-client-*.tar.gz
+	$(twine) upload --skip-existing dist/*.tar.gz
 
 # make release bump=minor  (major,minor,patch)
-release: bumpversion push sdist upload
+release: setup-release bumpversion push sdist upload
+
 
+# -------------
+# Documentation
+# -------------
 
-docs-virtualenv:
-	$(eval venvpath := ".venv_sphinx")
-	@test -e $(venvpath)/bin/python || `command -v virtualenv` --python=`command -v python` --no-site-packages $(venvpath)
-	@$(venvpath)/bin/pip install --requirement requirements-docs.txt
+setup-docs: setup-virtualenv
+	$(pip) install --quiet --requirement requirements-docs.txt
 
-docs-html: docs-virtualenv
-	$(eval venvpath := ".venv_sphinx")
+docs-html: setup-docs
 	touch docs/index.rst
-	export SPHINXBUILD="`pwd`/$(venvpath)/bin/sphinx-build"; cd docs; make html
+	export SPHINXBUILD="`pwd`/$(sphinx)"; cd docs; make html

docs/usage.rst

@@ -0,0 +1,5 @@
+################################
+Usage of PatBase REST API client
+################################
+
+TBD.

requirements-docs.txt

@@ -1,2 +1,2 @@
-Sphinx==1.6.4
-sphinx_rtd_theme==0.2.5b1
+Sphinx==1.7.5
+sphinx_rtd_theme==0.4.0

requirements-release.txt

@@ -0,0 +1,3 @@
+bumpversion==0.5.3
+twine==1.11.0
+keyring==12.2.1