Merge pull request #197 from MiraGeoscience/GEOPY-2049-dev

sebhmg · web-flow · commit 748e28947b8a · 2025-04-18T14:59:47.000-04:00
GEOPY-2049: merge release to develop branch
diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee
+# input_hash: d20cb4f62773f79495ca5432e662a34453afa41e6084f06c349fbb84600a44bb
 
 channels:
   - conda-forge
@@ -148,7 +148,7 @@ dependencies:
   - libxml2=2.13.7=h81593ed_1
   - libzlib=1.3.1=hb9d3cd8_2
   - linkify-it-py=2.0.3=pyhd8ed1ab_1
-  - llvm-openmp=20.1.2=h024ca30_1
+  - llvm-openmp=20.1.3=h024ca30_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markdown-it-py=2.2.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h89163eb_1
diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee
+# input_hash: d20cb4f62773f79495ca5432e662a34453afa41e6084f06c349fbb84600a44bb
 
 channels:
   - conda-forge
@@ -85,7 +85,7 @@ dependencies:
   - libxcrypt=4.4.36=hd590300_1
   - libxml2=2.13.7=h81593ed_1
   - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=20.1.2=h024ca30_1
+  - llvm-openmp=20.1.3=h024ca30_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h89163eb_1
   - matplotlib-base=3.8.4=py310hef631a5_2
diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3
+# input_hash: eaae335cf36adc80372dc46b8513b3371068cb4b78164f9bf33218ae884e5a43
 
 channels:
   - conda-forge
@@ -137,7 +137,7 @@ dependencies:
   - libxml2=2.13.7=h442d1da_1
   - libzlib=1.3.1=h2466b09_2
   - linkify-it-py=2.0.3=pyhd8ed1ab_1
-  - llvm-openmp=20.1.2=h30eaf37_1
+  - llvm-openmp=20.1.3=h30eaf37_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markdown-it-py=2.2.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h38315fa_1
diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3
+# input_hash: eaae335cf36adc80372dc46b8513b3371068cb4b78164f9bf33218ae884e5a43
 
 channels:
   - conda-forge
@@ -73,7 +73,7 @@ dependencies:
   - libxcb=1.17.0=h0e4246c_0
   - libxml2=2.13.7=h442d1da_1
   - libzlib=1.3.1=h2466b09_2
-  - llvm-openmp=20.1.2=h30eaf37_1
+  - llvm-openmp=20.1.3=h30eaf37_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h38315fa_1
   - matplotlib-base=3.8.4=py310hadb10a8_2
diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650
+# input_hash: c83206a2eacb4c3e0efe0aa15f924d81adc9fe1f02d077a12434b468bb2045e6
 
 channels:
   - conda-forge
@@ -150,7 +150,7 @@ dependencies:
   - libxml2=2.13.7=h81593ed_1
   - libzlib=1.3.1=hb9d3cd8_2
   - linkify-it-py=2.0.3=pyhd8ed1ab_1
-  - llvm-openmp=20.1.2=h024ca30_1
+  - llvm-openmp=20.1.3=h024ca30_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markdown-it-py=2.2.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py311h2dc5d0c_1
diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650
+# input_hash: c83206a2eacb4c3e0efe0aa15f924d81adc9fe1f02d077a12434b468bb2045e6
 
 channels:
   - conda-forge
@@ -86,7 +86,7 @@ dependencies:
   - libxcrypt=4.4.36=hd590300_1
   - libxml2=2.13.7=h81593ed_1
   - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=20.1.2=h024ca30_1
+  - llvm-openmp=20.1.3=h024ca30_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py311h2dc5d0c_1
   - matplotlib-base=3.8.4=py311ha4ca890_2
diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091
+# input_hash: 2d7c4e988ae2df2fbd8349e86ba264f7eb281505021cebbdb8d9a2d3b0dda7ad
 
 channels:
   - conda-forge
@@ -139,7 +139,7 @@ dependencies:
   - libxml2=2.13.7=h442d1da_1
   - libzlib=1.3.1=h2466b09_2
   - linkify-it-py=2.0.3=pyhd8ed1ab_1
-  - llvm-openmp=20.1.2=h30eaf37_1
+  - llvm-openmp=20.1.3=h30eaf37_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markdown-it-py=2.2.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py311h5082efb_1
diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091
+# input_hash: 2d7c4e988ae2df2fbd8349e86ba264f7eb281505021cebbdb8d9a2d3b0dda7ad
 
 channels:
   - conda-forge
@@ -74,7 +74,7 @@ dependencies:
   - libxcb=1.17.0=h0e4246c_0
   - libxml2=2.13.7=h442d1da_1
   - libzlib=1.3.1=h2466b09_2
-  - llvm-openmp=20.1.2=h30eaf37_1
+  - llvm-openmp=20.1.3=h30eaf37_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py311h5082efb_1
   - matplotlib-base=3.8.4=py311h9b31f6e_2
diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6
+# input_hash: 86d8c36c4b440eac7a217d19ba6775b033719c3606e19d205f30e9bf039ae01e
 
 channels:
   - conda-forge
