From ed00cc0dfbe89c748c07b7da96dfff338cdb301a Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 5 Jun 2015 16:08:48 +0200
Subject: [PATCH] version 3.2.3 'make pypi' sets the git tag

---
 Makefile | 16 +++++++++++-----
 VERSION  |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 100dcdb6..a89ea3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -72,14 +72,20 @@ PYPI_TARGET=pypi
 PYPI_TARBALL_HOST=root@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
 
-VERSIONTAG=$(shell cat VERSION)
+VERSION=$(shell cat VERSION)
+VERSIONTAG=nepi-$(VERSION)-pypi
+ALREADY_SET=$(shell git tag | grep '^$(VERSIONTAG)$$')
 
 # run this only once the sources are in on the right tag
-pypi: 
+pypi:
+	@echo "Have you committed all changes (type Ctrl-c if not) ? " ; read _
+	@if [ -n "$(ALREADY_SET)" ] ; then echo "tag $(VERSIONTAG) already set"; false; fi
+	@echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
+	git tag $(VERSIONTAG)
 	setup.py sdist upload -r pypi
-	@if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/nepi-$(VERSIONTAG).tar.gz ] ;\
-	  then echo "nepi-$(VERSIONTAG).tar.gz already present on $(PYPI_TARBALL_HOST) - ignored" ;\
-	  else rsync -av dist/nepi-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
+	@if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/nepi-$(VERSION).tar.gz ] ;\
+	  then echo "nepi-$(VERSION).tar.gz already present on $(PYPI_TARBALL_HOST) - ignored" ;\
+	  else rsync -av dist/nepi-$(VERSION).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
 	  fi
 
 
diff --git a/VERSION b/VERSION
index be94e6f5..b347b11e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.2
+3.2.3
-- 
2.43.0