From 902b8c8b104c2b1fdab58e7bcce33da6b250be7b Mon Sep 17 00:00:00 2001
From: oesteban <code@oscaresteban.es>
Date: Sat, 29 Apr 2017 03:25:19 -0700
Subject: [PATCH] revert changes in files unrelated to this PR

---
 MANIFEST.in |  7 +++----
 Makefile    | 24 +++++++++++++++++++++---
 circle.yml  |  7 ++-----
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 0108e179fb2..8556ce17cc7 100644
--- a/MANIFEST.in
+++ b/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
\ No newline at end of file
+include LICENSE
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 33374341293..be8468a1845 100644
--- a/Makefile
+++ b/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/*
+
diff --git a/circle.yml b/circle.yml
index ffd52169ef0..12146b13af2 100644
--- a/circle.yml
+++ b/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
\ No newline at end of file
+      - python setup.py sdist upload -r pypi
\ No newline at end of file