Skip to content

Fix main for Python > 11 #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 11, 2025
+39 −37
Merged

Fix main for Python > 11 #1039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86324db
First branch commit
Leguark May 30, 2025
b32fa7c
[BUG] Patching RegularGrid for python 3.12+
Leguark Jun 11, 2025
84dc4ea
[BUG] Fixing more classes with mutable arrays
Leguark Jun 11, 2025
04f4355
[TEST] Fixing tests that return stuff (breaking changing from pytest)
Leguark Jun 11, 2025
e4eb6b8
[TEST] Fixing tests that return stuff (breaking changing from pytest)
Leguark Jun 11, 2025
33f6917
[BUG] Silly bug
Leguark Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[TEST] Fixing tests that return stuff (breaking changing from pytest)
  • Loading branch information
@Leguark
Leguark committed Jun 11, 2025
commit e4eb6b8c7e81a1cd9eb5293cd52f9c3ec304f715
3 changes: 0 additions & 3 deletions test/test_api/test_initialization_and_compute_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@

def test_api_create_data():
geo_data = _create_data()

pprint(geo_data)

return geo_data


def _create_data():
Expand Down
12 changes: 6 additions & 6 deletions test/test_api/test_model_construction_granular.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def _generate_interpolation_options():
return interpolation_options


def test_create_geomodel() -> GeoModel:
def _create_geomodel() -> GeoModel:
geo_model: GeoModel = GeoModel.from_args(
name="horizontal",
structural_frame=_create_structural_frame(),
Expand All @@ -124,8 +124,8 @@ def test_structural_frame_surface_points():
pass


def test_interpolate_numpy() -> GeoModel:
geo_model: GeoModel = test_create_geomodel()
def _interpolate_numpy() -> GeoModel:
geo_model: GeoModel = _create_geomodel()

solutions: gempy_engine.core.data.solutions.Solutions = gempy_engine.compute_model(
interpolation_input=geo_model.interpolation_input_copy,
Expand All @@ -152,11 +152,11 @@ def test_interpolate_numpy() -> GeoModel:


def test_interpolate_aesara():
geo_model: GeoModel = test_create_geomodel()
geo_model: GeoModel = _create_geomodel()


def test_plot_input():
geo_model: GeoModel = test_create_geomodel()
geo_model: GeoModel = _create_geomodel()
gp_viewer: gempy_viewer = require_gempy_viewer()
# TODO: Add all the plot data in a plot options class

Expand All @@ -169,7 +169,7 @@ def test_plot_input():


def test_plot_results():
solved_geo_model: GeoModel = test_interpolate_numpy()
solved_geo_model: GeoModel = _interpolate_numpy()
gp_viewer: gempy_viewer = require_gempy_viewer()

gp_viewer.plot_2d(
Expand Down