Merge pull request #998 from gempy-project/teamcity_config

[DOC] Update subsurface dependency and refactor tests for compatibility

Author: Leguark

README.md

@@ -2,10 +2,11 @@
 
 [![GitHub Stars](https://img.shields.io/github/stars/cgre-aachen/gempy.svg)](https://github.com/cgre-aachen/gempy/stargazers)
 [![GitHub Forks](https://img.shields.io/github/forks/cgre-aachen/gempy.svg)](https://github.com/cgre-aachen/gempy/network)
+[![Documentation Status](https://assets.readthedocs.org/static/projects/badges/passing-flat.svg)](http://docs.gempy.org)
+[![Build Status](http://terranigma-solutions.teamcity.com/app/rest/builds/buildType:(id:Gempy_TestingGemPy)/statusIcon)](http://terranigma-solutions.teamcity.com/viewType.html?buildTypeId=Gempy_TestingGemPy&guest=1)
 [![PyPI](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12-blue)](https://www.python.org/downloads/)
 [![PyPI](https://img.shields.io/badge/pypi-1.0-blue.svg)](https://pypi.org/project/gempy/)
 [![license: EUPL v1.2](https://img.shields.io/badge/license-EUPL%20v1.2-blue.svg)](https://github.com/cgre-aachen/gempy/blob/master/LICENSE)
-[![Documentation Status](https://assets.readthedocs.org/static/projects/badges/passing-flat.svg)](http://docs.gempy.org)
 [![DOI](https://zenodo.org/badge/96211155.svg)](https://zenodo.org/badge/latestdoi/96211155)
 
 

requirements/dev-requirements.txt

@@ -1,7 +1,8 @@
 -r optional-requirements.txt
 
 pytest
-subsurface~=2024.2.0
+pyvista
+git+https://github.com/terranigma-solutions/subsurface.git@2025.0.0b2
 
 # Testing
 pytest-approvaltests

test/test_model_types/test_subduction.py

@@ -5,7 +5,10 @@
 
 
 def test_subduction():
-    data_path = os.path.abspath('../examples')
+    # Get the directory containing the test file
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    # Navigate to examples directory relative to test location
+    data_path = os.path.join(current_dir, '../..', 'examples')
 
     geo_model: gp.data.GeoModel = gp.create_geomodel(
         project_name='Onlap_relations',

test/test_modules/test_gempy_subsurface.py

@@ -2,7 +2,8 @@
 
 import gempy as gp
 import gempy_viewer as gpv
-import subsurface.core.structs.unstructured_elements.triangular_surface
+
+from gempy import optional_dependencies
 from gempy.core.data.enumerators import ExampleModel
 
 import numpy as np
@@ -14,7 +15,6 @@
     reason="This test needs higher requirements."
 )
 
-ss = pytest.importorskip("subsurface", reason="Subsurface is not installed")
 pd = pytest.importorskip("pandas", reason="Pandas is not installed")
 
 
@@ -36,7 +36,9 @@ def test_gempy_to_subsurface():
 
     concatenated_id_array = np.concatenate(vertex_id_array)
     concatenated_cell_id_array = np.concatenate(cell_id_array)
-    
+
+    subsurface = optional_dependencies.require_subsurface()
+    ss = subsurface
     meshes: ss.UnstructuredData = ss.UnstructuredData.from_array(
         vertex=np.concatenate(vertex),
         cells=np.concatenate(simplex_list),
@@ -51,16 +53,19 @@ def test_gempy_to_subsurface():
 
 def test_gempy_to_subsurface_II():
     model: gp.data.GeoModel = gp.generate_example_model(ExampleModel.ANTICLINE, compute_model=True)
-    from gempy_engine.core.data.raw_arrays_solution import RawArraysSolution
+    subsurface = optional_dependencies.require_subsurface()
+    ss = subsurface
+    
     meshes: ss.UnstructuredData = model.solutions.raw_arrays.meshes_to_subsurface()
-
     trisurf = subsurface.core.structs.unstructured_elements.triangular_surface.TriSurf(meshes)
     pyvista_mesh = ss.visualization.to_pyvista_mesh(trisurf)
     ss.visualization.pv_plot([pyvista_mesh], image_2d=True)
 
 
 def test_gempy_to_subsurface_III():
     model = gp.generate_example_model(ExampleModel.ANTICLINE, compute_model=True)
+    subsurface = optional_dependencies.require_subsurface()
+    ss = subsurface
     meshes: ss.UnstructuredData = model.solutions.meshes_to_unstruct()
 
     trisurf = subsurface.core.structs.unstructured_elements.triangular_surface.TriSurf(meshes)