X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=45a09ded719431e49ba22a0c585e48d267e37e33;hb=54f157ab90a37ae410dd558a7323650d8394c59b;hp=ff684af4c3b637f127295b8a0752ac56668c7afc;hpb=ab43ba02137bc02fce097709c6d7cb26247f4a79;p=nepi.git

diff --git a/Makefile b/Makefile
index ff684af4..45a09ded 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
 
@@ -83,7 +83,10 @@ 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 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 +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