Skip to content
This repository was archived by the owner on Aug 21, 2025. It is now read-only.

GEOPY-2050: Merge main to develop#70

Merged
sebhmg merged 20 commits intodevelopfrom
merge_main_to_develop
Mar 7, 2025
Merged

GEOPY-2050: Merge main to develop#70
sebhmg merged 20 commits intodevelopfrom
merge_main_to_develop

Conversation

@sebhmg
Copy link
Contributor

@sebhmg sebhmg commented Feb 20, 2025

depends on MiraGeoscience/simpeg-drivers#151
depends on MiraGeoscience/simpeg-drivers#156

relocked on updated repo branches

GEOPY-2010: use newer MKL for compatibility with PyTorch 2.5
# 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
#	plate_simulation/__init__.py
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	pyproject.toml
#	recipe.yaml
@sebhmg sebhmg changed the title Merge main to develop Merge main to develop 🚧 Feb 20, 2025
benk-mira
benk-mira previously approved these changes Feb 21, 2025
Copy link
Contributor

@benk-mira benk-mira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@sebhmg sebhmg changed the title Merge main to develop 🚧 GEOPY-2050: Merge main to develop 🚧 Mar 5, 2025
sebhmg added 6 commits March 7, 2025 15:05
# 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
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	pyproject.toml
@sebhmg sebhmg changed the title GEOPY-2050: Merge main to develop 🚧 GEOPY-2050: Merge main to develop Mar 7, 2025
@sebhmg sebhmg merged commit dc87a3e into develop Mar 7, 2025
14 checks passed
@sebhmg sebhmg deleted the merge_main_to_develop branch March 7, 2025 21:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants