X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=f1a97d5aa441aa40a9c89b4c5971903e894cc4a2;hb=0dc8072b36be6578676917e3d6523e9018d497a2;hp=24e5b158ef90b3b6483e29226ed03dafa93095bc;hpb=09b79152023e41ea1a864f854dfcbe2875c532e4;p=nepi.git

diff --git a/Makefile b/Makefile
index 24e5b158..f1a97d5a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ TESTLIB  = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
-# stupid distutils, it's broken in so many ways
 SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
 	      print "lib.%s-%s" % (distutils.util.get_platform(), \
 	      sys.version[0:3])')
@@ -36,7 +35,7 @@ test: all
 
 test-one: all
 	echo $(file) $(case)
-	PYTHONPATH="$(PYPATH)" python $(file) $(case)
+	PYTHONPATH="$(PYPATH)" $(file) $(case)
 
 coverage: all
 	rm -f .coverage
@@ -65,3 +64,35 @@ dist: MANIFEST
 	./setup.py sdist
 
 .PHONY: all clean distclean dist test coverage install MANIFEST
+
+########## for uploading onto pypi
+# 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
+
+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
+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
+	@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
+
+
+# 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