-
Notifications
You must be signed in to change notification settings - Fork 2
DEVOPS-693: migration to pixi [WIP] #274
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sebhmg
wants to merge
70
commits into
develop
Choose a base branch
from
DEVOPS-693
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Contributor
Author
|
|
GEOPY-2586: Docs failure on jupyter-book config
…ing to run from GA with ok/apply.
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
# 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
also updating to newer versions of Mira packages
was flipped
so that it does not recompute every time seems sensitive to simpeg version constraints
# 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
also update versions and git revisions for released Mira packages
# Conflicts: # pixi.lock # pixi.toml # pyproject.toml
was flipped (cherry picked from commit f89762c)
Contributor
Author
|
for comparison, here is a PR with pixi configuration on top of the last release branch: #330 |
and relock # Conflicts: # pixi.lock # pixi.toml # pyproject.toml # recipe.yaml
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.
DEVOPS-693 - migrate from conda-lock to pixi