GEOPY-2731: Replace InputFile for BaseUIJson class - #83
Open
domfournier wants to merge 19 commits into
Open
Conversation
# Conflicts: # tests/run_tests/grid_model_merger_test.py
github-actions
Bot
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the test suite and dependency configuration to migrate from InputFile/BaseUIJson to the newer UIJson API (GEOPY-2731), aligning UI JSON read/write and parameter-building flows with the updated geoh5py/geoapps-utils interfaces.
Changes:
- Replace
InputFile/BaseUIJsonusage in tests withUIJson.read(...)+set_values(...), and adjustOptions.build(...)call sites accordingly. - Refactor test helper logic (e.g., move
setup_block_modelintotests/conftest.py) to reduce duplication. - Update pinned git dependency refs and regenerate conda lock files.
Reviewed changes
Copilot reviewed 24 out of 24 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| tests/run_tests/octree_creation/run_test.py | Adjust octree diagonal-balance test parameter serialization and UIJson-driven output lookup. |
| tests/run_tests/octree_creation/params_test.py | Migrate octree params tests from InputFile/BaseUIJson to UIJson. |
| tests/run_tests/grid_model_merger_test.py | Deduplicate block model setup by importing shared helper. |
| tests/run_tests/block_2_octree_test.py | Switch UI JSON reader to UIJson in block-model-to-octree tests. |
| tests/parameters_test.py | Use UIJson for block model options construction in parameter tests. |
| tests/conftest.py | Add shared setup_block_model helper for reuse across tests. |
| pyproject.toml | Point geoh5py and geoapps-utils to the feature/uijson branch. |
| grid_apps/block_models/driver.py | Remove outdated docstring reference to InputFile. |
| grid_apps-assets/uijson/block_models.ui.json | Remove one meshType UUID from the allowed objects.meshType list. |
| environments/*.conda.lock.yml | Regenerate lockfiles to reflect dependency/ref updates. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
GEOPY-2994: Support Grid2D in grid_model_merger application
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
for more information, see https://pre-commit.ci
# Conflicts: # tests/conftest.py # tests/run_tests/grid_model_merger_test.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GEOPY-2731 - Replace InputFile for BaseUIJson class