Merge branch 'master' into 431-customerrors431-customerrors

1 files changed, 24 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 8571a91..64fdc8e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,28 @@
 # Since these contacts will be addressed with Github mentions they
 # need to be Github users (for now)(sorry Bitbucket).
 #
-clean:
+clean: clean-eggs clean-build
+	@find . -iname '*.pyc' -delete
+	@find . -iname '*.pyo' -delete
+	@find . -iname '*~' -delete
+	@find . -iname '*.swp' -delete
+	@find . -iname '__pycache__' -delete
 	rm -rf .tox
 	rm -rf bottle-oauthlib
+	rm -rf dance
 	rm -rf django-oauth-toolkit
 	rm -rf flask-oauthlib
 	rm -rf requests-oauthlib
 
+clean-eggs:
+	@find . -name '*.egg' -print0|xargs -0 rm -rf --
+	@rm -rf .eggs/
+
+clean-build:
+	@rm -fr build/
+	@rm -fr dist/
+	@rm -fr *.egg-info
+
 test:
 	tox
 
@@ -51,7 +66,13 @@ requests:
 	cd requests-oauthlib 2>/dev/null || git clone https://github.com/requests/requests-oauthlib.git
 	cd requests-oauthlib && sed -i.old 's,deps=,deps = --editable=file://{toxinidir}/../[signedtoken],' tox.ini && sed -i.old '/oauthlib/d' requirements.txt && tox
 
+dance:
+	#---------------------------
+	# Library singingwolfboy/flask-dance
+	# Contacts: singingwolfboy
+	cd flask-dance 2>/dev/null || git clone https://github.com/singingwolfboy/flask-dance.git
+	cd flask-dance && sed -i.old 's,deps=,deps = --editable=file://{toxinidir}/../,' tox.ini && sed -i.old '/oauthlib/d' requirements.txt && tox 
 
 .DEFAULT_GOAL := all
-.PHONY: clean test bottle django flask requests
-all: clean test bottle django flask requests
+.PHONY: clean test bottle dance django flask requests
+all: clean test bottle dance django flask requests