X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=bafeed9260f782f1cafb890ac3a1a8db465adc84;hb=830e7dd1a7878c57a45d6e53d638b0fe498034b2;hp=f1a97d5aa441aa40a9c89b4c5971903e894cc4a2;hpb=0dc8072b36be6578676917e3d6523e9018d497a2;p=nepi.git

diff --git a/Makefile b/Makefile
index f1a97d5a..bafeed92 100644
--- 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
 
@@ -69,7 +69,7 @@ dist: MANIFEST
 # 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_HOST=mario@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
 
 VERSION=$(shell cat VERSION)
@@ -83,7 +83,9 @@ pypi:
 	@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)/ ;\
@@ -95,4 +97,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