Skip to content

GEOPY-1617: simpeg-drivers: merge main to develop#47

Merged
domfournier merged 29 commits into
MiraGeoscience:developfrom
sebhmg:GEOPY-1617
Jul 5, 2024
Merged

GEOPY-1617: simpeg-drivers: merge main to develop#47
domfournier merged 29 commits into
MiraGeoscience:developfrom
sebhmg:GEOPY-1617

Conversation

@sebhmg
Copy link
Copy Markdown
Contributor

@sebhmg sebhmg commented Jul 5, 2024

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...

domfournier and others added 22 commits May 30, 2024 09:19
(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
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: use octree-creation-app v0.1.1
@github-actions github-actions Bot changed the title GEOPY-1617 GEOPY-1617: simpeg-drivers: merge main to develop Jul 5, 2024
@sebhmg sebhmg changed the title GEOPY-1617: simpeg-drivers: merge main to develop GEOPY-1617: simpeg-drivers: merge main to develop 🚧 Jul 5, 2024
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (develop@09462a6). Learn more about missing BASE report.

Additional details and impacted files
@@            Coverage Diff             @@
##             develop      #47   +/-   ##
==========================================
  Coverage           ?   92.16%           
==========================================
  Files              ?       88           
  Lines              ?     4801           
  Branches           ?      569           
==========================================
  Hits               ?     4425           
  Misses             ?      253           
  Partials           ?      123           
Files Coverage Δ
simpeg_drivers/components/__init__.py 100.00% <ø> (ø)
simpeg_drivers/components/data.py 92.23% <ø> (ø)
simpeg_drivers/components/factories/__init__.py 100.00% <ø> (ø)
...g_drivers/components/factories/abstract_factory.py 100.00% <ø> (ø)
...drivers/components/factories/directives_factory.py 94.11% <ø> (ø)
...peg_drivers/components/factories/entity_factory.py 69.38% <ø> (ø)
...peg_drivers/components/factories/misfit_factory.py 96.36% <ø> (ø)
...g_drivers/components/factories/receiver_factory.py 84.94% <ø> (ø)
...peg_drivers/components/factories/simpeg_factory.py 92.59% <ø> (ø)
...drivers/components/factories/simulation_factory.py 98.01% <ø> (ø)
... and 78 more

@sebhmg sebhmg marked this pull request as draft July 5, 2024 02:54
@sebhmg sebhmg marked this pull request as ready for review July 5, 2024 03:22
sebhmg added 2 commits July 5, 2024 00:33
# 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
@sebhmg sebhmg changed the title GEOPY-1617: simpeg-drivers: merge main to develop 🚧 GEOPY-1617: simpeg-drivers: merge main to develop Jul 5, 2024
@sebhmg sebhmg requested a review from domfournier July 5, 2024 04:48
Comment thread pyproject.toml Outdated
@domfournier domfournier self-requested a review July 5, 2024 17:05
@domfournier domfournier merged commit 799927b into MiraGeoscience:develop Jul 5, 2024
@sebhmg sebhmg deleted the GEOPY-1617 branch July 5, 2024 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants