diff --git a/bin/ert.in b/bin/ert.in index a977e8565cb..4300ffdd541 100755 --- a/bin/ert.in +++ b/bin/ert.in @@ -2,9 +2,10 @@ import sys import os from argparse import ArgumentParser, ArgumentTypeError +import pkg_resources -ERT_ROOT = "${ERT_ROOT}" -ERT_SHARE_PATH = "%s/share/ert" % ERT_ROOT +ERT_ROOT = pkg_resources.working_set.by_key['ensemble-reservoir-tool'].location +ERT_SHARE_PATH = os.path.realpath(os.path.join(ERT_ROOT, '../../../share/ert')) def valid_file(fname): if not os.path.isfile(fname): diff --git a/python/python/ert_gui/__init__.py b/python/python/ert_gui/__init__.py index 3a734c28692..fe5b9a99356 100644 --- a/python/python/ert_gui/__init__.py +++ b/python/python/ert_gui/__init__.py @@ -17,6 +17,10 @@ def headless(): else: matplotlib.use("Qt4Agg") -from .ert_version import ErtVersion +try: + from .version import version as __version__ +except ImportError: + __version__ = '0.0.0' + from .ertnotifier import ERT from .ertnotifier import configureErtNotifier diff --git a/python/python/ert_gui/about_dialog.py b/python/python/ert_gui/about_dialog.py index 6b24ce8234a..8ec0389fa2c 100644 --- a/python/python/ert_gui/about_dialog.py +++ b/python/python/ert_gui/about_dialog.py @@ -23,7 +23,10 @@ from PyQt5.QtWidgets import QDialog, QVBoxLayout, QPushButton, QHBoxLayout, QLabel from PyQt5.QtGui import QFont -from ert_gui import ErtVersion +import res +import ecl +import ert_gui + from ert_gui.ertwidgets import resourceImage @@ -81,21 +84,12 @@ def createInfoLayout(): info_layout.addWidget(ert_title) version = QLabel() - ert_version = ErtVersion( ) + version.setAlignment(Qt.AlignHCenter) - version.setText("Versions: ecl:%s res:%s ert:%s" % (ert_version.ecl_version().versionString(), ert_version.res_version().versionString(), ert_version.versionString())) + version.setText( + "Versions: ecl:%s res:%s ert:%s" % (ecl.__version__, res.__version__, ert_gui.__version__)) info_layout.addWidget(version) - timestamp = QLabel() - timestamp.setAlignment(Qt.AlignHCenter) - timestamp.setText("Build time: %s" % ert_version.getBuildTime()) - info_layout.addWidget(timestamp) - - git_commit = QLabel() - git_commit.setAlignment(Qt.AlignHCenter) - git_commit.setText("Git commit hash: %s" % ert_version.getGitCommit(short=True)) - info_layout.addWidget(git_commit) - info_layout.addStretch(5) return info_layout diff --git a/python/python/ert_gui/ert_splash.py b/python/python/ert_gui/ert_splash.py index 7e658a8adaf..c4380c604e0 100644 --- a/python/python/ert_gui/ert_splash.py +++ b/python/python/ert_gui/ert_splash.py @@ -99,13 +99,6 @@ def drawContents(self, painter): painter.setFont(font) painter.drawText(text_x, top_offset, text_area_width, text_size, Qt.AlignHCenter | Qt.AlignCenter, self.version) - top_offset += text_size + margin - text_size = 15 - font.setPixelSize(text_size) - painter.setFont(font) - painter.drawText(text_x, top_offset, text_area_width, text_size, Qt.AlignHCenter | Qt.AlignCenter, self.timestamp) - - text_size = 12 font.setPixelSize(text_size) painter.setFont(font) diff --git a/python/python/ert_gui/gert_main.py b/python/python/ert_gui/gert_main.py index 550b606d7d3..5c2d6c7e01e 100755 --- a/python/python/ert_gui/gert_main.py +++ b/python/python/ert_gui/gert_main.py @@ -119,8 +119,6 @@ from PyQt5.QtWidgets import QApplication, QFileDialog -from ecl.util.util import EclVersion -from ert_gui import ErtVersion from ert_gui.ert_splash import ErtSplash from ert_gui.ertwidgets import SummaryPanel, resourceIcon import ert_gui.ertwidgets @@ -141,6 +139,8 @@ from res.enkf import EnKFMain, ResConfig from res.util import ResLog from res.util import ResVersion +import res +import ecl import sys import time @@ -231,10 +231,7 @@ def main(argv): sys.exit(1) splash = ErtSplash() - version = ErtVersion( ) - splash.version = "Version %s" % version.versionString() - - splash.timestamp = version.getBuildTime() + splash.version = "Version %s" % ert_gui.__version__ splash.show() splash.repaint() @@ -273,7 +270,7 @@ def main(argv): splash.finish(window) window.activateWindow() window.raise_() - ResLog.log(3, "Versions ecl:%s res:%s ert:%s" % (EclVersion( ), ResVersion( ), ErtVersion( ))) + ResLog.log(3, "Versions: ecl:%s res:%s ert:%s" % (ecl.__version__, res.__version__, ert_gui.__version__)) finished_code = app.exec_() sys.exit(finished_code) diff --git a/setup.py b/setup.py index 87962f883c9..c6280061035 100644 --- a/setup.py +++ b/setup.py @@ -6,13 +6,10 @@ setup( name='Ensemble Reservoir Tool', - use_scm_version=True, + use_scm_version={'root':'.' , 'write_to': 'python/python/ert_gui/version.py'}, scripts=['bin/ert.in', 'python/python/bin/ert_cli'], packages=find_packages(where="python/python") , package_dir={'':'python/python'}, - package_data={ - '' : 'share/*' - }, license='Open Source', long_description=open('README.md').read(), install_requires=[ @@ -25,5 +22,5 @@ ], zip_safe=False, tests_require=['pytest'], - setup_requires=["pytest-runner"], + setup_requires=["pytest-runner", 'setuptools_scm'], ) \ No newline at end of file