revert changes in files unrelated to this PR

MANIFEST.in

@@ -1,9 +1,8 @@
 # data
 include niworkflows/data/*.json
-include niworkflows/viz/*.tpl
+recursive-include niworkflows/data/templates *
 
 #Misc
+include requirements.txt
 include CHANGES.rst
-include LICENSE
-include README.rst
-include setup.py
+include LICENSE

Makefile

@@ -1,6 +1,5 @@
 
-.PHONY: clean
-clean: clean-pyc clean-build
+VERSION := $(shell python -c "import niworkflows; print niworkflows.info.__version__")
 
 .PHONY: clean-pyc
 clean-pyc:
@@ -13,9 +12,28 @@ clean-pyc:
 clean-build:
 		rm --force --recursive build/
 		rm --force --recursive dist/
-		rm --force --recursive .egg/
 		rm --force --recursive *.egg-info
 		rm --force --recursive src/
 
+.PHONY: tag
+tag:
+		git tag -a $(VERSION) -m "Version ${VERSION}"
+		git push origin $(VERSION)
+
+.PHONY: test
+test: clean-pyc
+		py.test --ignore=src/ --verbose $(TEST_PATH)
+
 dist: clean-build clean-pyc
 		python setup.py sdist
+
+.PHONY: tag-release
+release: clean-build
+		python setup.py sdist
+		twine upload dist/*
+
+.PHONY: tag-release
+tag-release: clean-build tag
+		python setup.py sdist
+		twine upload dist/*
+

circle.yml

@@ -12,7 +12,7 @@ dependencies:
     - "~/data"
 
   pre:
-    - mkdir -p ${SCRATCH}/dist ~/data/ ~/docker ${CIRCLE_TEST_REPORTS}/py2 ${CIRCLE_TEST_REPORTS}/py3
+    - mkdir -p ~/data/ ~/docker ${CIRCLE_TEST_REPORTS}/py2 ${CIRCLE_TEST_REPORTS}/py3
     - mkdir -p $SCRATCH && sudo setfacl -d -m group:ubuntu:rwx $SCRATCH && sudo setfacl -m group:ubuntu:rwx $SCRATCH
     - mkdir -p $SCRATCH/py2 $SCRATCH/py3
   override:
@@ -36,9 +36,6 @@ deployment:
   hub:
     tag: /.*/
     commands:
-      - make clean
       - sed -i -E "s/(__version__ = )'[A-Za-z0-9.-]+'/\1'$CIRCLE_TAG'/" niworkflows/info.py
       - printf "[distutils]\nindex-servers =\n    pypi\n\n[pypi]\nusername:$PYPI_USER\npassword:$PYPI_PASS\n" > ~/.pypirc
-      - python setup.py sdist
-      - pip install twine && twine upload dist/*
-      - cp dist/* ${SCRATCH}/dist || true
+      - python setup.py sdist upload -r pypi