Skip to content

GEOPY-1571 #42

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

Merged
domfournier merged 6 commits into from
Nov 15, 2025
Merged

GEOPY-1571 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef105d2
Add validation for single layer block models
benk-mira Oct 31, 2025
fb47714
Add catch for error and update types from BaseData -> Options and Bas…
benk-mira Oct 31, 2025
9b0b5c6
rename BaseData -> Options in error message
benk-mira Oct 31, 2025
8f4596d
re-lock
benk-mira Nov 10, 2025
0ca6753
Merge branch 'develop' into GEOPY-1571b
benk-mira Nov 10, 2025
886177f
remove outdated suggestion-mode flag
benk-mira Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions py-3.10.conda-lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ package:
dependencies:
hpack: '>=4.1,<5'
hyperframe: '>=6.1,<7'
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/h2-4.3.0-pyhcf101f3_0.conda
hash:
md5: 164fc43f0b53b6e3a7bc7dce5e4f1dc9
Expand Down Expand Up @@ -1107,7 +1107,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.9'
zipp: '>=3.20'
url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-8.7.0-pyhe01879c_1.conda
hash:
Expand Down Expand Up @@ -2543,7 +2543,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/networkx-3.4.2-pyh267e887_2.conda
hash:
md5: fd40bf7f7f4bc4b647dc8512053d9873
Expand Down Expand Up @@ -2667,7 +2667,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.8'
url: https://repo.prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda
hash:
md5: 58335b26c38bf4a20f399384c33cbcf9
Expand Down Expand Up @@ -2767,7 +2767,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.5.0-pyhcf101f3_0.conda
hash:
md5: 5c7a868f8241e64e1cf5fdf4962f23e2
Expand Down Expand Up @@ -2842,7 +2842,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.9'
url: https://repo.prefix.dev/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda
hash:
md5: 12c566707c80111f9799308d9e265aef
Expand Down Expand Up @@ -2971,7 +2971,7 @@ package:
isort: '>=5,<8,!=5.13'
mccabe: '>=0.6,<0.8'
platformdirs: '>=2.2'
python: ''
python: '>=3.10'
tomli: '>=1.1.0'
tomlkit: '>=0.10.1'
url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.2-pyhcf101f3_0.conda
Expand Down Expand Up @@ -3037,7 +3037,7 @@ package:
packaging: '>=22'
pluggy: '>=1.5,<2'
pygments: '>=2.7.2'
python: ''
python: '>=3.10'
tomli: '>=1'
url: https://repo.prefix.dev/conda-forge/noarch/pytest-9.0.0-pyhcf101f3_0.conda
hash:
Expand Down Expand Up @@ -3068,7 +3068,7 @@ package:
coverage: '>=7.10.6'
pluggy: '>=1.2'
pytest: '>=7'
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/pytest-cov-7.0.0-pyhcf101f3_1.conda
hash:
md5: 6891acad5e136cb62a8c2ed2679d6528
Expand Down Expand Up @@ -3914,7 +3914,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda
hash:
md5: d2732eb636c264dc9aa4cbee404b1a53
Expand Down Expand Up @@ -4038,7 +4038,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda
hash:
md5: 0caa1af407ecff61170c9437a808404d
Expand Down
54 changes: 27 additions & 27 deletions py-3.11.conda-lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ package:
dependencies:
hpack: '>=4.1,<5'
hyperframe: '>=6.1,<7'
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/h2-4.3.0-pyhcf101f3_0.conda
hash:
md5: 164fc43f0b53b6e3a7bc7dce5e4f1dc9
Expand All @@ -776,7 +776,7 @@ package:
dependencies:
hpack: '>=4.1,<5'
hyperframe: '>=6.1,<7'
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/h2-4.3.0-pyhcf101f3_0.conda
hash:
md5: 164fc43f0b53b6e3a7bc7dce5e4f1dc9
Expand Down Expand Up @@ -1092,7 +1092,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.9'
zipp: '>=3.20'
url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-8.7.0-pyhe01879c_1.conda
hash:
Expand All @@ -1105,7 +1105,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.9'
zipp: '>=3.20'
url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-8.7.0-pyhe01879c_1.conda
hash:
Expand Down Expand Up @@ -1428,7 +1428,7 @@ package:
manager: conda
platform: linux-64
dependencies:
libopenblas: '>=0.3.30,<1.0a0'
libopenblas: '>=0.3.30,<0.3.31.0a0'
url: https://repo.prefix.dev/conda-forge/linux-64/libblas-3.9.0-38_h4a7cf45_openblas.conda
hash:
md5: 3509b5e2aaa5f119013c8969fdd9a905
Expand Down Expand Up @@ -2529,7 +2529,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.11'
url: https://repo.prefix.dev/conda-forge/noarch/networkx-3.5-pyhe01879c_0.conda
hash:
md5: 16bff3d37a4f99e3aa089c36c2b8d650
Expand All @@ -2541,7 +2541,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.11'
url: https://repo.prefix.dev/conda-forge/noarch/networkx-3.5-pyhe01879c_0.conda
hash:
md5: 16bff3d37a4f99e3aa089c36c2b8d650
Expand Down Expand Up @@ -2653,7 +2653,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.8'
url: https://repo.prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda
hash:
md5: 58335b26c38bf4a20f399384c33cbcf9
Expand All @@ -2665,7 +2665,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.8'
url: https://repo.prefix.dev/conda-forge/noarch/packaging-25.0-pyh29332c3_1.conda
hash:
md5: 58335b26c38bf4a20f399384c33cbcf9
Expand Down Expand Up @@ -2753,7 +2753,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.5.0-pyhcf101f3_0.conda
hash:
md5: 5c7a868f8241e64e1cf5fdf4962f23e2
Expand All @@ -2765,7 +2765,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.5.0-pyhcf101f3_0.conda
hash:
md5: 5c7a868f8241e64e1cf5fdf4962f23e2
Expand Down Expand Up @@ -2828,7 +2828,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.9'
url: https://repo.prefix.dev/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda
hash:
md5: 12c566707c80111f9799308d9e265aef
Expand All @@ -2840,7 +2840,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.9'
url: https://repo.prefix.dev/conda-forge/noarch/pycparser-2.22-pyh29332c3_1.conda
hash:
md5: 12c566707c80111f9799308d9e265aef
Expand Down Expand Up @@ -2949,7 +2949,7 @@ package:
isort: '>=5,<8,!=5.13'
mccabe: '>=0.6,<0.8'
platformdirs: '>=2.2'
python: ''
python: '>=3.10'
tomli: '>=1.1.0'
tomlkit: '>=0.10.1'
url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.2-pyhcf101f3_0.conda
Expand All @@ -2969,7 +2969,7 @@ package:
isort: '>=5,<8,!=5.13'
mccabe: '>=0.6,<0.8'
platformdirs: '>=2.2'
python: ''
python: '>=3.10'
tomli: '>=1.1.0'
tomlkit: '>=0.10.1'
url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.2-pyhcf101f3_0.conda
Expand Down Expand Up @@ -3016,7 +3016,7 @@ package:
packaging: '>=22'
pluggy: '>=1.5,<2'
pygments: '>=2.7.2'
python: ''
python: '>=3.10'
tomli: '>=1'
url: https://repo.prefix.dev/conda-forge/noarch/pytest-9.0.0-pyhcf101f3_0.conda
hash:
Expand All @@ -3035,7 +3035,7 @@ package:
packaging: '>=22'
pluggy: '>=1.5,<2'
pygments: '>=2.7.2'
python: ''
python: '>=3.10'
tomli: '>=1'
url: https://repo.prefix.dev/conda-forge/noarch/pytest-9.0.0-pyhcf101f3_0.conda
hash:
Expand All @@ -3051,7 +3051,7 @@ package:
coverage: '>=7.10.6'
pluggy: '>=1.2'
pytest: '>=7'
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/pytest-cov-7.0.0-pyhcf101f3_1.conda
hash:
md5: 6891acad5e136cb62a8c2ed2679d6528
Expand All @@ -3066,7 +3066,7 @@ package:
coverage: '>=7.10.6'
pluggy: '>=1.2'
pytest: '>=7'
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/pytest-cov-7.0.0-pyhcf101f3_1.conda
hash:
md5: 6891acad5e136cb62a8c2ed2679d6528
Expand Down Expand Up @@ -3397,7 +3397,7 @@ package:
libgfortran5: '>=13.3.0'
liblapack: '>=3.9.0,<4.0a0'
libstdcxx: '>=13'
numpy: '>=1.23.5'
numpy: <2.3
python: '>=3.11,<3.12.0a0'
python_abi: 3.11.*
url: https://repo.prefix.dev/conda-forge/linux-64/scipy-1.14.1-py311he9a78e4_2.conda
Expand All @@ -3414,7 +3414,7 @@ package:
libblas: '>=3.9.0,<4.0a0'
libcblas: '>=3.9.0,<4.0a0'
liblapack: '>=3.9.0,<4.0a0'
numpy: '>=1.23.5'
numpy: <2.3
python: '>=3.11,<3.12.0a0'
python_abi: 3.11.*
ucrt: '>=10.0.20348.0'
Expand Down Expand Up @@ -3924,7 +3924,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda
hash:
md5: d2732eb636c264dc9aa4cbee404b1a53
Expand All @@ -3936,7 +3936,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.3.0-pyhcf101f3_0.conda
hash:
md5: d2732eb636c264dc9aa4cbee404b1a53
Expand Down Expand Up @@ -4048,7 +4048,7 @@ package:
manager: conda
platform: linux-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda
hash:
md5: 0caa1af407ecff61170c9437a808404d
Expand All @@ -4060,7 +4060,7 @@ package:
manager: conda
platform: win-64
dependencies:
python: ''
python: '>=3.10'
url: https://repo.prefix.dev/conda-forge/noarch/typing_extensions-4.15.0-pyhcf101f3_0.conda
hash:
md5: 0caa1af407ecff61170c9437a808404d
Expand Down Expand Up @@ -4390,7 +4390,7 @@ package:
libgcc: '>=14'
python: ''
python_abi: 3.11.*
zstd: '>=1.5.7,<1.6.0a0'
zstd: '>=1.5.7,<1.5.8.0a0'
url: https://repo.prefix.dev/conda-forge/linux-64/zstandard-0.25.0-py311haee01d2_1.conda
hash:
md5: ca45bfd4871af957aaa5035593d5efd2
Expand All @@ -4408,7 +4408,7 @@ package:
ucrt: '>=10.0.20348.0'
vc: '>=14.3,<15'
vc14_runtime: '>=14.44.35208'
zstd: '>=1.5.7,<1.6.0a0'
zstd: '>=1.5.7,<1.5.8.0a0'
url: https://repo.prefix.dev/conda-forge/win-64/zstandard-0.25.0-py311hf893f09_1.conda
hash:
md5: b2d90bca78b57c17205ce3ca1c427813
Expand Down
Loading