tweaked Makefile to use either setup or twine to upload stuff onto pypi

diff --git a/Makefile b/Makefile
index ed7f32d..4629ec7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,10 @@ dist: MANIFEST
 LOCAL_ID=$(shell id)
 ifneq "$(LOCAL_ID)" "$(filter $(LOCAL_ID),parmen)"
 BUILD_ID=thierry
+USE_TWINE=
 else
 BUILD_ID=mario
+USE_TWINE=true
 endif
 
 PYPI_TARGET=pypi
@@ -86,15 +88,20 @@ VERSIONTAG=nepi-$(VERSION)-pypi
 VERSIONTAR=nepi-$(VERSION).tar.gz
 ALREADY_SET=$(shell git tag | grep '^$(VERSIONTAG)$$')
 
+##########
+# depending on the value of USE_TWINE, we either do the upload with setup.py itself,
+# or with the help of twine which apparently is the only way that mario could find out on his setup
+define upload_pypi
+$(if $(USE_TWINE),./setup.py sdist && twine upload dist/* -r $(1),./setup.py sdist upload -r $(1))
+endef
+
 # run this only once the sources are in on the right tag
 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
-       twine upload dist/* -r pypi
+       $(call upload_pypi,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)/ ;\
@@ -105,10 +112,8 @@ pypi:
 # 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
-       ./setup.py sdist
-       twine upload dist/* -r testpypi
+testpypi:
+       $(call upload_pypi,testpypi)
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)