Merge pull request #6 from GeoStat-Framework/develop

Bugfix 1.1.1

.gitignore

@@ -9,3 +9,4 @@ docs/build
 #_static
 #_templates
 #docs/
+ogs5py/_version.py

docs/source/conf.py

@@ -21,10 +21,6 @@
 # pip install sphinx_rtd_theme
 # is needed in order to build the documentation
 import datetime
-import os
-import sys
-
-sys.path.insert(0, os.path.abspath("../../"))
 from ogs5py import __version__ as ver
 
 
@@ -173,7 +169,9 @@ def setup(app):
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = "ogs5pydoc"
-
+# logos for the page
+html_logo = "pics/OGS_150.png"
+html_favicon = "pics/OGS.ico"
 
 # -- Options for LaTeX output ---------------------------------------------
 # latex_engine = 'lualatex'

ogs5py/__init__.py

@@ -125,7 +125,6 @@
    PCS_TYP
    PRIM_VAR_BY_PCS
 """
-from ogs5py._version import __version__
 from ogs5py.ogs import OGS
 from ogs5py.fileclasses import (
     ASC,
@@ -173,6 +172,12 @@
 )
 from ogs5py.tools.vtk_viewer import show_vtk
 
+try:
+    from ogs5py._version import __version__
+except ImportError:  # pragma: nocover
+    # package is not installed
+    __version__ = "0.0.0.dev0"
+
 # indentation of subkeywords
 SUB_IND = "  "
 """str: Indentation of subkeys."""

ogs5py/fileclasses/base.py

@@ -31,7 +31,11 @@
     is_skey,
     find_key_in_list,
 )
-from ogs5py._version import __version__ as version
+try:
+    from ogs5py._version import __version__ as version
+except ImportError:  # pragma: nocover
+    # package is not installed
+    version = "0.0.0.dev0"
 
 # current working directory
 CWD = os.getcwd()