X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=40394d272a4c6805e3afcdd4bf9130b6ffa50e30;hp=bbdb8315f1532e31d2d1e1d206002ff51b2ed161;hb=0a4c02a2bf0bf21726a6decf3e7f3f01ed32d89a;hpb=7286c50c2c399eb190d05a426b0d337677833cb6 diff --git a/Makefile b/Makefile index bbdb8315..40394d27 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ SCMURL=git://git.onelab.eu/sfa.git TARBALL_HOST=root@build.onelab.eu TARBALL_TOPDIR=/build/sfa # I have an alternate pypitest entry defined in my .pypirc -PYPI_ARGS= -r pypi +PYPI_TARGET=pypi python: version @@ -156,8 +156,15 @@ index.zip: README.md python readme.py # I need to run this on my mac as my pypi -pypi: version - setup.py sdist upload $(PYPI_ARGS) +# run git pull first as this often comes afet a module-tag +# we need to re-run make so the version is right +git_pypi: + git pull + $(MAKE) pypi + +# run this only once the sources are in on the right tag +pypi: + setup.py sdist upload -r $(PYPI_TARGET) ssh $(TARBALL_HOST) mkdir -p $(TARBALL_TOPDIR)/$(VERSIONTAG) rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(TARBALL_HOST):$(TARBALL_TOPDIR)/$(VERSIONTAG)