Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix hard dask dependency #1415

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Fix hard dask dependency #1415

merged 1 commit into from
Apr 10, 2024

Conversation

jcapriot
Copy link
Member

Summary

Fixes unintended dask hard dependency,

@jcapriot jcapriot changed the title Make dask optional... Fix hard dask dependency Apr 10, 2024
@codecov Codecov
Copy link

codecov bot commented Apr 10, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 25.00000% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 82.54%. Comparing base (de79ed0) to head (ac2e7ed).

Files Patch % Lines
SimPEG/meta/__init__.py 25.00% 6 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1415      +/-   ##
==========================================
- Coverage   82.56%   82.54%   -0.02%     
==========================================
  Files         167      167              
  Lines       25693    25700       +7     
==========================================
+ Hits        21214    21215       +1     
- Misses       4479     4485       +6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jcapriot jcapriot merged commit ee05f30 into simpeg:main Apr 10, 2024
14 of 16 checks passed
@jcapriot jcapriot deleted the patch/dask_depends branch April 10, 2024 16:57
thibaut-kobold added a commit to KoBoldMetals/simpeg that referenced this pull request May 8, 2024
@thibaut-kobold
Merge commit 'fe444e2d714ab1a3f1541575a9f8c4ad1e74894b' into ta/updat…
7e47608 
…e_simpeg_021

