Release 4.7 to develop (including GEOPY-2640) #329
Conversation
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
GEOPY-2586: Docs failure on jupyter-book config
…ing to run from GA with ok/apply.
GEOPY-2613: bring in doc of plate simulation
GEOPY-2621: Remove out_group form ui.json. It's redundant, and was currently fai…
GEOPY-2605: Cannot load results from Batch 2D inversion runs
DEVOPS-922: adjust or fix text in ui.json
# Conflicts: # simpeg_drivers/components/factories/directives_factory.py # simpeg_drivers/components/models.py
GEOPY-2624: check for MVI Simpeg groups and raise error
# Conflicts: # simpeg_drivers/joint/joint_surveys/options.py
…r.lower()" This reverts commit b6b450c. # Conflicts: # simpeg_drivers/components/factories/directives_factory.py # simpeg_drivers/components/factories/source_factory.py # simpeg_drivers/components/models.py # simpeg_drivers/joint/driver.py # simpeg_drivers/joint/joint_surveys/driver.py # simpeg_drivers/options.py # simpeg_drivers/plate_simulation/driver.py
This reverts commit da7d1a6.
GEOPY-2619: Joint surveys fails validation if no starting/reference models chosen
constraint pydantic to 2.11 to avoid warnings
# 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 # environments/py-3.11-linux-64-dev.conda.lock.yml # environments/py-3.11-linux-64.conda.lock.yml # environments/py-3.11-win-64-dev.conda.lock.yml # environments/py-3.11-win-64.conda.lock.yml # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-linux-64.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.12-win-64.conda.lock.yml # py-3.10.conda-lock.yml # py-3.11.conda-lock.yml # py-3.12.conda-lock.yml # pyproject.toml
sebhmg
changed the title
Contributor
Author
|
see how tests are failing as well on environment locked by pixi in this other PR: |
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.
this merge also fixes GEOPY-2640