@@ -150,7 +150,7 @@ dependencies:
   - libxml2=2.13.7=h81593ed_1
   - libzlib=1.3.1=hb9d3cd8_2
   - linkify-it-py=2.0.3=pyhd8ed1ab_1
-  - llvm-openmp=20.1.2=h024ca30_1
+  - llvm-openmp=20.1.3=h024ca30_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markdown-it-py=2.2.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py312h178313f_1
diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6
+# input_hash: 86d8c36c4b440eac7a217d19ba6775b033719c3606e19d205f30e9bf039ae01e
 
 channels:
   - conda-forge
@@ -86,7 +86,7 @@ dependencies:
   - libxcrypt=4.4.36=hd590300_1
   - libxml2=2.13.7=h81593ed_1
   - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=20.1.2=h024ca30_1
+  - llvm-openmp=20.1.3=h024ca30_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py312h178313f_1
   - matplotlib-base=3.8.4=py312h20ab3a6_2
diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c
+# input_hash: dd5f3d6403d5db52a5e41fb35b60dce2df1a615f984bba47e191a2a14a68dd3c
 
 channels:
   - conda-forge
@@ -139,7 +139,7 @@ dependencies:
   - libxml2=2.13.7=h442d1da_1
   - libzlib=1.3.1=h2466b09_2
   - linkify-it-py=2.0.3=pyhd8ed1ab_1
-  - llvm-openmp=20.1.2=h30eaf37_1
+  - llvm-openmp=20.1.3=h30eaf37_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markdown-it-py=2.2.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py312h31fea79_1
diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c
+# input_hash: dd5f3d6403d5db52a5e41fb35b60dce2df1a615f984bba47e191a2a14a68dd3c
 
 channels:
   - conda-forge
@@ -74,7 +74,7 @@ dependencies:
   - libxcb=1.17.0=h0e4246c_0
   - libxml2=2.13.7=h442d1da_1
   - libzlib=1.3.1=h2466b09_2
-  - llvm-openmp=20.1.2=h30eaf37_1
+  - llvm-openmp=20.1.3=h30eaf37_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py312h31fea79_1
   - matplotlib-base=3.8.4=py312hfee7060_2
diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml
@@ -15,8 +15,8 @@
 version: 1
 metadata:
   content_hash:
-    win-64: ec72eab9be00c6979c74796870e2eaa91e103fd1d842d4500d117273ba4dafb3
-    linux-64: a2cabf95bacbfd8bb5d66336f2fc65ab4b93835b9bef2e05f11dc76ab05735ee
+    win-64: eaae335cf36adc80372dc46b8513b3371068cb4b78164f9bf33218ae884e5a43
+    linux-64: d20cb4f62773f79495ca5432e662a34453afa41e6084f06c349fbb84600a44bb
   channels:
   - url: conda-forge
     used_env_vars: []
@@ -4062,29 +4062,29 @@ package:
   category: dev
   optional: true
 - name: llvm-openmp
-  version: 20.1.2
+  version: 20.1.3
   manager: conda
   platform: linux-64
   dependencies:
     __glibc: '>=2.17,<3.0.a0'
-  url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda
+  url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda
   hash:
-    md5: 39a3992c2624b8d8e6b4994dedf3102a
-    sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1
+    md5: c721339ea8746513e42b1233b4bbdfb0
+    sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48
   category: main
   optional: false
 - name: llvm-openmp
-  version: 20.1.2
+  version: 20.1.3
   manager: conda
   platform: win-64
   dependencies:
     ucrt: '>=10.0.20348.0'
     vc: '>=14.2,<15'
     vc14_runtime: '>=14.29.30139'
-  url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda
+  url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda
   hash:
-    md5: d5a4f53b65d7d1d53104ba24107eda04
-    sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299
+    md5: 183c102075722a7aa993f94de1d135f2
+    sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669
   category: main
   optional: false
 - name: locket
diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml
@@ -15,8 +15,8 @@
 version: 1
 metadata:
   content_hash:
-    win-64: f482900cbfe344b8756276d846dfd524d787c9d1087262096487976a618ab091
-    linux-64: 46d7afdeb5add5b5662d343add0729699b5b974363284a7a28caf6c32087c650
+    win-64: 2d7c4e988ae2df2fbd8349e86ba264f7eb281505021cebbdb8d9a2d3b0dda7ad
+    linux-64: c83206a2eacb4c3e0efe0aa15f924d81adc9fe1f02d077a12434b468bb2045e6
   channels:
   - url: conda-forge
     used_env_vars: []
@@ -4114,29 +4114,29 @@ package:
   category: dev
   optional: true
 - name: llvm-openmp
-  version: 20.1.2
+  version: 20.1.3
   manager: conda
   platform: linux-64
   dependencies:
     __glibc: '>=2.17,<3.0.a0'
-  url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda
+  url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda
   hash:
