Skip to content

Commit ce4d3fc

Browse files
committed
Merge branch 'release/0.3.0' into develop
# 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 # recipe.yaml # simpeg_drivers/__init__.py
2 parents f858c7a + 3bb32db commit ce4d3fc

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ exclude-too-few-public-methods=
355355
ignored-parents=
356356

357357
# Maximum number of arguments for function / method.
358-
max-args=6
358+
max-args=9 # as long as not hitting too-many-positional-arguments
359359

360360
# Maximum number of attributes for a class (see R0902).
361361
max-attributes=15

pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ include = [
3030
[tool.poetry.dependencies]
3131
python = "^3.10"
3232

33-
dask-core = "2025.3.*" # also in simpeg[dask]
33+
# note: py-deps-clock defines custom mapping from dask to dask-core
34+
dask = ">=2025.3, <2025.4.dev" # also in simpeg[dask]
35+
3436
discretize = "0.11.*" # also in simpeg, octree-creation-app
35-
distributed = "2025.3.*" # conda needs explicit dask-core etc for equivalent dask[distributed]
37+
distributed = ">=2025.3, <2025.4.dev" # for dask[distributed]
3638
numpy = "~1.26.0" # also in geoh5py, simpeg
3739
pydantic = "^2.5.2" # also in geoh5py, curve-apps, geoapps-utils
3840
scikit-learn = "~1.4.0"

recipe.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ tests:
6060
- geoh5py
6161
- dask
6262
- distributed
63-
64-
# `pip check` fails on missing dask-core because it only sees name 'dask'
65-
# Possibly, use custom mapping for dask => dask-core
66-
# See `conda-lock --pypi_to_conda_lookup_file`, or the `pixi` option "conda-pypi-map"
67-
pip_check: false
63+
pip_check: true
6864

6965
- script:
7066
- pytest --ignore=tests/version_test.py
@@ -79,8 +75,10 @@ tests:
7975

8076
about:
8177
license: MIT
82-
license_file:
83-
- LICENSE
78+
license_file: LICENSE
79+
homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/
80+
repository: https://github.com/MiraGeoscience/simpeg-drivers
81+
documentation: https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/
8482

8583
extra:
8684
recipe-maintainers:

0 commit comments

Comments
 (0)