From: Thierry Parmentelat Date: Mon, 8 Jun 2015 13:53:59 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/nanocreaator/nepi X-Git-Tag: nepi-3.2.4-pypi X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2FHEAD;hp=3d8a0cf8ca439e238d6e3fd688e834ab0d941d8a;p=nepi.git Merge branch 'master' of https://github.com/nanocreaator/nepi # By Mario Zancanaro # Via Mario Zancanaro * 'master' of https://github.com/nanocreaator/nepi: New version 3.2.4 --- diff --git a/Makefile b/Makefile index ff684af4..f1a97d5a 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ 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 @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 +95,4 @@ 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