diff --git a/pyramid/__init__.py b/pyramid/__init__.py index 1955ff0761abe831cdc6e99329570a87893010a9..4b1b1760dca8faf97826aea4262677ff374e0800 100644 --- a/pyramid/__init__.py +++ b/pyramid/__init__.py @@ -62,11 +62,11 @@ from .ramp import * from .quaternion import * from .file_io import * from .version import version as __version__ -from .version import hg_revision as __hg_revision__ +from .version import git_revision as __git_revision__ import logging _log = logging.getLogger(__name__) -_log.info("Starting Pyramid V{} HG{}".format(__version__, __hg_revision__)) +_log.info("Starting Pyramid V-{} GIT-{}".format(__version__, __git_revision__)) del logging __all__ = ['analytic', 'magcreator', 'reconstruction', 'fieldconverter', diff --git a/setup.py b/setup.py index 41b70814629d89dc7d6a3cb88b6ed482cfaebeb3..c8b3ea1c4d7595181edf6e4f63699b4aea4cd1cc 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ try: except Exception: git_rev = "???" # Write both to version.py: -version_string = with open(os.path.join(os.path.dirname(__file__), 'pyramid', 'version.py'), 'w') as vfile: vfile.write('# -*- coding: utf-8 -*-\n' + '""""This file was automatically generated by `setup.py`"""\n' +