Use migrated functions from Solvis #54
Merged
Conversation
This file contains 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
…pre-release.
- filter_set_logic_operations:
- Graphene type derived from Solvis enum
- _solvis_join() helper to convert filter_set_options to native Solvis enum
- composite_rupture_sections: fixed an easy deprecation warning
- cached:
- get_rupture_ids_for_location_radius calls solvis version with a deprecation warning
- get_rupture_ids_for_fault_names calls solvis version with a deprecation warning
- update calls to both of the above to use their respective solvis versions
Update nzshm-model to 0.6 Update nzshm-common to 0.7 Update solvis to pre-release branch (0.12.0.alpha.1) Update solvis-store to pre-release branch For nzshm-model 0.6: get_rupture_ids_for_location_radius_stored now getting rupture_set_id values from branch inversion sources
chrisbc
approved these changes
Jun 23, 2024
There was a problem hiding this comment.
@DrCuriosity two minor changes for you to look at but overall looks great, thanks
solvis_graphql_api/composite_solution/filter_set_logic_options.py
Outdated
Show resolved
Hide resolved
This makes it clearer in the code that we're not using the native Python typing module. (Also filtering out `if TYPE_CHECKING:` blocks from coverage tests, while I'm here.)
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.
For #51
Since we're hauling up some dependency versions here (notably nzshm-model, nzshm-common), currently linked through to the pre-release branches of
solvisandsolvis-store. These should see a full release when Solvis has some improved documentation coverage.Noting in passing:
test_cached_ruptures_without_storein the rupture sorting function tests fails when run by itself, so I'm suspicious of whether it's providing the coverage it's supposed to.In this PR:
Upgrades
Changes
filter_set_logic_operations:composite_rupture_sections: fixed an easy deprecation warningcached:Fixes
test_cached_ruptures_without_storenot resetting LRU cache between tests (Bug: test_cached_ruptures_without_store failing as individual test #55)And some linting.
closes #55