Merge branch 'development'

Author: cmlccie

.gitignore

@@ -1,96 +1,17 @@
-# TODO:  Remove all unused entries
+# `local` working directory
+local/
 
-# ciscosparkapi Project
-dist/
-docs/_build/
-*.egg-info/
-
-
-# Unversioned files
-basic-tests.py
-
-
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
 
-# Unit test / coverage reports
-htmlcov/
+# Test artifacts
+.cache/
 .tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
 
-# Translations
-*.mo
-*.pot
 
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# PyBuilder
-target/
-
-# IPython Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# dotenv
-.env
-
-# virtualenv
-venv/
-ENV/
+# Byte-compiled / optimized files
+*.py[cod]
 
-# Spyder project settings
-.spyderproject
 
-# Rope project settings
-.ropeproject
+# Build artifacts
+dist/
+docs/_build/
+*.egg-info/

Makefile

@@ -0,0 +1,57 @@
+SHELL=/bin/bash
+
+# Build recipes
+.PHONY : build
+build : tests docs buildpackage ;
+
+.PHONY : buildpackage
+buildpackage : setup.py
+	python setup.py sdist
+
+docs : docs/Makefile
+	cd docs/
+	make html
+
+
+# Local testing recipes
+.PHONY : tests
+tests: toxtest lint ;
+
+.PHONY : toxtest
+toxtest : local/environment.sh tox.ini
+	source local/environment.sh
+	tox
+
+.PHONY : pytest
+pytest : local/environment.sh
+	source local/environment.sh
+	pytest
+
+.PHONY : lint
+lint :
+	flake8 ciscosparkapi
+
+
+# Cleaning recipes
+.PHONY : clean
+clean : cleanbuild cleandocs cleanpytest cleantox cleandist ;
+
+.PHONY : cleandist
+cleandist :
+	rm -rf ./dist/*
+
+.PHONY : cleanbuild
+cleanbuild :
+	rm -rf ./ciscosparkapi.egg-info/
+
+.PHONY : cleandocs
+cleandocs :
+	rm -rf ./docs/_build/*
+
+.PHONY : cleantox
+cleantox : cleanpytest
+	rm -rf ./.tox/
+
+.PHONY : cleanpytest
+cleanpytest :
+	rm -rf ./.cache/

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35
+envlist = py27, py35, py36
 
 [testenv]
 deps = pytest