release 3.2.2 - pip package hopefully has dependencies dealt with by pip

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index 118c778..100dcdb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,8 @@ dist: MANIFEST
 .PHONY: all clean distclean dist test coverage install MANIFEST
 
 ########## for uploading onto pypi
-# use pypitest instead for tests (both entries need to be defined in your .pypirc)
+# this assumes you have an entry 'pypi' in your .pypirc
+# see pypi documentation on how to create .pypirc
 PYPI_TARGET=pypi
 PYPI_TARBALL_HOST=root@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
@@ -75,7 +76,16 @@ VERSIONTAG=$(shell cat VERSION)
 
 # run this only once the sources are in on the right tag
 pypi: 
-       setup.py sdist upload -r $(PYPI_TARGET)
-       ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
-       rsync -av dist/nepi-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/
+       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)/ ;\
+         fi
 
+
+# it can be convenient to define a test entry, say testpypi
+# that points at the testpypi public site
+# in this case we do not want to upload anything on the build box though
+
+testpypi: 
+       setup.py sdist upload -r testpypi