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

diff --git a/Makefile b/Makefile
index a89ea3a1..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,11 +69,12 @@ 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)
 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
@@ -82,10 +83,12 @@ 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
-	@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)/ ;\
+	#./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
 
 
@@ -94,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