GEOPY-2384: merge geoapps 0.12.0 to develop branch #732
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-1163: update the readme of geoapps
# Conflicts: # conda-py-3.10-lock.yml # conda-py-3.9-lock.yml # docs/conf.py # environments/conda-py-3.10-linux-64-dev.lock.yml # environments/conda-py-3.10-linux-64.lock.yml # environments/conda-py-3.10-osx-64-dev.lock.yml # environments/conda-py-3.10-osx-64.lock.yml # environments/conda-py-3.10-win-64-dev.lock.yml # environments/conda-py-3.10-win-64.lock.yml # environments/conda-py-3.9-linux-64-dev.lock.yml # environments/conda-py-3.9-linux-64.lock.yml # environments/conda-py-3.9-osx-64-dev.lock.yml # environments/conda-py-3.9-osx-64.lock.yml # environments/conda-py-3.9-win-64-dev.lock.yml # environments/conda-py-3.9-win-64.lock.yml # geoapps/__init__.py # install.bat # pyproject.toml
[GEOPY-2095] Release/0.12.0
# Conflicts: # README.rst # geoapps/__init__.py # geoapps/base/application.py # geoapps/driver_base/utils.py # pyproject.toml
sebhmg
requested review from
Copilot and
domfournier
and removed request for
Copilot
github-actions
bot
changed the title
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
also remove param-sweeps: now part of geoapps-utils
sebhmg
commented
Nov 26, 2025
Contributor
Author
sebhmg
left a comment
sebhmg
left a comment
There was a problem hiding this comment.
need to fix dependency declaration for new indirect dependencies
|
|
||
| simpeg-archive = {version = ">=0.11.0.1, <0.11.0.2", source = "pypi", allow-prereleases = true} | ||
| #simpeg-archive = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "feature/simpeg_archive"} | ||
|
|
Contributor
Author
There was a problem hiding this comment.
issue: must force some indirect dependencies to conda, so that they are not locked on their pypi version
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-2384 - merge geoapps 0.12.0 to develop branch