Merge pull request #129 from jcrivenaes/roxar-matplotlib

Roxar matplotlib

Author: jcrivenaes

.travis.yml

@@ -25,7 +25,7 @@ env:
     - PLAT=x86_64
     - MB_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION
     - VERSION=$(echo $TRAVIS_TAG)
-    - BUILD_DEPENDS="cmake"
+    - BUILD_DEPENDS="cmake==3.13.3"
     - CONFIG_PATH=scripts/config.sh
     - TEST_DEPENDS="pytest"
 
@@ -38,6 +38,7 @@ matrix:
       env: MB_PYTHON_VERSION=2.7
     - os: linux
       env: MB_PYTHON_VERSION=3.4
+      if: tag IS present
     - os: linux
       env: MB_PYTHON_VERSION=3.5
     - os: linux

HISTORY.md

@@ -2,6 +2,10 @@
 
 ## Version 2
 
+### 2.0.6
+
+* Corrected issues with matplotlib when loading xtgeo in RMS
+
 ### 2.0.5
 
 * Fixed a bug when reading grids in ROXAR API, the subgrids were missing

docs/requirements.txt

@@ -1,4 +1,4 @@
-cmake
+cmake==3.13.3
 setuptools_scm
 sphinxcontrib-apidoc
 m2r

requirements_dev.txt

@@ -1,4 +1,4 @@
-cmake
+cmake==3.13.3
 pip>=8.1.2
 wheel>=0.29.0
 flake8==2.6.0

setup.py

@@ -46,7 +46,7 @@ def parse_requirements(filename):
 setup_requirements = [
     NUMPYVER,
     "pytest-runner",
-    "cmake",
+    "cmake==3.13.3",
     "wheel",
     "setuptools_scm>=3.2.0",
 ]

src/xtgeo/__init__.py

@@ -43,28 +43,36 @@ def _xprint(msg):
 
 _xprint("XTGEO __init__ ...")
 
+ROXAR = True
+try:
+    import roxar
+except Exception:
+    ROXAR = False
+
+
 # to avoid problems in batch runs when no DISPLAY is set:
 _xprint("Import matplotlib etc...")
-import matplotlib as mplib
+if not ROXAR:
+    import matplotlib as mplib
 
-display = os.environ.get("DISPLAY", "")
-host1 = os.environ.get("HOSTNAME", "")
-host2 = os.environ.get("HOST", "")
-dhost = host1 + host2 + display
+    display = os.environ.get("DISPLAY", "")
+    host1 = os.environ.get("HOSTNAME", "")
+    host2 = os.environ.get("HOST", "")
+    dhost = host1 + host2 + display
 
-ertbool = "LSB_JOBID" in os.environ
+    ertbool = "LSB_JOBID" in os.environ
 
-if display == "" or "grid" in dhost or "lgc" in dhost or ertbool:
+    if display == "" or "grid" in dhost or "lgc" in dhost or ertbool:
 
-    _xprint("")
-    _xprint("=" * 79)
+        _xprint("")
+        _xprint("=" * 79)
 
-    _xprint(
-        "XTGeo info: No display found or a batch (e.g. ERT) server. "
-        "Using non-interactive Agg backend for matplotlib"
-    )
-    mplib.use("Agg")
-    _xprint("=" * 79)
+        _xprint(
+            "XTGeo info: No display found or a batch (e.g. ERT) server. "
+            "Using non-interactive Agg backend for matplotlib"
+        )
+        mplib.use("Agg")
+        _xprint("=" * 79)
 
 #
 # Order matters!
@@ -103,11 +111,11 @@ def _xprint(msg):
 _xprint("Import various XTGeo modules... wells...")
 
 from xtgeo.surface import regular_surface
+from xtgeo.surface.regular_surface import RegularSurface
 
 _xprint("Import various XTGeo modules... surface...")
 
 from xtgeo.cube import cube1
-
 from xtgeo.cube.cube1 import Cube
 
 _xprint("Import various XTGeo modules... cube...")
@@ -130,11 +138,11 @@ def _xprint(msg):
 
 _xprint("Import various XTGeo modules... xyz...")
 
-
-from xtgeo.plot import baseplot
-from xtgeo.plot import xsection
-from xtgeo.plot import xtmap
-from xtgeo.plot import grid3d_slice
+if not ROXAR:
+    from xtgeo.plot import baseplot
+    from xtgeo.plot import xsection
+    from xtgeo.plot import xtmap
+    from xtgeo.plot import grid3d_slice
 
 _xprint("Import various XTGeo modules... plots...")
 

src/xtgeo/common/constants.py

@@ -18,5 +18,5 @@
     UNDEF_INT_LIMIT = xtgeo.cxtgeo.cxtgeo.UNDEF_INT_LIMIT
     VERYLARGENEGATIVE = xtgeo.cxtgeo.cxtgeo.VERYLARGENEGATIVE
     VERYLARGEPOSITIVE = xtgeo.cxtgeo.cxtgeo.VERYLARGEPOSITIVE
-except NameError:
+except AttributeError:
     print("Dummy settings")