various formatting, including mixes of tab and spaces detected in py3

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index f1a97d5..0354813 100644 (file)
--- 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
 
@@ -68,8 +68,15 @@ dist: MANIFEST
 ########## for uploading onto pypi
 # this assumes you have an entry 'pypi' in your .pypirc
 # see pypi documentation on how to create .pypirc
+LOCAL_ID=$(shell id)
+ifneq "$(LOCAL_ID)" "$(filter $(LOCAL_ID),parmen)"
+BUILD_ID=thierry
+else
+BUILD_ID=mario
+endif
+
 PYPI_TARGET=pypi
-PYPI_TARBALL_HOST=root@build.onelab.eu
+PYPI_TARBALL_HOST=$(BUILD_ID)@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
 
 VERSION=$(shell cat VERSION)
@@ -83,7 +90,9 @@ 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
+       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 +104,16 @@ 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
+
+#################### convenience, for debugging only
+# make +foo : prints the value of $(foo)
+# make ++foo : idem but verbose, i.e. foo=$(foo)
+++%: varname=$(subst +,,$@)
+++%:
+       @echo "$(varname)=$($(varname))"
++%: varname=$(subst +,,$@)
++%:
+       @echo "$($(varname))"