import nepi; nepi.version

diff --git a/Makefile b/Makefile
index 6873e15..c50b971 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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,7 +107,7 @@ $(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
        @echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
@@ -112,11 +121,11 @@ pypi:
 
 # it can be convenient to define a test entry, say testpypi, in your .pypirc
 # that points at the testpypi public site
-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

diff --git a/VERSION b/VERSION
index 09b254e..090ea9d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0
+6.0.3

diff --git a/nepi/__init__.py b/nepi/__init__.py
index 18764d0..411e484 100644 (file)
--- a/nepi/__init__.py
+++ b/nepi/__init__.py
@@ -54,4 +54,6 @@ else:
 from nepi.execution.resource import populate_factory
 populate_factory()
 
+from nepi.util.version import version_tag 
+version = version_tag
 

diff --git a/nepi/util/version.py.in b/nepi/util/version.py.in
new file mode 100644 (file)
index 0000000..97ae6c4
--- /dev/null
+++ b/nepi/util/version.py.in
@@ -0,0 +1,13 @@
+### updated by the toplevel Makefile
+version_tag="@VERSIONTAG@"
+scm_url="@SCMURL@"
+import socket
+ 
+def version_core (more=None):
+    if more is None: more={}
+    core = { 'code_tag' : version_tag,
+             'code_url' : scm_url,
+             'hostname' : socket.gethostname(),
+             }
+    core.update(more)
+    return core

diff --git a/setup.py b/setup.py
index 90d42e9..089c251 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,20 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-import sys
 
+# python2 or python3 ?
+import sys
 PY2 = sys.version_info[0] == 2
 
-with open('VERSION') as f:
-    version_tag = f.read().strip()
+# read version
+# while cleaning up version.py might just not be there
+#try:
+#    from nepi.util.version import version_tag
+#except:
+#    version_tag = 'cleaningup'
+from nepi.util.version import version_tag
+
+# read licence info
 with open("COPYING") as f:
     license = f.read()
 with open("README.md") as f: