GEOPY-1617: simpeg-drivers: merge main to develop#47
Merged
Conversation
(cherry picked from commit 21f33a4)
(cherry picked from commit 99530d1)
GEOPY-1556: Fix tile ID on save directive
so that imports are not detected as unused
and bump version to rc.1
GEOPY-1566: new RC distribution for Analyst 4.4
as there has already been a canceled rc.1 in PYPI
GEOPY-1584: import of simpeg-drivers too slow
use released version (non-RC) for: - geoh5py - octree-creation-app - geoapps-utils - mira-simpeg - param-sweeps
GEOPY-1489: merge Release/0.1.0 to main
GEOPY-1489: use octree-creation-app v0.1.1
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #47 +/- ##
==========================================
Coverage ? 92.16%
==========================================
Files ? 88
Lines ? 4801
Branches ? 569
==========================================
Hits ? 4425
Misses ? 253
Partials ? 123
|
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # py-3.10.conda-lock.yml # pyproject.toml # simpeg_drivers/__init__.py # simpeg_drivers/driver.py # simpeg_drivers/joint/joint_surveys/driver.py # simpeg_drivers/utils/surveys.py # tests/params_test.py # tests/run_tests/driver_joint_cross_gradient_test.py # tests/run_tests/driver_joint_surveys_test.py
domfournier
reviewed
Jul 5, 2024
domfournier
approved these changes
Jul 5, 2024
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-1617 - simpeg-drivers: merge main to develop
first locking on develop branches of dependencies
the fix the environment: need to adjust simpeg (see MiraGeoscience/simpeg#52)
then merged the main branch...