diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 5dc1b1273..bd40a8991 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -6,7 +6,7 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=3_kmp_llvm + - _openmp_mutex=4.5=4_kmp_llvm - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 @@ -100,9 +100,9 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.17.2=pyh80e38bb_0 + - jupytext=1.17.3=pyh80e38bb_0 - keyutils=1.6.3=hb9d3cd8_0 - - kiwisolver=1.4.9=py310haaf941d_0 + - kiwisolver=1.4.9=py310haaf941d_1 - krb5=1.21.3=h659f571_0 - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 @@ -284,7 +284,7 @@ dependencies: - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 - uc-micro-py=1.0.3=pyhd8ed1ab_1 - - unicodedata2=16.0.0=py310ha75aee5_0 + - unicodedata2=16.0.0=py310h7c4b9e2_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - wcwidth=0.2.13=pyhd8ed1ab_1 @@ -304,8 +304,8 @@ dependencies: - zstandard=0.23.0=py310h7c4b9e2_3 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 30067b7e4..ad863dc33 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -6,7 +6,7 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=3_kmp_llvm + - _openmp_mutex=4.5=4_kmp_llvm - annotated-types=0.7.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -43,7 +43,7 @@ dependencies: - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - keyutils=1.6.3=hb9d3cd8_0 - - kiwisolver=1.4.9=py310haaf941d_0 + - kiwisolver=1.4.9=py310haaf941d_1 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 @@ -143,7 +143,7 @@ dependencies: - typing-inspection=0.4.1=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - - unicodedata2=16.0.0=py310ha75aee5_0 + - unicodedata2=16.0.0=py310h7c4b9e2_1 - urllib3=2.5.0=pyhd8ed1ab_0 - wheel=0.45.1=pyhd8ed1ab_1 - xorg-libxau=1.0.12=hb9d3cd8_0 @@ -156,8 +156,8 @@ dependencies: - zstandard=0.23.0=py310h7c4b9e2_3 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 0c4c81e22..1c0ecde8f 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -100,8 +100,8 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.17.2=pyh80e38bb_0 - - kiwisolver=1.4.9=py310h1e1005b_0 + - jupytext=1.17.3=pyh80e38bb_0 + - kiwisolver=1.4.9=py310h1e1005b_1 - krb5=1.21.3=hdf4eb48_0 - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 @@ -206,7 +206,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - - pywin32=311=py310h282bd7d_0 + - pywin32=311=py310h282bd7d_1 - pywinpty=2.0.15=py310h9e98ed7_0 - pyyaml=6.0.2=py310h38315fa_2 - pyzmq=27.0.2=py310h535538e_2 @@ -269,7 +269,7 @@ dependencies: - tzdata=2025b=h78e105d_0 - uc-micro-py=1.0.3=pyhd8ed1ab_1 - ucrt=10.0.26100.0=h57928b3_0 - - unicodedata2=16.0.0=py310ha8f682b_0 + - unicodedata2=16.0.0=py310h29418f3_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - vc=14.3=h41ae7f8_31 @@ -294,8 +294,8 @@ dependencies: - zstandard=0.23.0=py310h29418f3_3 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index c58189329..66dcf60c3 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -41,7 +41,7 @@ dependencies: - importlib-metadata=8.7.0=pyhe01879c_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - - kiwisolver=1.4.9=py310h1e1005b_0 + - kiwisolver=1.4.9=py310h1e1005b_1 - krb5=1.21.3=hdf4eb48_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -127,7 +127,7 @@ dependencies: - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - ucrt=10.0.26100.0=h57928b3_0 - - unicodedata2=16.0.0=py310ha8f682b_0 + - unicodedata2=16.0.0=py310h29418f3_1 - urllib3=2.5.0=pyhd8ed1ab_0 - vc=14.3=h41ae7f8_31 - vc14_runtime=14.44.35208=h818238b_31 @@ -144,8 +144,8 @@ dependencies: - zstandard=0.23.0=py310h29418f3_3 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index aac2e690e..f40c640bd 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -6,7 +6,7 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=3_kmp_llvm + - _openmp_mutex=4.5=4_kmp_llvm - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 @@ -76,7 +76,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh82676e8_0 - - ipython=9.4.0=pyhfa0c392_0 + - ipython=9.5.0=pyhfa0c392_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -102,9 +102,9 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.17.2=pyh80e38bb_0 + - jupytext=1.17.3=pyh80e38bb_0 - keyutils=1.6.3=hb9d3cd8_0 - - kiwisolver=1.4.9=py311h724c32c_0 + - kiwisolver=1.4.9=py311h724c32c_1 - krb5=1.21.3=h659f571_0 - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 @@ -286,7 +286,7 @@ dependencies: - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 - uc-micro-py=1.0.3=pyhd8ed1ab_1 - - unicodedata2=16.0.0=py311h9ecbd09_0 + - unicodedata2=16.0.0=py311h49ec1c0_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - wcwidth=0.2.13=pyhd8ed1ab_1 @@ -307,8 +307,8 @@ dependencies: - zstandard=0.23.0=py311h49ec1c0_3 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 32697e734..302820d21 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -6,7 +6,7 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=3_kmp_llvm + - _openmp_mutex=4.5=4_kmp_llvm - annotated-types=0.7.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -44,7 +44,7 @@ dependencies: - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - keyutils=1.6.3=hb9d3cd8_0 - - kiwisolver=1.4.9=py311h724c32c_0 + - kiwisolver=1.4.9=py311h724c32c_1 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 @@ -144,7 +144,7 @@ dependencies: - typing-inspection=0.4.1=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - - unicodedata2=16.0.0=py311h9ecbd09_0 + - unicodedata2=16.0.0=py311h49ec1c0_1 - urllib3=2.5.0=pyhd8ed1ab_0 - wheel=0.45.1=pyhd8ed1ab_1 - wrapt=1.17.3=py311h49ec1c0_0 @@ -158,8 +158,8 @@ dependencies: - zstandard=0.23.0=py311h49ec1c0_3 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 1a5edb33c..e14ad3210 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -76,7 +76,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh3521513_0 - - ipython=9.4.0=pyh6be1c34_0 + - ipython=9.5.0=pyh6be1c34_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -102,8 +102,8 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.17.2=pyh80e38bb_0 - - kiwisolver=1.4.9=py311h275cad7_0 + - jupytext=1.17.3=pyh80e38bb_0 + - kiwisolver=1.4.9=py311h275cad7_1 - krb5=1.21.3=hdf4eb48_0 - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 @@ -208,7 +208,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - - pywin32=311=py311hefeebc8_0 + - pywin32=311=py311hefeebc8_1 - pywinpty=2.0.15=py311hda3d55a_0 - pyyaml=6.0.2=py311h5082efb_2 - pyzmq=27.0.2=py311hb77b9c8_2 @@ -271,7 +271,7 @@ dependencies: - tzdata=2025b=h78e105d_0 - uc-micro-py=1.0.3=pyhd8ed1ab_1 - ucrt=10.0.26100.0=h57928b3_0 - - unicodedata2=16.0.0=py311he736701_0 + - unicodedata2=16.0.0=py311h3485c13_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - vc=14.3=h41ae7f8_31 @@ -297,8 +297,8 @@ dependencies: - zstandard=0.23.0=py311h3485c13_3 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 8c2b727ee..d90393fa0 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -42,7 +42,7 @@ dependencies: - importlib-metadata=8.7.0=pyhe01879c_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - - kiwisolver=1.4.9=py311h275cad7_0 + - kiwisolver=1.4.9=py311h275cad7_1 - krb5=1.21.3=hdf4eb48_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -128,7 +128,7 @@ dependencies: - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - ucrt=10.0.26100.0=h57928b3_0 - - unicodedata2=16.0.0=py311he736701_0 + - unicodedata2=16.0.0=py311h3485c13_1 - urllib3=2.5.0=pyhd8ed1ab_0 - vc=14.3=h41ae7f8_31 - vc14_runtime=14.44.35208=h818238b_31 @@ -146,8 +146,8 @@ dependencies: - zstandard=0.23.0=py311h3485c13_3 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index c8dbcfaf4..e326c744d 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -6,7 +6,7 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=3_kmp_llvm + - _openmp_mutex=4.5=4_kmp_llvm - _python_abi3_support=1.0=hd8ed1ab_2 - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 @@ -78,7 +78,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh82676e8_0 - - ipython=9.4.0=pyhfa0c392_0 + - ipython=9.5.0=pyhfa0c392_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -104,9 +104,9 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.17.2=pyh80e38bb_0 + - jupytext=1.17.3=pyh80e38bb_0 - keyutils=1.6.3=hb9d3cd8_0 - - kiwisolver=1.4.9=py312h0a2e395_0 + - kiwisolver=1.4.9=py312h0a2e395_1 - krb5=1.21.3=h659f571_0 - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 @@ -289,7 +289,7 @@ dependencies: - typing_utils=0.1.0=pyhd8ed1ab_1 - tzdata=2025b=h78e105d_0 - uc-micro-py=1.0.3=pyhd8ed1ab_1 - - unicodedata2=16.0.0=py312h66e93f0_0 + - unicodedata2=16.0.0=py312h4c3975b_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - wcwidth=0.2.13=pyhd8ed1ab_1 @@ -310,8 +310,8 @@ dependencies: - zstandard=0.23.0=py312h4c3975b_3 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 40c9c4144..3affe326d 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -6,7 +6,7 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=3_kmp_llvm + - _openmp_mutex=4.5=4_kmp_llvm - annotated-types=0.7.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - bokeh=3.6.3=pyhd8ed1ab_0 @@ -44,7 +44,7 @@ dependencies: - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - keyutils=1.6.3=hb9d3cd8_0 - - kiwisolver=1.4.9=py312h0a2e395_0 + - kiwisolver=1.4.9=py312h0a2e395_1 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 @@ -144,7 +144,7 @@ dependencies: - typing-inspection=0.4.1=pyhd8ed1ab_0 - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - - unicodedata2=16.0.0=py312h66e93f0_0 + - unicodedata2=16.0.0=py312h4c3975b_1 - urllib3=2.5.0=pyhd8ed1ab_0 - wheel=0.45.1=pyhd8ed1ab_1 - wrapt=1.17.3=py312h4c3975b_0 @@ -158,8 +158,8 @@ dependencies: - zstandard=0.23.0=py312h4c3975b_3 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 905abc008..803675ccc 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -77,7 +77,7 @@ dependencies: - importlib_metadata=8.7.0=h40b2b14_1 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.30.1=pyh3521513_0 - - ipython=9.4.0=pyh6be1c34_0 + - ipython=9.5.0=pyh6be1c34_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 @@ -103,8 +103,8 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.17.2=pyh80e38bb_0 - - kiwisolver=1.4.9=py312h78d62e6_0 + - jupytext=1.17.3=pyh80e38bb_0 + - kiwisolver=1.4.9=py312h78d62e6_1 - krb5=1.21.3=hdf4eb48_0 - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 @@ -210,7 +210,7 @@ dependencies: - python-tzdata=2025.2=pyhd8ed1ab_0 - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - - pywin32=311=py312h829343e_0 + - pywin32=311=py312h829343e_1 - pywinpty=2.0.15=py312h275cf98_0 - pyyaml=6.0.2=py312h31fea79_2 - pyzmq=27.0.2=py312hbb5da91_2 @@ -273,7 +273,7 @@ dependencies: - tzdata=2025b=h78e105d_0 - uc-micro-py=1.0.3=pyhd8ed1ab_1 - ucrt=10.0.26100.0=h57928b3_0 - - unicodedata2=16.0.0=py312h4389bb4_0 + - unicodedata2=16.0.0=py312he06e257_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - vc=14.3=h41ae7f8_31 @@ -299,8 +299,8 @@ dependencies: - zstandard=0.23.0=py312he06e257_3 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 481b552f4..aa51a2402 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -42,7 +42,7 @@ dependencies: - importlib-metadata=8.7.0=pyhe01879c_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.5.2=pyhd8ed1ab_0 - - kiwisolver=1.4.9=py312h78d62e6_0 + - kiwisolver=1.4.9=py312h78d62e6_1 - krb5=1.21.3=hdf4eb48_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -128,7 +128,7 @@ dependencies: - typing_extensions=4.15.0=pyhcf101f3_0 - tzdata=2025b=h78e105d_0 - ucrt=10.0.26100.0=h57928b3_0 - - unicodedata2=16.0.0=py312h4389bb4_0 + - unicodedata2=16.0.0=py312he06e257_1 - urllib3=2.5.0=pyhd8ed1ab_0 - vc=14.3=h41ae7f8_31 - vc14_runtime=14.44.35208=h818238b_31 @@ -146,8 +146,8 @@ dependencies: - zstandard=0.23.0=py312he06e257_3 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index ba5d0e107..71a879e68 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -35,10 +35,10 @@ package: platform: linux-64 dependencies: llvm-openmp: '>=9.0.1' - url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-3_kmp_llvm.conda + url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-4_kmp_llvm.conda hash: - md5: ee5c2118262e30b972bc0b4db8ef0ba5 - sha256: cec7343e76c9da6a42c7e7cba53391daa6b46155054ef61a5ef522ea27c5a058 + md5: cc86eba730b0e87ea9990985d45e60f9 + sha256: b5e8980dd5fd96607fcccd98217b1058ec54566845b757cc0ecef146b5f0a51e category: main optional: false - name: _openmp_mutex @@ -153,7 +153,7 @@ package: dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '' + python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda @@ -345,7 +345,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '>=4.0.0' url: https://repo.prefix.dev/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: @@ -449,7 +449,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' webencodings: '' url: https://repo.prefix.dev/conda-forge/noarch/bleach-6.2.0-pyh29332c3_4.conda hash: @@ -907,7 +907,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: md5: 2da13f2b299d8e1995bafbbe9689a2f7 @@ -1641,7 +1641,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 @@ -1773,7 +1773,7 @@ package: certifi: '' h11: '>=0.16' h2: '>=3,<5' - python: '' + python: '>=3.9' sniffio: 1.* url: https://repo.prefix.dev/conda-forge/noarch/httpcore-1.0.9-pyh29332c3_0.conda hash: @@ -1903,7 +1903,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: @@ -2047,7 +2047,7 @@ package: pickleshare: '' prompt-toolkit: '>=3.0.41,<3.1.0' pygments: '>=2.4.0' - python: '' + python: '>=3.10' stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' @@ -2318,7 +2318,7 @@ package: dependencies: attrs: '>=22.2.0' jsonschema-specifications: '>=2023.3.6' - python: '' + python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.1-pyhe01879c_0.conda @@ -2345,7 +2345,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' referencing: '>=0.31.0' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-specifications-2025.4.1-pyh29332c3_0.conda hash: @@ -2518,7 +2518,7 @@ package: dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.3.0-pyhcf101f3_0.conda hash: md5: 62b7c96c6cd77f8173cc5cada6a9acaa @@ -2620,7 +2620,7 @@ package: dependencies: jsonschema-with-format-nongpl: '>=4.18.0' packaging: '' - python: '' + python: '>=3.9' python-json-logger: '>=2.0.4' pyyaml: '>=5.3' referencing: '' @@ -2680,7 +2680,7 @@ package: overrides: '>=5.0' packaging: '>=22.0' prometheus_client: '>=0.9' - python: '' + python: '>=3.10' pyzmq: '>=24' send2trash: '>=1.8.2' terminado: '>=0.8.3' @@ -2864,7 +2864,7 @@ package: category: dev optional: true - name: jupytext - version: 1.17.2 + version: 1.17.3 manager: conda platform: linux-64 dependencies: @@ -2872,17 +2872,17 @@ package: mdit-py-plugins: '' nbformat: '' packaging: '' - python: '>=3.9' + python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.2-pyh80e38bb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.3-pyh80e38bb_0.conda hash: - md5: 6d0652a97ef103de0c77b9c610d0c20d - sha256: 48986a9c01f17d1d5a598af33814a877fd67a6a3287625718d76617a7d17f51d + md5: 3178d138046fbc2e4944d3642a326814 + sha256: 2da4cfec3f811a37caa583e572ad2dad0b1d5c34f5d7121b4c687692bf1a4a06 category: dev optional: true - name: jupytext - version: 1.17.2 + version: 1.17.3 manager: conda platform: win-64 dependencies: @@ -2890,13 +2890,13 @@ package: mdit-py-plugins: '' nbformat: '' packaging: '' - python: '>=3.9' + python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.2-pyh80e38bb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.3-pyh80e38bb_0.conda hash: - md5: 6d0652a97ef103de0c77b9c610d0c20d - sha256: 48986a9c01f17d1d5a598af33814a877fd67a6a3287625718d76617a7d17f51d + md5: 3178d138046fbc2e4944d3642a326814 + sha256: 2da4cfec3f811a37caa583e572ad2dad0b1d5c34f5d7121b4c687692bf1a4a06 category: dev optional: true - name: keyutils @@ -2922,10 +2922,10 @@ package: libstdcxx: '>=14' python: '' python_abi: 3.10.* - url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.4.9-py310haaf941d_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.4.9-py310haaf941d_1.conda hash: - md5: b5e7e5df6544fc81102bdea6157a0689 - sha256: 26e51a62efbea5c5bb832443020cb2bec366477e1cf7ff324308835523c8fe1b + md5: dccb22849c78cbb9decc0af573c00a45 + sha256: 0d86d9a0b0d34604684197bf16cc1a7f41ebbf14025782708d78a6905e4177e6 category: main optional: false - name: kiwisolver @@ -2938,10 +2938,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.4.9-py310h1e1005b_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.4.9-py310h1e1005b_1.conda hash: - md5: 1dafe400279a912768c930ed12d65a29 - sha256: 077f534795d9c012f028523ad3fe23a269e127e2b66f04963ee2f887ecb38796 + md5: a0695050d0379e201f0c40b89d3b58dd + sha256: dfaae0985b9996c842837dbcadf5c9ef46f1605e752c1934f4cf775783f3f43f category: main optional: false - name: krb5 @@ -4425,7 +4425,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '' url: https://repo.prefix.dev/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: @@ -4599,7 +4599,7 @@ package: myst-parser: '>=1.0.0' nbclient: '' nbformat: '>=5.0' - python: '' + python: '>=3.9' pyyaml: '' sphinx: '>=5' typing_extensions: '' @@ -4751,7 +4751,7 @@ package: packaging: '' pandocfilters: '>=1.4.1' pygments: '>=2.4.1' - python: '' + python: '>=3.9' traitlets: '>=5.1' url: https://repo.prefix.dev/conda-forge/noarch/nbconvert-core-7.16.6-pyh29332c3_0.conda hash: @@ -5093,7 +5093,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 @@ -5203,7 +5203,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/parso-0.8.5-pyhcf101f3_0.conda hash: md5: a110716cdb11cf51482ff4000dc253d7 @@ -5368,7 +5368,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.4.0-pyhcf101f3_0.conda hash: md5: cc9d9a3929503785403dbfad9f707145 @@ -5624,7 +5624,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 @@ -5831,7 +5831,7 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '' + python: '>=3.9' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' @@ -5890,7 +5890,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.3-pyhe01879c_2.conda hash: md5: aa0028616c0750c773698fdc254b2b8d @@ -6063,7 +6063,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' six: '>=1.5' url: https://repo.prefix.dev/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhe01879c_2.conda hash: @@ -6088,7 +6088,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/python-fastjsonschema-2.21.2-pyhe01879c_0.conda hash: md5: 23029aae904a2ba587daba708208012f @@ -6236,10 +6236,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pywin32-311-py310h282bd7d_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywin32-311-py310h282bd7d_1.conda hash: - md5: 2aa8173e07509e44d39e5bc72c9a6237 - sha256: c53c9d4981f97f41b88c2969d8aeb14d7e2685081a0138bab6915f8a3284d602 + md5: 0289b272f8a22ad8fc29d6747383b503 + sha256: 2ce920e200699cc2a114106665451c05efcaf5cf0ca46685d9a7a5914616f7b5 category: dev optional: true - name: pywinpty @@ -6390,7 +6390,7 @@ package: platform: win-64 dependencies: attrs: '>=22.2.0' - python: '' + python: '>=3.9' rpds-py: '>=0.7.0' typing_extensions: '>=4.4.0' url: https://repo.prefix.dev/conda-forge/noarch/referencing-0.36.2-pyh29332c3_0.conda @@ -6500,7 +6500,7 @@ package: platform: win-64 dependencies: lark: '>=1.2.2' - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda hash: md5: 7234f99325263a5af6d4cd195035e8f2 @@ -6717,7 +6717,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: md5: 3339e3b65d58accf4ca4fb8748ab16b3 @@ -7604,7 +7604,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.2.1-pyhe01879c_2.conda hash: md5: 30a0a26c8abccf4b7991d590fe17c699 @@ -7857,7 +7857,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 @@ -7951,13 +7951,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://repo.prefix.dev/conda-forge/linux-64/unicodedata2-16.0.0-py310ha75aee5_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/unicodedata2-16.0.0-py310h7c4b9e2_1.conda hash: - md5: 1d7a4b9202cdd10d56ecdd7f6c347190 - sha256: 0468c864c60190fdb94b4705bca618e77589d5cb9fa096de47caccd1f22b0b54 + md5: 1d54e461bda325196725cdd07ae046cb + sha256: dfe21eb5cbabda72a2e9f4a4a894d6af1389f3dde9340fb454d30cf3375898e7 category: main optional: false - name: unicodedata2 @@ -7968,12 +7968,12 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/unicodedata2-16.0.0-py310ha8f682b_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/unicodedata2-16.0.0-py310h29418f3_1.conda hash: - md5: b28aead44c6e19a1fbba7752aa242b34 - sha256: b59837c68d8edcca3c86c205a8c5dec63356029e48d55ed88c5483105d73ac0c + md5: 228ad20cfebef80487ad5903b33d3abd + sha256: 7c112c804effc021f91f25e59ee2cfa4d6ed76019ec722dd78b9808c118cc9ab category: main optional: false - name: uri-template @@ -8520,41 +8520,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.1.dev157+111b167 + version: 0.6.0a2.dev61+655afd7 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 hash: - sha256: 111b167f8d9a185ff6f140f055297f0a6945de6e + sha256: 655afd735989270d5d03b80a98cbe22844b47066 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 category: main optional: false - name: geoapps-utils - version: 0.5.1.dev157+111b167 + version: 0.6.0a2.dev61+655afd7 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 hash: - sha256: 111b167f8d9a185ff6f140f055297f0a6945de6e + sha256: 655afd735989270d5d03b80a98cbe22844b47066 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev44+fd5f8fb1 + version: 0.12.0a2.dev58+2c9248c6 manager: pip platform: linux-64 dependencies: @@ -8562,16 +8562,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 hash: - sha256: fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + sha256: 2c9248c60e4166fadb973fcd4f1777bb2ee964f6 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev44+fd5f8fb1 + version: 0.12.0a2.dev58+2c9248c6 manager: pip platform: win-64 dependencies: @@ -8579,12 +8579,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 hash: - sha256: fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + sha256: 2c9248c60e4166fadb973fcd4f1777bb2ee964f6 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 category: main optional: false - name: grid-apps @@ -8593,8 +8593,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.5.1.dev157+111b167 - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoapps-utils: 0.6.0a2.dev61+655afd7 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8612,8 +8612,8 @@ package: platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.5.1.dev157+111b167 - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoapps-utils: 0.6.0a2.dev61+655afd7 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 7c196f6f3..a313f8607 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -35,10 +35,10 @@ package: platform: linux-64 dependencies: llvm-openmp: '>=9.0.1' - url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-3_kmp_llvm.conda + url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-4_kmp_llvm.conda hash: - md5: ee5c2118262e30b972bc0b4db8ef0ba5 - sha256: cec7343e76c9da6a42c7e7cba53391daa6b46155054ef61a5ef522ea27c5a058 + md5: cc86eba730b0e87ea9990985d45e60f9 + sha256: b5e8980dd5fd96607fcccd98217b1058ec54566845b757cc0ecef146b5f0a51e category: main optional: false - name: _openmp_mutex @@ -137,7 +137,7 @@ package: dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '' + python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda @@ -153,7 +153,7 @@ package: dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '' + python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda @@ -330,7 +330,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '>=4.0.0' url: https://repo.prefix.dev/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: @@ -343,7 +343,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '>=4.0.0' url: https://repo.prefix.dev/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: @@ -434,7 +434,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' webencodings: '' url: https://repo.prefix.dev/conda-forge/noarch/bleach-6.2.0-pyh29332c3_4.conda hash: @@ -447,7 +447,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' webencodings: '' url: https://repo.prefix.dev/conda-forge/noarch/bleach-6.2.0-pyh29332c3_4.conda hash: @@ -893,7 +893,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: md5: 2da13f2b299d8e1995bafbbe9689a2f7 @@ -905,7 +905,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: md5: 2da13f2b299d8e1995bafbbe9689a2f7 @@ -1651,7 +1651,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 @@ -1665,7 +1665,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 @@ -1780,7 +1780,7 @@ package: certifi: '' h11: '>=0.16' h2: '>=3,<5' - python: '' + python: '>=3.9' sniffio: 1.* url: https://repo.prefix.dev/conda-forge/noarch/httpcore-1.0.9-pyh29332c3_0.conda hash: @@ -1797,7 +1797,7 @@ package: certifi: '' h11: '>=0.16' h2: '>=3,<5' - python: '' + python: '>=3.9' sniffio: 1.* url: https://repo.prefix.dev/conda-forge/noarch/httpcore-1.0.9-pyh29332c3_0.conda hash: @@ -1914,7 +1914,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: @@ -1927,7 +1927,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: @@ -2034,7 +2034,7 @@ package: category: dev optional: true - name: ipython - version: 9.4.0 + version: 9.5.0 manager: conda platform: linux-64 dependencies: @@ -2048,18 +2048,18 @@ package: pickleshare: '' prompt-toolkit: '>=3.0.41,<3.1.0' pygments: '>=2.4.0' - python: '' + python: '>=3.11' stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.4.0-pyhfa0c392_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyhfa0c392_0.conda hash: - md5: cb7706b10f35e7507917cefa0978a66d - sha256: ff5138bf6071ca01d84e1329f6baa96f0723df6fe183cfa1ab3ebc96240e6d8f + md5: c0916cc4b733577cd41df93884d857b0 + sha256: e9ca009d3aab9d8a85f0241d6ada2c7fbc84072008e95f803fa59da3294aa863 category: dev optional: true - name: ipython - version: 9.4.0 + version: 9.5.0 manager: conda platform: win-64 dependencies: @@ -2073,14 +2073,14 @@ package: pickleshare: '' prompt-toolkit: '>=3.0.41,<3.1.0' pygments: '>=2.4.0' - python: '' + python: '>=3.11' stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.4.0-pyh6be1c34_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyh6be1c34_0.conda hash: - md5: b551e25e4fb27ccb51aff2c5dcf178f4 - sha256: 8fb441c9f4b50e38b6059e8984e49208a4e2a4ec4e41b543ebaa894f8261d4c9 + md5: aec1868dd4cbe028b2c8cb11377895a6 + sha256: 658c547dafb10cd0989f2cdf72f8ee9fe8f66240307b64555ee43f6908e9d0ad category: dev optional: true - name: ipython_genutils @@ -2354,7 +2354,7 @@ package: dependencies: attrs: '>=22.2.0' jsonschema-specifications: '>=2023.3.6' - python: '' + python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.1-pyhe01879c_0.conda @@ -2370,7 +2370,7 @@ package: dependencies: attrs: '>=22.2.0' jsonschema-specifications: '>=2023.3.6' - python: '' + python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.1-pyhe01879c_0.conda @@ -2384,7 +2384,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' referencing: '>=0.31.0' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-specifications-2025.4.1-pyh29332c3_0.conda hash: @@ -2397,7 +2397,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' referencing: '>=0.31.0' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-specifications-2025.4.1-pyh29332c3_0.conda hash: @@ -2556,7 +2556,7 @@ package: dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.3.0-pyhcf101f3_0.conda hash: md5: 62b7c96c6cd77f8173cc5cada6a9acaa @@ -2570,7 +2570,7 @@ package: dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.3.0-pyhcf101f3_0.conda hash: md5: 62b7c96c6cd77f8173cc5cada6a9acaa @@ -2652,7 +2652,7 @@ package: dependencies: jsonschema-with-format-nongpl: '>=4.18.0' packaging: '' - python: '' + python: '>=3.9' python-json-logger: '>=2.0.4' pyyaml: '>=5.3' referencing: '' @@ -2672,7 +2672,7 @@ package: dependencies: jsonschema-with-format-nongpl: '>=4.18.0' packaging: '' - python: '' + python: '>=3.9' python-json-logger: '>=2.0.4' pyyaml: '>=5.3' referencing: '' @@ -2702,7 +2702,7 @@ package: overrides: '>=5.0' packaging: '>=22.0' prometheus_client: '>=0.9' - python: '' + python: '>=3.10' pyzmq: '>=24' send2trash: '>=1.8.2' terminado: '>=0.8.3' @@ -2732,7 +2732,7 @@ package: overrides: '>=5.0' packaging: '>=22.0' prometheus_client: '>=0.9' - python: '' + python: '>=3.10' pyzmq: '>=24' send2trash: '>=1.8.2' terminado: '>=0.8.3' @@ -2916,7 +2916,7 @@ package: category: dev optional: true - name: jupytext - version: 1.17.2 + version: 1.17.3 manager: conda platform: linux-64 dependencies: @@ -2924,17 +2924,17 @@ package: mdit-py-plugins: '' nbformat: '' packaging: '' - python: '>=3.9' + python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.2-pyh80e38bb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.3-pyh80e38bb_0.conda hash: - md5: 6d0652a97ef103de0c77b9c610d0c20d - sha256: 48986a9c01f17d1d5a598af33814a877fd67a6a3287625718d76617a7d17f51d + md5: 3178d138046fbc2e4944d3642a326814 + sha256: 2da4cfec3f811a37caa583e572ad2dad0b1d5c34f5d7121b4c687692bf1a4a06 category: dev optional: true - name: jupytext - version: 1.17.2 + version: 1.17.3 manager: conda platform: win-64 dependencies: @@ -2942,13 +2942,13 @@ package: mdit-py-plugins: '' nbformat: '' packaging: '' - python: '>=3.9' + python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.2-pyh80e38bb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.3-pyh80e38bb_0.conda hash: - md5: 6d0652a97ef103de0c77b9c610d0c20d - sha256: 48986a9c01f17d1d5a598af33814a877fd67a6a3287625718d76617a7d17f51d + md5: 3178d138046fbc2e4944d3642a326814 + sha256: 2da4cfec3f811a37caa583e572ad2dad0b1d5c34f5d7121b4c687692bf1a4a06 category: dev optional: true - name: keyutils @@ -2974,10 +2974,10 @@ package: libstdcxx: '>=14' python: '' python_abi: 3.11.* - url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.4.9-py311h724c32c_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.4.9-py311h724c32c_1.conda hash: - md5: 9c869454a8fdb86fabd93df6cf6075a3 - sha256: 51813a024ff9ed172ebd8042ad5927400ece08da2498f815cb61f93c6a455b34 + md5: 92720706b174926bc7238cc24f3b5956 + sha256: 029a00a337e307256beab9cbaefc2c23cd28f040fff6f087703a63bc7487fc14 category: main optional: false - name: kiwisolver @@ -2990,10 +2990,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.4.9-py311h275cad7_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.4.9-py311h275cad7_1.conda hash: - md5: 6be4fb00d6e23f9d027262dc503efd11 - sha256: 8654a25270345bc32d72e4346bc923f25cd8791092736c32b2c82a68d81710a0 + md5: 62b8b3f148d7f47db02304a7de177d13 + sha256: e5e759b61a71e16ba4637c9b08bb8e5c01ee678a47f3e980a7cacb8b0bee58b8 category: main optional: false - name: krb5 @@ -4464,7 +4464,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '' url: https://repo.prefix.dev/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: @@ -4477,7 +4477,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '' url: https://repo.prefix.dev/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: @@ -4490,7 +4490,7 @@ package: manager: conda platform: linux-64 dependencies: - _openmp_mutex: '>=4.5' + _openmp_mutex: '*' llvm-openmp: '>=20.1.8' tbb: 2021.* url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha770c72_17.conda @@ -4629,7 +4629,7 @@ package: myst-parser: '>=1.0.0' nbclient: '' nbformat: '>=5.0' - python: '' + python: '>=3.9' pyyaml: '' sphinx: '>=5' typing_extensions: '' @@ -4651,7 +4651,7 @@ package: myst-parser: '>=1.0.0' nbclient: '' nbformat: '>=5.0' - python: '' + python: '>=3.9' pyyaml: '' sphinx: '>=5' typing_extensions: '' @@ -4776,7 +4776,7 @@ package: packaging: '' pandocfilters: '>=1.4.1' pygments: '>=2.4.1' - python: '' + python: '>=3.9' traitlets: '>=5.1' url: https://repo.prefix.dev/conda-forge/noarch/nbconvert-core-7.16.6-pyh29332c3_0.conda hash: @@ -4803,7 +4803,7 @@ package: packaging: '' pandocfilters: '>=1.4.1' pygments: '>=2.4.1' - python: '' + python: '>=3.9' traitlets: '>=5.1' url: https://repo.prefix.dev/conda-forge/noarch/nbconvert-core-7.16.6-pyh29332c3_0.conda hash: @@ -5135,7 +5135,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 @@ -5147,7 +5147,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 @@ -5162,7 +5162,7 @@ package: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' libstdcxx: '>=14' - numpy: '>=1.23,<3' + numpy: '>=1.22.4' python: '>=3.11,<3.12.0a0' python-dateutil: '>=2.8.2' python-tzdata: '>=2022.7' @@ -5179,7 +5179,7 @@ package: manager: conda platform: win-64 dependencies: - numpy: '>=1.23,<3' + numpy: '>=1.22.4' python: '>=3.11,<3.12.0a0' python-dateutil: '>=2.8.2' python-tzdata: '>=2022.7' @@ -5245,7 +5245,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/parso-0.8.5-pyhcf101f3_0.conda hash: md5: a110716cdb11cf51482ff4000dc253d7 @@ -5257,7 +5257,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/parso-0.8.5-pyhcf101f3_0.conda hash: md5: a110716cdb11cf51482ff4000dc253d7 @@ -5410,7 +5410,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.4.0-pyhcf101f3_0.conda hash: md5: cc9d9a3929503785403dbfad9f707145 @@ -5422,7 +5422,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.4.0-pyhcf101f3_0.conda hash: md5: cc9d9a3929503785403dbfad9f707145 @@ -5666,7 +5666,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 @@ -5678,7 +5678,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 @@ -5864,7 +5864,7 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '' + python: '>=3.9' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' @@ -5885,7 +5885,7 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '' + python: '>=3.9' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' @@ -5932,7 +5932,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.3-pyhe01879c_2.conda hash: md5: aa0028616c0750c773698fdc254b2b8d @@ -5944,7 +5944,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.3-pyhe01879c_2.conda hash: md5: aa0028616c0750c773698fdc254b2b8d @@ -6104,7 +6104,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' six: '>=1.5' url: https://repo.prefix.dev/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhe01879c_2.conda hash: @@ -6117,7 +6117,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' six: '>=1.5' url: https://repo.prefix.dev/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhe01879c_2.conda hash: @@ -6130,7 +6130,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/python-fastjsonschema-2.21.2-pyhe01879c_0.conda hash: md5: 23029aae904a2ba587daba708208012f @@ -6142,7 +6142,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/python-fastjsonschema-2.21.2-pyhe01879c_0.conda hash: md5: 23029aae904a2ba587daba708208012f @@ -6290,10 +6290,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pywin32-311-py311hefeebc8_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywin32-311-py311hefeebc8_1.conda hash: - md5: 7b385a7ffbace41a3c9f723e2474ac33 - sha256: 2c215bb8f88d6c99050718e7acbaefa694609614a8d27f850b9e38394ee7fa54 + md5: c1cfe9f5d8e278cc4d2d4c7b0126634d + sha256: e3ef7e0cc53111ab81b8a9dd3eabc1374d7420d4c9fce3c8631e73310203ad55 category: dev optional: true - name: pywinpty @@ -6429,7 +6429,7 @@ package: platform: linux-64 dependencies: attrs: '>=22.2.0' - python: '' + python: '>=3.9' rpds-py: '>=0.7.0' typing_extensions: '>=4.4.0' url: https://repo.prefix.dev/conda-forge/noarch/referencing-0.36.2-pyh29332c3_0.conda @@ -6444,7 +6444,7 @@ package: platform: win-64 dependencies: attrs: '>=22.2.0' - python: '' + python: '>=3.9' rpds-py: '>=0.7.0' typing_extensions: '>=4.4.0' url: https://repo.prefix.dev/conda-forge/noarch/referencing-0.36.2-pyh29332c3_0.conda @@ -6541,7 +6541,7 @@ package: platform: linux-64 dependencies: lark: '>=1.2.2' - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda hash: md5: 7234f99325263a5af6d4cd195035e8f2 @@ -6554,7 +6554,7 @@ package: platform: win-64 dependencies: lark: '>=1.2.2' - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda hash: md5: 7234f99325263a5af6d4cd195035e8f2 @@ -6674,7 +6674,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 @@ -6691,7 +6691,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' @@ -6759,7 +6759,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: md5: 3339e3b65d58accf4ca4fb8748ab16b3 @@ -6771,7 +6771,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: md5: 3339e3b65d58accf4ca4fb8748ab16b3 @@ -7646,7 +7646,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.2.1-pyhe01879c_2.conda hash: md5: 30a0a26c8abccf4b7991d590fe17c699 @@ -7658,7 +7658,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.2.1-pyhe01879c_2.conda hash: md5: 30a0a26c8abccf4b7991d590fe17c699 @@ -7899,7 +7899,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 @@ -7911,7 +7911,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 @@ -8005,13 +8005,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://repo.prefix.dev/conda-forge/linux-64/unicodedata2-16.0.0-py311h9ecbd09_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/unicodedata2-16.0.0-py311h49ec1c0_1.conda hash: - md5: 51a12678b609f5794985fda8372b1a49 - sha256: e786fb0925515fffc83e393d2a0e2814eaf9be8a434f1982b399841a2c07980b + md5: 3457bd5c93b085bec51cdab58fbd1882 + sha256: e2715a04632d75de539c1510238886ff1d6fc5b7e9e2ec240d8c11c175c1fffd category: main optional: false - name: unicodedata2 @@ -8022,12 +8022,12 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/unicodedata2-16.0.0-py311he736701_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/unicodedata2-16.0.0-py311h3485c13_1.conda hash: - md5: 5ec4da89151e9d55f9ecad019f2d1e58 - sha256: 3f626553bfb49ac756cf40e0c10ecb3a915a86f64e036924ab956b37ad1fa9f4 + md5: 969071f934c7c811f014688e5ec4178f + sha256: d692506a8f0f9452c72d5b4b6d7d39bca7c383ab85749d82a77ad652ccbef940 category: main optional: false - name: uri-template @@ -8605,41 +8605,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.1.dev157+111b167 + version: 0.6.0a2.dev61+655afd7 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 hash: - sha256: 111b167f8d9a185ff6f140f055297f0a6945de6e + sha256: 655afd735989270d5d03b80a98cbe22844b47066 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 category: main optional: false - name: geoapps-utils - version: 0.5.1.dev157+111b167 + version: 0.6.0a2.dev61+655afd7 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 hash: - sha256: 111b167f8d9a185ff6f140f055297f0a6945de6e + sha256: 655afd735989270d5d03b80a98cbe22844b47066 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev44+fd5f8fb1 + version: 0.12.0a2.dev58+2c9248c6 manager: pip platform: linux-64 dependencies: @@ -8647,16 +8647,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 hash: - sha256: fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + sha256: 2c9248c60e4166fadb973fcd4f1777bb2ee964f6 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev44+fd5f8fb1 + version: 0.12.0a2.dev58+2c9248c6 manager: pip platform: win-64 dependencies: @@ -8664,12 +8664,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 hash: - sha256: fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + sha256: 2c9248c60e4166fadb973fcd4f1777bb2ee964f6 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 category: main optional: false - name: grid-apps @@ -8678,8 +8678,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.5.1.dev157+111b167 - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoapps-utils: 0.6.0a2.dev61+655afd7 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8697,8 +8697,8 @@ package: platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.5.1.dev157+111b167 - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoapps-utils: 0.6.0a2.dev61+655afd7 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index a86ab1911..0cbfbdaca 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -35,10 +35,10 @@ package: platform: linux-64 dependencies: llvm-openmp: '>=9.0.1' - url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-3_kmp_llvm.conda + url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-4_kmp_llvm.conda hash: - md5: ee5c2118262e30b972bc0b4db8ef0ba5 - sha256: cec7343e76c9da6a42c7e7cba53391daa6b46155054ef61a5ef522ea27c5a058 + md5: cc86eba730b0e87ea9990985d45e60f9 + sha256: b5e8980dd5fd96607fcccd98217b1058ec54566845b757cc0ecef146b5f0a51e category: main optional: false - name: _openmp_mutex @@ -163,7 +163,7 @@ package: dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '' + python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda @@ -179,7 +179,7 @@ package: dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '' + python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' url: https://repo.prefix.dev/conda-forge/noarch/anyio-4.10.0-pyhe01879c_0.conda @@ -356,7 +356,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '>=4.0.0' url: https://repo.prefix.dev/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: @@ -369,7 +369,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '>=4.0.0' url: https://repo.prefix.dev/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: @@ -460,7 +460,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' webencodings: '' url: https://repo.prefix.dev/conda-forge/noarch/bleach-6.2.0-pyh29332c3_4.conda hash: @@ -473,7 +473,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' webencodings: '' url: https://repo.prefix.dev/conda-forge/noarch/bleach-6.2.0-pyh29332c3_4.conda hash: @@ -919,7 +919,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: md5: 2da13f2b299d8e1995bafbbe9689a2f7 @@ -931,7 +931,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: md5: 2da13f2b299d8e1995bafbbe9689a2f7 @@ -1690,7 +1690,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 @@ -1704,7 +1704,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 @@ -1819,7 +1819,7 @@ package: certifi: '' h11: '>=0.16' h2: '>=3,<5' - python: '' + python: '>=3.9' sniffio: 1.* url: https://repo.prefix.dev/conda-forge/noarch/httpcore-1.0.9-pyh29332c3_0.conda hash: @@ -1836,7 +1836,7 @@ package: certifi: '' h11: '>=0.16' h2: '>=3,<5' - python: '' + python: '>=3.9' sniffio: 1.* url: https://repo.prefix.dev/conda-forge/noarch/httpcore-1.0.9-pyh29332c3_0.conda hash: @@ -1953,7 +1953,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: @@ -1966,7 +1966,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: @@ -2073,7 +2073,7 @@ package: category: dev optional: true - name: ipython - version: 9.4.0 + version: 9.5.0 manager: conda platform: linux-64 dependencies: @@ -2087,18 +2087,18 @@ package: pickleshare: '' prompt-toolkit: '>=3.0.41,<3.1.0' pygments: '>=2.4.0' - python: '' + python: '>=3.11' stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.4.0-pyhfa0c392_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyhfa0c392_0.conda hash: - md5: cb7706b10f35e7507917cefa0978a66d - sha256: ff5138bf6071ca01d84e1329f6baa96f0723df6fe183cfa1ab3ebc96240e6d8f + md5: c0916cc4b733577cd41df93884d857b0 + sha256: e9ca009d3aab9d8a85f0241d6ada2c7fbc84072008e95f803fa59da3294aa863 category: dev optional: true - name: ipython - version: 9.4.0 + version: 9.5.0 manager: conda platform: win-64 dependencies: @@ -2112,14 +2112,14 @@ package: pickleshare: '' prompt-toolkit: '>=3.0.41,<3.1.0' pygments: '>=2.4.0' - python: '' + python: '>=3.11' stack_data: '' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.4.0-pyh6be1c34_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.5.0-pyh6be1c34_0.conda hash: - md5: b551e25e4fb27ccb51aff2c5dcf178f4 - sha256: 8fb441c9f4b50e38b6059e8984e49208a4e2a4ec4e41b543ebaa894f8261d4c9 + md5: aec1868dd4cbe028b2c8cb11377895a6 + sha256: 658c547dafb10cd0989f2cdf72f8ee9fe8f66240307b64555ee43f6908e9d0ad category: dev optional: true - name: ipython_genutils @@ -2393,7 +2393,7 @@ package: dependencies: attrs: '>=22.2.0' jsonschema-specifications: '>=2023.3.6' - python: '' + python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.1-pyhe01879c_0.conda @@ -2409,7 +2409,7 @@ package: dependencies: attrs: '>=22.2.0' jsonschema-specifications: '>=2023.3.6' - python: '' + python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.1-pyhe01879c_0.conda @@ -2423,7 +2423,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' referencing: '>=0.31.0' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-specifications-2025.4.1-pyh29332c3_0.conda hash: @@ -2436,7 +2436,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' referencing: '>=0.31.0' url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-specifications-2025.4.1-pyh29332c3_0.conda hash: @@ -2595,7 +2595,7 @@ package: dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.3.0-pyhcf101f3_0.conda hash: md5: 62b7c96c6cd77f8173cc5cada6a9acaa @@ -2609,7 +2609,7 @@ package: dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.3.0-pyhcf101f3_0.conda hash: md5: 62b7c96c6cd77f8173cc5cada6a9acaa @@ -2691,7 +2691,7 @@ package: dependencies: jsonschema-with-format-nongpl: '>=4.18.0' packaging: '' - python: '' + python: '>=3.9' python-json-logger: '>=2.0.4' pyyaml: '>=5.3' referencing: '' @@ -2711,7 +2711,7 @@ package: dependencies: jsonschema-with-format-nongpl: '>=4.18.0' packaging: '' - python: '' + python: '>=3.9' python-json-logger: '>=2.0.4' pyyaml: '>=5.3' referencing: '' @@ -2741,7 +2741,7 @@ package: overrides: '>=5.0' packaging: '>=22.0' prometheus_client: '>=0.9' - python: '' + python: '>=3.10' pyzmq: '>=24' send2trash: '>=1.8.2' terminado: '>=0.8.3' @@ -2771,7 +2771,7 @@ package: overrides: '>=5.0' packaging: '>=22.0' prometheus_client: '>=0.9' - python: '' + python: '>=3.10' pyzmq: '>=24' send2trash: '>=1.8.2' terminado: '>=0.8.3' @@ -2955,7 +2955,7 @@ package: category: dev optional: true - name: jupytext - version: 1.17.2 + version: 1.17.3 manager: conda platform: linux-64 dependencies: @@ -2963,17 +2963,17 @@ package: mdit-py-plugins: '' nbformat: '' packaging: '' - python: '>=3.9' + python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.2-pyh80e38bb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.3-pyh80e38bb_0.conda hash: - md5: 6d0652a97ef103de0c77b9c610d0c20d - sha256: 48986a9c01f17d1d5a598af33814a877fd67a6a3287625718d76617a7d17f51d + md5: 3178d138046fbc2e4944d3642a326814 + sha256: 2da4cfec3f811a37caa583e572ad2dad0b1d5c34f5d7121b4c687692bf1a4a06 category: dev optional: true - name: jupytext - version: 1.17.2 + version: 1.17.3 manager: conda platform: win-64 dependencies: @@ -2981,13 +2981,13 @@ package: mdit-py-plugins: '' nbformat: '' packaging: '' - python: '>=3.9' + python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.2-pyh80e38bb_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.17.3-pyh80e38bb_0.conda hash: - md5: 6d0652a97ef103de0c77b9c610d0c20d - sha256: 48986a9c01f17d1d5a598af33814a877fd67a6a3287625718d76617a7d17f51d + md5: 3178d138046fbc2e4944d3642a326814 + sha256: 2da4cfec3f811a37caa583e572ad2dad0b1d5c34f5d7121b4c687692bf1a4a06 category: dev optional: true - name: keyutils @@ -3013,10 +3013,10 @@ package: libstdcxx: '>=14' python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.4.9-py312h0a2e395_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.4.9-py312h0a2e395_1.conda hash: - md5: f1f7cfc42b0fa6adb4c304d609077a78 - sha256: abe5ba0c956c5b830c237a5aaf50516ac9ebccf3f9fd9ffb18a5a11640f43677 + md5: cec5c1ea565944a94f82cdd6fba7cc76 + sha256: 42f856c17ea4b9bce5ac5e91d6e58e15d835a3cac32d71bc592dd5031f9c0fb8 category: main optional: false - name: kiwisolver @@ -3029,10 +3029,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.4.9-py312h78d62e6_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.4.9-py312h78d62e6_1.conda hash: - md5: 051ec1f2aae07891d9169fe9927c1cc5 - sha256: 6f7497788ade7349b30d78e4bd1aa017085fe84624240228f6287376d2714c85 + md5: c7c58703547905737c1ee1abf18c4644 + sha256: b47cbb03f268bf0a048df9d455f50bd2e790debf971c450a89a3a56d66a50468 category: main optional: false - name: krb5 @@ -4503,7 +4503,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '' url: https://repo.prefix.dev/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: @@ -4516,7 +4516,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' typing_extensions: '' url: https://repo.prefix.dev/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: @@ -4529,7 +4529,7 @@ package: manager: conda platform: linux-64 dependencies: - _openmp_mutex: '>=4.5' + _openmp_mutex: '*' llvm-openmp: '>=20.1.8' tbb: 2021.* url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha770c72_17.conda @@ -4668,7 +4668,7 @@ package: myst-parser: '>=1.0.0' nbclient: '' nbformat: '>=5.0' - python: '' + python: '>=3.9' pyyaml: '' sphinx: '>=5' typing_extensions: '' @@ -4690,7 +4690,7 @@ package: myst-parser: '>=1.0.0' nbclient: '' nbformat: '>=5.0' - python: '' + python: '>=3.9' pyyaml: '' sphinx: '>=5' typing_extensions: '' @@ -4815,7 +4815,7 @@ package: packaging: '' pandocfilters: '>=1.4.1' pygments: '>=2.4.1' - python: '' + python: '>=3.9' traitlets: '>=5.1' url: https://repo.prefix.dev/conda-forge/noarch/nbconvert-core-7.16.6-pyh29332c3_0.conda hash: @@ -4842,7 +4842,7 @@ package: packaging: '' pandocfilters: '>=1.4.1' pygments: '>=2.4.1' - python: '' + python: '>=3.9' traitlets: '>=5.1' url: https://repo.prefix.dev/conda-forge/noarch/nbconvert-core-7.16.6-pyh29332c3_0.conda hash: @@ -5174,7 +5174,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 @@ -5186,7 +5186,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 @@ -5201,7 +5201,7 @@ package: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' libstdcxx: '>=14' - numpy: '>=1.23,<3' + numpy: '>=1.22.4' python: '>=3.12,<3.13.0a0' python-dateutil: '>=2.8.2' python-tzdata: '>=2022.7' @@ -5218,7 +5218,7 @@ package: manager: conda platform: win-64 dependencies: - numpy: '>=1.23,<3' + numpy: '>=1.22.4' python: '>=3.12,<3.13.0a0' python-dateutil: '>=2.8.2' python-tzdata: '>=2022.7' @@ -5284,7 +5284,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/parso-0.8.5-pyhcf101f3_0.conda hash: md5: a110716cdb11cf51482ff4000dc253d7 @@ -5296,7 +5296,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/parso-0.8.5-pyhcf101f3_0.conda hash: md5: a110716cdb11cf51482ff4000dc253d7 @@ -5449,7 +5449,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.4.0-pyhcf101f3_0.conda hash: md5: cc9d9a3929503785403dbfad9f707145 @@ -5461,7 +5461,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.10' url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.4.0-pyhcf101f3_0.conda hash: md5: cc9d9a3929503785403dbfad9f707145 @@ -5705,7 +5705,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 @@ -5717,7 +5717,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 @@ -5903,7 +5903,7 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '' + python: '>=3.9' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' @@ -5924,7 +5924,7 @@ package: isort: '>=4.2.5,<7,!=5.13.0' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2.0' - python: '' + python: '>=3.9' tomli: '>=1.1.0' tomlkit: '>=0.10.1' typing_extensions: '>=3.10.0' @@ -5971,7 +5971,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.3-pyhe01879c_2.conda hash: md5: aa0028616c0750c773698fdc254b2b8d @@ -5983,7 +5983,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/pyparsing-3.2.3-pyhe01879c_2.conda hash: md5: aa0028616c0750c773698fdc254b2b8d @@ -6143,7 +6143,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' six: '>=1.5' url: https://repo.prefix.dev/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhe01879c_2.conda hash: @@ -6156,7 +6156,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' six: '>=1.5' url: https://repo.prefix.dev/conda-forge/noarch/python-dateutil-2.9.0.post0-pyhe01879c_2.conda hash: @@ -6169,7 +6169,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/python-fastjsonschema-2.21.2-pyhe01879c_0.conda hash: md5: 23029aae904a2ba587daba708208012f @@ -6181,7 +6181,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/python-fastjsonschema-2.21.2-pyhe01879c_0.conda hash: md5: 23029aae904a2ba587daba708208012f @@ -6355,10 +6355,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/pywin32-311-py312h829343e_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pywin32-311-py312h829343e_1.conda hash: - md5: e9c66e89c71bac06654d9215534e9b83 - sha256: 92d839c037f7aae1657528a9a71c686692251d41ee002132f96a05c923831844 + md5: 64cbe4ecbebe185a2261d3f298a60cde + sha256: a7505522048dad63940d06623f07eb357b9b65510a8d23ff32b99add05aac3a1 category: dev optional: true - name: pywinpty @@ -6496,7 +6496,7 @@ package: platform: linux-64 dependencies: attrs: '>=22.2.0' - python: '' + python: '>=3.9' rpds-py: '>=0.7.0' typing_extensions: '>=4.4.0' url: https://repo.prefix.dev/conda-forge/noarch/referencing-0.36.2-pyh29332c3_0.conda @@ -6511,7 +6511,7 @@ package: platform: win-64 dependencies: attrs: '>=22.2.0' - python: '' + python: '>=3.9' rpds-py: '>=0.7.0' typing_extensions: '>=4.4.0' url: https://repo.prefix.dev/conda-forge/noarch/referencing-0.36.2-pyh29332c3_0.conda @@ -6608,7 +6608,7 @@ package: platform: linux-64 dependencies: lark: '>=1.2.2' - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda hash: md5: 7234f99325263a5af6d4cd195035e8f2 @@ -6621,7 +6621,7 @@ package: platform: win-64 dependencies: lark: '>=1.2.2' - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda hash: md5: 7234f99325263a5af6d4cd195035e8f2 @@ -6741,7 +6741,7 @@ package: libgfortran5: '>=13.3.0' liblapack: '>=3.9.0,<4.0a0' libstdcxx: '>=13' - numpy: '>=1.23.5' + numpy: <2.3 python: '>=3.12,<3.13.0a0' python_abi: 3.12.* url: https://repo.prefix.dev/conda-forge/linux-64/scipy-1.14.1-py312h62794b6_2.conda @@ -6758,7 +6758,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.12,<3.13.0a0' python_abi: 3.12.* ucrt: '>=10.0.20348.0' @@ -6826,7 +6826,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: md5: 3339e3b65d58accf4ca4fb8748ab16b3 @@ -6838,7 +6838,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: md5: 3339e3b65d58accf4ca4fb8748ab16b3 @@ -7713,7 +7713,7 @@ package: manager: conda platform: linux-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.2.1-pyhe01879c_2.conda hash: md5: 30a0a26c8abccf4b7991d590fe17c699 @@ -7725,7 +7725,7 @@ package: manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.9' url: https://repo.prefix.dev/conda-forge/noarch/tomli-2.2.1-pyhe01879c_2.conda hash: md5: 30a0a26c8abccf4b7991d590fe17c699 @@ -7966,7 +7966,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 @@ -7978,7 +7978,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 @@ -8072,13 +8072,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/unicodedata2-16.0.0-py312h66e93f0_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/unicodedata2-16.0.0-py312h4c3975b_1.conda hash: - md5: 617f5d608ff8c28ad546e5d9671cbb95 - sha256: 638916105a836973593547ba5cf4891d1f2cb82d1cf14354fcef93fd5b941cdc + md5: 4da303c1e91703d178817252615ca0a7 + sha256: cbf7d13819cf526a094f0cfe2da7f7ba22c4fbae4d231c9004520fbbf93f7027 category: main optional: false - name: unicodedata2 @@ -8089,12 +8089,12 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/unicodedata2-16.0.0-py312h4389bb4_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/unicodedata2-16.0.0-py312he06e257_1.conda hash: - md5: 3b124c38c7852704ba6a42a170c152a1 - sha256: 0889ccb541d0b63cbf42ea5b1f1686b772e872bfcddd3a18787dc4437ebbd7c6 + md5: 8f713d85daf7ab101d69dfa24108c9bc + sha256: 7c428eff9896e80919f37cc617b3f6dc0d20c79356866e0960783d5726eb142f category: main optional: false - name: uri-template @@ -8672,41 +8672,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.1.dev157+111b167 + version: 0.6.0a2.dev61+655afd7 manager: pip platform: linux-64 dependencies: - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 hash: - sha256: 111b167f8d9a185ff6f140f055297f0a6945de6e + sha256: 655afd735989270d5d03b80a98cbe22844b47066 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 category: main optional: false - name: geoapps-utils - version: 0.5.1.dev157+111b167 + version: 0.6.0a2.dev61+655afd7 manager: pip platform: win-64 dependencies: - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 hash: - sha256: 111b167f8d9a185ff6f140f055297f0a6945de6e + sha256: 655afd735989270d5d03b80a98cbe22844b47066 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@111b167f8d9a185ff6f140f055297f0a6945de6e + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev44+fd5f8fb1 + version: 0.12.0a2.dev58+2c9248c6 manager: pip platform: linux-64 dependencies: @@ -8714,16 +8714,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 hash: - sha256: fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + sha256: 2c9248c60e4166fadb973fcd4f1777bb2ee964f6 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 category: main optional: false - name: geoh5py - version: 0.12.0a2.dev44+fd5f8fb1 + version: 0.12.0a2.dev58+2c9248c6 manager: pip platform: win-64 dependencies: @@ -8731,12 +8731,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 hash: - sha256: fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + sha256: 2c9248c60e4166fadb973fcd4f1777bb2ee964f6 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fd5f8fb1dcd764c01eb4d43ab26201c5bceb34ef + url: git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6 category: main optional: false - name: grid-apps @@ -8745,8 +8745,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.5.1.dev157+111b167 - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoapps-utils: 0.6.0a2.dev61+655afd7 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8764,8 +8764,8 @@ package: platform: win-64 dependencies: discretize: '>=0.11.0,<0.12.dev' - geoapps-utils: 0.5.1.dev157+111b167 - geoh5py: 0.12.0a2.dev44+fd5f8fb1 + geoapps-utils: 0.6.0a2.dev61+655afd7 + geoh5py: 0.12.0a2.dev58+2c9248c6 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' diff --git a/simpeg_drivers/electromagnetics/base_1d_driver.py b/simpeg_drivers/electromagnetics/base_1d_driver.py index 5bdcb8b53..b3b85c873 100644 --- a/simpeg_drivers/electromagnetics/base_1d_driver.py +++ b/simpeg_drivers/electromagnetics/base_1d_driver.py @@ -16,6 +16,7 @@ import numpy as np from discretize import TensorMesh from discretize.utils import mesh_utils +from geoapps_utils.utils.locations import topo_drape_elevation from geoh5py import Workspace from geoh5py.objects import FEMSurvey from geoh5py.shared.merging.drape_model import DrapeModelMerger @@ -24,7 +25,7 @@ from simpeg_drivers.components.factories import MisfitFactory, SimulationFactory from simpeg_drivers.components.meshes import InversionMesh from simpeg_drivers.driver import InversionDriver -from simpeg_drivers.utils.utils import topo_drape_elevation, xyz_2_drape_model +from simpeg_drivers.utils.utils import xyz_2_drape_model logger = getLogger(__name__) diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index 06e97fc72..0930c8cdb 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -17,7 +17,7 @@ import numpy as np from discretize import TensorMesh, TreeMesh from discretize.utils import mesh_utils -from geoapps_utils.utils.conversions import string_to_numeric +from geoapps_utils.utils.locations import mask_under_horizon from geoapps_utils.utils.numerical import running_mean, traveling_salesman from geoh5py import Workspace from geoh5py.data import NumericData @@ -463,10 +463,7 @@ def cell_size_z(drape_model: DrapeModel) -> np.ndarray: def active_from_xyz( - mesh: DrapeModel | Octree, - topo: np.ndarray, - grid_reference="center", - method="linear", + mesh: DrapeModel | Octree, topo: np.ndarray, grid_reference="center" ): """Returns an active cell index array below a surface @@ -494,47 +491,8 @@ def active_from_xyz( else: raise ValueError("'grid_reference' must be one of 'center', 'top', or 'bottom'") - z_locations = topo_drape_elevation(locations, topo, method=method) - # fill_nan(locations, z_locations, filler=topo[:, -1]) - # Return the active cell array - return locations[:, -1] < z_locations[:, -1] - - -def topo_drape_elevation(locations, topo, method="linear") -> np.ndarray: - """ - Get draped elevation at locations. - - Values are extrapolated to nearest neighbour if requested outside the - convex hull of the input topography points. - - :param locations: n x 3 array of locations - :param topo: n x 3 array of topography points - :param method: Type of topography interpolation, either 'linear' or 'nearest' - - :return: An array of z elevations for every input locations. - """ - if method == "linear": - delaunay_2d = Delaunay(topo[:, :-1]) - z_interpolate = LinearNDInterpolator(delaunay_2d, topo[:, -1]) - elif method == "nearest": - z_interpolate = NearestNDInterpolator(topo[:, :-1], topo[:, -1]) - else: - raise ValueError("Method must be 'linear', or 'nearest'") - - unique_locs, inds = np.unique( - locations[:, :-1].round(), axis=0, return_inverse=True - ) - z_locations = z_interpolate(unique_locs)[inds] - - # Apply nearest neighbour if in extrapolation - ind_nan = np.isnan(z_locations) - if any(ind_nan): - tree = cKDTree(topo) - _, ind = tree.query(locations[ind_nan, :]) - z_locations[ind_nan] = topo[ind, -1] - - return np.c_[locations[:, :-1], z_locations] + return mask_under_horizon(locations, topo) def truncate_locs_depths(locs: np.ndarray, depth_core: float) -> np.ndarray: diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index 9437539d6..f8c430ac0 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -159,12 +159,12 @@ def test_ground_tem_fwr_run( assert fwr_driver.inversion_data.survey.source_list[0].n_segments == 16 if pytest: - assert len(caplog.records) == 2 - for record in caplog.records: + assert len(caplog.records) == 3 + for record in caplog.records[1:]: assert record.levelname == "INFO" assert "counter-clockwise" in record.message - assert "closed" in caplog.records[0].message + assert "closed" in caplog.records[1].message assert fwr_driver.data_misfit.objfcts[0].simulation.simulations[0].solver == Mumps fwr_driver.run()