* commit 'fe444e2d714ab1a3f1541575a9f8c4ad1e74894b': (73 commits)
  Fix distance calculation in `convert_survey_3d_to_2d_lines` (simpeg#1390)
  Rename spontaneous potential to self potential (simpeg#1422)
  Lowercase simpeg for generating coverage on Azure (simpeg#1443)
  Replace SimPEG for simpeg across docstrings (simpeg#1438)
  Update copyright year in __init__.py (simpeg#1436)
  Move to a PEP8 compliant package name. (simpeg#1430)
  Fix rst syntax in release notes for v0.21.0 (simpeg#1434)
  Replace use of `refine_tree_xyz` in DCIP tutorials (simpeg#1381)
  Add new Issue template for making a release (simpeg#1410)
  Safely run reviewdog on `pull_request_target` events (simpeg#1427)
  Use reviewdog to annotate PR's with black and flake8 errors. (simpeg#1424)
  Remove the parameters argument from docstring (simpeg#1417)
  Add release notes for v0.21.1 (simpeg#1416)
  Fix hard dask dependency (simpeg#1415)
  Publish documentation on azure (simpeg#1412)
  Add release notes for SimPEG v0.21 (simpeg#1409)
  Bump Black version to 24.3.0 (simpeg#1403)
  Remove link to "twitter" (simpeg#1406)
  Add Ying and Williams to AUTHORS.rst (simpeg#1405)
  Dask MetaSim (simpeg#1199)
  ...

# Conflicts:
#	simpeg/electromagnetics/base_1d_stitched.py
#	simpeg/electromagnetics/frequency_domain/simulation_1d_stitched.py
#	simpeg/electromagnetics/time_domain/receivers.py
#	simpeg/electromagnetics/time_domain/simulation_1d_stitched.py
#	simpeg/electromagnetics/utils/em1d_utils.py
#	simpeg/potential_fields/magnetics/_numba_functions.py
#	simpeg/regularization/laterally_constrained.py
#	simpeg/regularization/regularization_mesh_lateral.py
#	simpeg/regularization/rotated.py
#	simpeg/utils/__init__.py
#	simpeg/utils/model_utils.py
#	tests/base/regularizations/test_full_gradient.py
#	tests/base/regularizations/test_regularization.py
#	tests/base/test_mass_matrices.py
#	tests/base/test_model_utils.py
#	tests/base/test_utils.py
#	tests/em/fdem/inverse/adjoint/test_FDEM_adjointEB.py
#	tests/em/fdem/inverse/derivs/test_FDEM_derivs.py
#	tests/pf/test_forward_Mag_Linear.py
thibaut-kobold added a commit to KoBoldMetals/simpeg that referenced this pull request May 8, 2024
@thibaut-kobold
Merge commit '07aeb65de865cd9df55e2d51ca840ea9d60f2234' into ta/parti…
65faf89 
…al_update_21_release

* commit '07aeb65de865cd9df55e2d51ca840ea9d60f2234': (67 commits)
  Fix rst syntax in release notes for v0.21.0 (simpeg#1434)
  Replace use of `refine_tree_xyz` in DCIP tutorials (simpeg#1381)
  Add new Issue template for making a release (simpeg#1410)
  Safely run reviewdog on `pull_request_target` events (simpeg#1427)
  Use reviewdog to annotate PR's with black and flake8 errors. (simpeg#1424)
  Remove the parameters argument from docstring (simpeg#1417)
  Add release notes for v0.21.1 (simpeg#1416)
  Fix hard dask dependency (simpeg#1415)
  Publish documentation on azure (simpeg#1412)
  Add release notes for SimPEG v0.21 (simpeg#1409)
  Bump Black version to 24.3.0 (simpeg#1403)
  Remove link to "twitter" (simpeg#1406)
  Add Ying and Williams to AUTHORS.rst (simpeg#1405)
  Dask MetaSim (simpeg#1199)
  Update year in LICENSE (simpeg#1404)
  Update AUTHORS.rst (simpeg#1259)
  Minor adjustments to Sphinx configuration (simpeg#1398)
  Enforce regularization `weights` as dictionaries (simpeg#1344)
  Improve documentation for base simulation classes (simpeg#1295)
  Add link to User Tutorials to navbar in docs (simpeg#1401)
  ...

# Conflicts:
#	SimPEG/electromagnetics/time_domain/receivers.py
#	SimPEG/utils/__init__.py
#	SimPEG/utils/model_utils.py
#	tests/base/regularizations/test_full_gradient.py
#	tests/base/regularizations/test_regularization.py
#	tests/base/test_model_utils.py
#	tests/base/test_utils.py
#	tests/pf/test_forward_Mag_Linear.py
thibaut-kobold added a commit to thibaut-kobold/simpeg that referenced this pull request May 9, 2024
@thibaut-kobold
Merge commit 'fe444e2d714ab1a3f1541575a9f8c4ad1e74894b' into ta/weigh…
9ffe34c 
…ting_strategy

* commit 'fe444e2d714ab1a3f1541575a9f8c4ad1e74894b': (86 commits)
  Fix distance calculation in `convert_survey_3d_to_2d_lines` (simpeg#1390)
  Rename spontaneous potential to self potential (simpeg#1422)
  Lowercase simpeg for generating coverage on Azure (simpeg#1443)
  Replace SimPEG for simpeg across docstrings (simpeg#1438)
  Update copyright year in __init__.py (simpeg#1436)
  Move to a PEP8 compliant package name. (simpeg#1430)
  Fix rst syntax in release notes for v0.21.0 (simpeg#1434)
  Replace use of `refine_tree_xyz` in DCIP tutorials (simpeg#1381)
  Add new Issue template for making a release (simpeg#1410)
  Safely run reviewdog on `pull_request_target` events (simpeg#1427)
  Use reviewdog to annotate PR's with black and flake8 errors. (simpeg#1424)
  Remove the parameters argument from docstring (simpeg#1417)
  Add release notes for v0.21.1 (simpeg#1416)
  Fix hard dask dependency (simpeg#1415)
  Publish documentation on azure (simpeg#1412)
  Add release notes for SimPEG v0.21 (simpeg#1409)
  Bump Black version to 24.3.0 (simpeg#1403)
  Remove link to "twitter" (simpeg#1406)
  Add Ying and Williams to AUTHORS.rst (simpeg#1405)
  Dask MetaSim (simpeg#1199)
  ...

# Conflicts:
#	simpeg/utils/__init__.py
#	simpeg/utils/model_utils.py
#	tests/base/test_model_utils.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@jcapriot