-    md5: 39a3992c2624b8d8e6b4994dedf3102a
-    sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1
+    md5: c721339ea8746513e42b1233b4bbdfb0
+    sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48
   category: main
   optional: false
 - name: llvm-openmp
-  version: 20.1.2
+  version: 20.1.3
   manager: conda
   platform: win-64
   dependencies:
     ucrt: '>=10.0.20348.0'
     vc: '>=14.2,<15'
     vc14_runtime: '>=14.29.30139'
-  url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda
+  url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda
   hash:
-    md5: d5a4f53b65d7d1d53104ba24107eda04
-    sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299
+    md5: 183c102075722a7aa993f94de1d135f2
+    sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669
   category: main
   optional: false
 - name: locket
diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml
@@ -15,8 +15,8 @@
 version: 1
 metadata:
   content_hash:
-    win-64: 5a7e9e19b107ad74fd7af8b2d1f69ae9733a547063210391aee8c497f0a7962c
-    linux-64: 05900a15d902cd9ad1ad3f1d88b70ed5a188e17024ee606718394727d58b10e6
+    win-64: dd5f3d6403d5db52a5e41fb35b60dce2df1a615f984bba47e191a2a14a68dd3c
+    linux-64: 86d8c36c4b440eac7a217d19ba6775b033719c3606e19d205f30e9bf039ae01e
   channels:
   - url: conda-forge
     used_env_vars: []
@@ -4114,29 +4114,29 @@ package:
   category: dev
   optional: true
 - name: llvm-openmp
-  version: 20.1.2
+  version: 20.1.3
   manager: conda
   platform: linux-64
   dependencies:
     __glibc: '>=2.17,<3.0.a0'
-  url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_1.conda
+  url: https://packages.prefix.dev/conda-forge/linux-64/llvm-openmp-20.1.3-h024ca30_0.conda
   hash:
-    md5: 39a3992c2624b8d8e6b4994dedf3102a
-    sha256: 2c70e18a5bcb3fc2925e5d2c2c39559253d19e38c111afc91885f0dee4540fb1
+    md5: c721339ea8746513e42b1233b4bbdfb0
+    sha256: 4327a463f43b0d95ca0e5f92094383ef53fd2a91d649debfc531b941fe44fd48
   category: main
   optional: false
 - name: llvm-openmp
-  version: 20.1.2
+  version: 20.1.3
   manager: conda
   platform: win-64
   dependencies:
     ucrt: '>=10.0.20348.0'
     vc: '>=14.2,<15'
     vc14_runtime: '>=14.29.30139'
-  url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_1.conda
+  url: https://packages.prefix.dev/conda-forge/win-64/llvm-openmp-20.1.3-h30eaf37_0.conda
   hash:
-    md5: d5a4f53b65d7d1d53104ba24107eda04
-    sha256: 3ba2b892d6e153599512fa7fe2791125ff1b7dd6740469f74aff2d1b48edf299
+    md5: 183c102075722a7aa993f94de1d135f2
+    sha256: 27326e733ce7ad87054a409c02b829594cc6276232b987eb135cd1a225eac669
   category: main
   optional: false
 - name: locket
diff --git a/pylintrc b/pylintrc
@@ -355,7 +355,7 @@ exclude-too-few-public-methods=
 ignored-parents=
 
 # Maximum number of arguments for function / method.
-max-args=6
+max-args=9  # as long as not hitting too-many-positional-arguments
 
 # Maximum number of attributes for a class (see R0902).
 max-attributes=15
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,9 +30,11 @@ include = [
 [tool.poetry.dependencies]
 python = "^3.10"
 
-dask-core = "2025.3.*"  # also in simpeg[dask]
+# note: py-deps-clock defines custom mapping from dask to dask-core
+dask = ">=2025.3, <2025.4.dev"  # also in simpeg[dask]
+
 discretize = "0.11.*"  # also in simpeg, octree-creation-app
-distributed = "2025.3.*"  # conda needs explicit dask-core etc for equivalent dask[distributed]
+distributed = ">=2025.3, <2025.4.dev"  # for dask[distributed]
 numpy = "~1.26.0" # also in geoh5py, simpeg
 pydantic = "^2.5.2"  # also in geoh5py, curve-apps, geoapps-utils
 scikit-learn = "~1.4.0"
diff --git a/recipe.yaml b/recipe.yaml
@@ -60,11 +60,7 @@ tests:
         - geoh5py
         - dask
         - distributed
-
-      # `pip check` fails on missing dask-core because it only sees name 'dask'
-      # Possibly, use custom mapping for dask => dask-core
-      # See `conda-lock --pypi_to_conda_lookup_file`, or the `pixi` option "conda-pypi-map"
-      pip_check: false
+      pip_check: true
 
   - script:
       - pytest --ignore=tests/version_test.py
@@ -79,8 +75,10 @@ tests:
 
 about:
   license: MIT
-  license_file:
-    - LICENSE
+  license_file: LICENSE
+  homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/
+  repository: https://github.com/MiraGeoscience/simpeg-drivers
+  documentation: https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/
 
 extra:
   recipe-maintainers:
