From 51ec9d7416e4909041bd0816972d7ce68bd54ef6 Mon Sep 17 00:00:00 2001
From: caron <j.caron@fz-juelich.de>
Date: Mon, 4 Nov 2019 16:13:51 +0100
Subject: [PATCH] Changes hg_revision logging to git_revision removed last
artefact of hg usage ages ago... removed syntax error in setup.py...
---
pyramid/__init__.py | 4 ++--
setup.py | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pyramid/__init__.py b/pyramid/__init__.py
index 1955ff0..4b1b176 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 41b7081..c8b3ea1 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' +
--
GitLab