6.1.2

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index 3c3b841..db13b68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PYTHON     = python
-SRCDIR      = $(CURDIR)/src
+SRCDIR      = $(CURDIR)
 TESTDIR     = $(CURDIR)/test
 TESTLIB     = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build/lib
@@ -89,6 +89,15 @@ VERSIONTAR = nepi-$(VERSION).tar.gz
 GIT-TAG-ALREADY-SET = $(shell git tag | grep '^$(VERSIONTAG)$$')
 # to check for uncommitted changes
 GIT-CHANGES = $(shell echo $$(git diff HEAD | wc -l))
+GIT-URL = git://git.onelab.eu/nepi.git
+
+version: nepi/util/version.py
+nepi/util/version.py: VERSION nepi/util/version.py.in
+       sed -e "s,@VERSIONTAG@,$(VERSION),g" -e "s,@SCMURL@,$(GIT-URL),g" nepi/util/version.py.in > $@
+
+clean: version-clean
+version-clean:
+       rm -f nepi/util/version.py
 
 ##########
 # depending on the value of USE_TWINE, we either do the upload with setup.py itself,
@@ -98,9 +107,10 @@ $(if $(USE_TWINE),./setup.py sdist && twine upload dist/* -r $(1),./setup.py sdi
 endef
 
 # run this only once the sources are in on the right tag
-pypi:
+pypi: version
        @if [ $(GIT-CHANGES) != 0 ]; then echo "You have uncommitted changes - cannot publish"; false; fi
        @if [ -n "$(GIT-TAG-ALREADY-SET)" ] ; then echo "tag $(VERSIONTAG) already set"; false; fi
+       @if ! grep -q ' $(VERSION)' CHANGELOG.md ; then echo no mention of $(VERSION) in CHANGELOG.md; false; fi
        @echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
        git tag $(VERSIONTAG)
        $(call upload_pypi,pypi)
@@ -110,11 +120,13 @@ pypi:
          fi
 
 
-# it can be convenient to define a test entry, say testpypi
+# it can be convenient to define a test entry, say testpypi, in your .pypirc
 # that points at the testpypi public site
-# in this case we do not want to upload anything on the build box though
-
-testpypi:
+# no upload to build.onelab.eu is done in this case 
+# try it out with
+# pip install -i https://testpypi.python.org/pypi nepi
+# dependencies need to be managed manually though
+testpypi: version
        $(call upload_pypi,testpypi)
 
 #################### convenience, for debugging only