nepi-3.2.5-pypi

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index 100dcdb..45a09de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB  = $(TESTDIR)/lib
+TESTLIB     = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
@@ -72,14 +72,24 @@ 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
+VERSIONTAR=nepi-$(VERSION).tar.gz
+ALREADY_SET=$(shell git tag | grep '^$(VERSIONTAG)$$')
 
 # run this only once the sources are in on the right tag
-pypi: 
-       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)/ ;\
+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
+       #./setup.py sdist upload -r pypi
+       ./setup.py sdist
+       twine upload dist/* -r pypi
+       @if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAR) ] ;\
+         then echo "$(VERSIONTAR) already present on $(PYPI_TARBALL_HOST) - ignored" ;\
+         else rsync -av dist/$(VERSIONTAR) $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
          fi
 
 
@@ -88,4 +98,6 @@ pypi:
 # in this case we do not want to upload anything on the build box though
 
 testpypi: 
-       setup.py sdist upload -r testpypi
+       #./setup.py sdist upload -r testpypi
+       ./setup.py sdist
+       twine upload dist/* -r testpypi