Index: wflow-py/mkversion.py =================================================================== diff -u -r405114bf53fffa2637a5383483a1fb99fbc73f39 -rc9d975a5a82cb34652cdc5d2ee9afd734c18d3c7 --- wflow-py/mkversion.py (.../mkversion.py) (revision 405114bf53fffa2637a5383483a1fb99fbc73f39) +++ wflow-py/mkversion.py (.../mkversion.py) (revision c9d975a5a82cb34652cdc5d2ee9afd734c18d3c7) @@ -2,43 +2,10 @@ import datetime import subprocess -branch = None -try: - branch = subprocess.check_output( - 'git rev-parse --abbrev-ref HEAD', shell=True).strip() -except: - branch = None - -if branch == None: - branch = 'master' - -vers = '1' -nrversion = '1.0' - -################################### -manualversion = nrversion + "." + branch + "." + vers -manualmainversion = nrversion + "." + branch -version = nrversion = '1.0' + "." + vers -################################### -a = open("_version.py", "w") - -build = datetime.datetime.now() - -a.write("# This file is made by mkversion.py, do not edit!\n") -a.write("VERSION='" + manualversion + "'\n") -a.write("MVERSION='" + manualmainversion + "'\n") -a.write("NVERSION='" + version + "'\n") -a.write("BUILD='" + str(build) + "'\n") -a.close() - a = open("wflow/__init__.py", "w") a.write( "__all__ = ['wflow_funcs','wflow_adapt','wflow_lib','pcrut','wf_DynamicFramework','stats']\n") -a.write("__version__='" + manualmainversion + "'\n") -a.write("__release__='" + manualversion + "'\n") -a.write("__versionnr__='" + version + "'\n") -a.write("__build__='" + str(build) + "'\n\n") a.write("import os, sys\n") a.write("import osgeo.gdal as gdal\n\n") a.write("if getattr(sys, 'frozen', False):\n") @@ -54,8 +21,19 @@ a.write(" # set environment variable instead of pyproj_datadir such\n") a.write(" # that child processes will inherit it\n") a.write(" os.environ['PROJ_DIR'] = os.path.join(basedir, 'proj-data')\n") +a.write("from ._version import get_versions\n") +a.write("__version__ = get_versions()['version']\n") +a.write("del get_versions\n") +from ._version import get_versions +__version__ = get_versions()['version'] +del get_versions + print "=============================================================================" print "Now install wflow using setup.py install and regenerate the documentation...." print "=============================================================================" + + + +