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 4915c676..97960038 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 7b2bb2835665234d0ef442f0e4a4c9717b61f9a50ae298c50cf9cae2e9369ece +# input_hash: 0f54a26695792bef9ae71d11e72896171987869d09020c611e73c9a0622596d6 channels: - conda-forge @@ -38,14 +38,14 @@ dependencies: - click=8.2.1=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - - comm=0.2.2=pyhd8ed1ab_1 + - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py310h3788b33_0 - - coverage=7.9.2=py310h89163eb_0 + - coverage=7.10.0=py310h3406613_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2025.3.0=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.14=py310hf71b8c6_0 + - debugpy=1.8.15=py310h25320af_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.4.0=pyhd8ed1ab_0 @@ -55,7 +55,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py310h89163eb_0 + - fonttools=4.59.0=py310h3406613_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=ha770c72_1 - fsspec=2025.7.0=pyhd8ed1ab_0 @@ -64,7 +64,7 @@ dependencies: - h11=0.16.0=pyhd8ed1ab_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py310hea1e86d_100 - - hdf5=1.14.6=nompi_h6e4c0c1_102 + - hdf5=1.14.6=nompi_h6e4c0c1_103 - hpack=4.1.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 @@ -74,7 +74,6 @@ dependencies: - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 - importlib_metadata=8.7.0=h40b2b14_1 - - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - ipython=8.37.0=pyh8f84b5b_0 @@ -87,18 +86,18 @@ dependencies: - joblib=1.5.1=pyhd8ed1ab_0 - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py310hff52083_1 - - jsonschema=4.24.0=pyhd8ed1ab_0 + - jsonschema=4.25.0=pyhe01879c_0 - jsonschema-specifications=2025.4.1=pyh29332c3_0 - - jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0 + - jsonschema-with-format-nongpl=4.25.0=he01879c_0 - jupyter-book=1.0.3=pyhd8ed1ab_1 - jupyter-cache=1.0.1=pyhff2d567_0 - - jupyter-lsp=2.2.5=pyhe01879c_2 + - jupyter-lsp=2.2.6=pyhe01879c_0 - jupyter_client=8.6.3=pyhd8ed1ab_1 - jupyter_core=5.8.1=pyh31011fe_0 - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.16.0=pyhe01879c_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.4=pyhd8ed1ab_0 + - jupyterlab=4.4.5=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -106,6 +105,7 @@ dependencies: - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.8=py310h3788b33_1 - krb5=1.21.3=h659f571_0 + - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 @@ -121,7 +121,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libexpat=2.7.0=h5888daf_0 + - libexpat=2.7.1=hecca717_0 - libffi=3.4.6=h2dba641_1 - libfreetype=2.13.3=ha770c72_1 - libfreetype6=2.13.3=h48d6fc4_1 @@ -140,7 +140,7 @@ dependencies: - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - libspatialindex=2.0.0=he02047a_0 - - libsqlite=3.50.2=hee844dc_2 + - libsqlite=3.50.3=hee844dc_1 - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_3 - libstdcxx-ng=15.1.0=h4852527_3 @@ -163,7 +163,7 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - mistune=3.1.3=pyh29332c3_0 - - mkl=2024.2.2=ha957f24_16 + - mkl=2024.2.2=ha770c72_16 - msgpack-python=1.1.1=py310h3788b33_0 - mumps-include=5.7.3=h82cca05_10 - mumps-seq=5.7.3=h06cbf8f_10 @@ -194,7 +194,6 @@ dependencies: - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py310hebfe307_1 - pip=25.1.1=pyh8b19718_0 - - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.8=pyhe01879c_0 - pluggy=1.6.0=pyhd8ed1ab_0 - prometheus_client=0.22.1=pyhd8ed1ab_0 @@ -223,7 +222,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py310h6410a28_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=7_cp310 + - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - pyzmq=27.0.0=py310h71f11fc_0 @@ -233,13 +232,14 @@ dependencies: - requests=2.32.4=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 + - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.26.0=py310hbcd0ec0_0 - rtree=1.2.0=py310haf1e407_1 - - scikit-learn=1.5.2=py310h27f47ee_1 + - scikit-learn=1.4.2=py310h981052a_1 - scipy=1.14.1=py310hfcf56fc_2 - send2trash=1.8.3=pyh0d859eb_1 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=3.0.1=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 @@ -305,11 +305,11 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 430791f3..c115b8cd 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 7b2bb2835665234d0ef442f0e4a4c9717b61f9a50ae298c50cf9cae2e9369ece +# input_hash: 0f54a26695792bef9ae71d11e72896171987869d09020c611e73c9a0622596d6 channels: - conda-forge @@ -30,13 +30,13 @@ dependencies: - discretize=0.11.3=py310ha2bacc8_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py310h89163eb_0 + - fonttools=4.59.0=py310h3406613_0 - freetype=2.13.3=ha770c72_1 - fsspec=2025.7.0=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py310hea1e86d_100 - - hdf5=1.14.6=nompi_h6e4c0c1_102 + - hdf5=1.14.6=nompi_h6e4c0c1_103 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 @@ -60,7 +60,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libexpat=2.7.0=h5888daf_0 + - libexpat=2.7.1=hecca717_0 - libffi=3.4.6=h2dba641_1 - libfreetype=2.13.3=ha770c72_1 - libfreetype6=2.13.3=h48d6fc4_1 @@ -78,7 +78,7 @@ dependencies: - libpng=1.6.50=h943b412_0 - libscotch=7.0.6=hea33c07_1 - libspatialindex=2.0.0=he02047a_0 - - libsqlite=3.50.2=hee844dc_2 + - libsqlite=3.50.3=hee844dc_1 - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_3 - libstdcxx-ng=15.1.0=h4852527_3 @@ -94,7 +94,7 @@ dependencies: - markupsafe=3.0.2=py310h89163eb_1 - matplotlib-base=3.8.4=py310hef631a5_2 - metis=5.1.0=hd0bcaf9_1007 - - mkl=2024.2.2=ha957f24_16 + - mkl=2024.2.2=ha770c72_16 - msgpack-python=1.1.1=py310h3788b33_0 - mumps-include=5.7.3=h82cca05_10 - mumps-seq=5.7.3=h06cbf8f_10 @@ -122,15 +122,15 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py310h6410a28_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=7_cp310 + - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - readline=8.2=h8c095d6_2 - rtree=1.2.0=py310haf1e407_1 - - scikit-learn=1.5.2=py310h27f47ee_1 + - scikit-learn=1.4.2=py310h981052a_1 - scipy=1.14.1=py310hfcf56fc_2 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.1.0=pyhd8ed1ab_0 @@ -157,11 +157,11 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 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 fc1bce68..49759573 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 12cc832b6afad224ba7a18f42ebe117e16cedc70424e95b2c7e3894be647d2bf +# input_hash: fe9bea64dc53fd535084a0a107d7688e8632e51eeb8084b72468b0a651a364b6 channels: - conda-forge @@ -37,15 +37,15 @@ dependencies: - click=8.2.1=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - - comm=0.2.2=pyhd8ed1ab_1 + - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py310hc19bc0b_0 - - coverage=7.9.2=py310hdb0e946_0 + - coverage=7.10.0=py310hdb0e946_0 - cpython=3.10.18=py310hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha8f682b_0 - dask-core=2025.3.0=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.14=py310h9e98ed7_0 + - debugpy=1.8.15=py310h699e580_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.4.0=pyhd8ed1ab_0 @@ -55,7 +55,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py310hdb0e946_0 + - fonttools=4.59.0=py310hdb0e946_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h57928b3_1 - fsspec=2025.7.0=pyhd8ed1ab_0 @@ -64,7 +64,7 @@ dependencies: - h11=0.16.0=pyhd8ed1ab_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py310h877c39c_100 - - hdf5=1.14.6=nompi_he30205f_102 + - hdf5=1.14.6=nompi_he30205f_103 - hpack=4.1.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 @@ -73,7 +73,6 @@ dependencies: - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 - importlib_metadata=8.7.0=h40b2b14_1 - - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 @@ -87,24 +86,25 @@ dependencies: - joblib=1.5.1=pyhd8ed1ab_0 - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py310h5588dad_1 - - jsonschema=4.24.0=pyhd8ed1ab_0 + - jsonschema=4.25.0=pyhe01879c_0 - jsonschema-specifications=2025.4.1=pyh29332c3_0 - - jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0 + - jsonschema-with-format-nongpl=4.25.0=he01879c_0 - jupyter-book=1.0.3=pyhd8ed1ab_1 - jupyter-cache=1.0.1=pyhff2d567_0 - - jupyter-lsp=2.2.5=pyhe01879c_2 + - jupyter-lsp=2.2.6=pyhe01879c_0 - jupyter_client=8.6.3=pyhd8ed1ab_1 - jupyter_core=5.8.1=pyh5737063_0 - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.16.0=pyhe01879c_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.4=pyhd8ed1ab_0 + - jupyterlab=4.4.5=pyhd8ed1ab_0 - 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.8=py310he9f1925_1 - krb5=1.21.3=hdf4eb48_0 + - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -117,7 +117,7 @@ dependencies: - libcurl=8.14.1=h88aaa65_0 - libdeflate=1.24=h76ddb4d_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libexpat=2.7.0=he0c23c2_0 + - libexpat=2.7.1=hac47afa_0 - libffi=3.4.6=h537db12_1 - libfreetype=2.13.3=h57928b3_1 - libfreetype6=2.13.3=h0b5ce68_1 @@ -131,7 +131,7 @@ dependencies: - libpng=1.6.50=h95bef1e_0 - libsodium=1.0.20=hc70643c_0 - libspatialindex=2.0.0=h5a68840_0 - - libsqlite=3.50.2=hf5d6505_2 + - libsqlite=3.50.3=hf5d6505_1 - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.0=h05922d8_5 - libwebp-base=1.6.0=h4d5522a_0 @@ -178,7 +178,6 @@ dependencies: - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py310h3e38d90_1 - pip=25.1.1=pyh8b19718_0 - - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.8=pyhe01879c_0 - pluggy=1.6.0=pyhd8ed1ab_0 - prometheus_client=0.22.1=pyhd8ed1ab_0 @@ -206,7 +205,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=7_cp310 + - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py310h282bd7d_0 - pywinpty=2.0.15=py310h9e98ed7_0 @@ -217,13 +216,14 @@ dependencies: - requests=2.32.4=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 + - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.26.0=py310h034784e_0 - rtree=1.2.0=py310h08d5ad2_1 - - scikit-learn=1.5.2=py310hf2a6c47_1 + - scikit-learn=1.4.2=py310hf2a6c47_1 - scipy=1.14.1=py310hbd0dde3_2 - send2trash=1.8.3=pyh5737063_1 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=3.0.1=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 @@ -273,9 +273,9 @@ dependencies: - unicodedata2=16.0.0=py310ha8f682b_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - - vc=14.3=h41ae7f8_26 - - vc14_runtime=14.44.35208=h818238b_26 - - vs2015_runtime=14.44.35208=h38c0c73_26 + - vc=14.3=h2b53caa_30 + - vc14_runtime=14.44.35208=h818238b_30 + - vs2015_runtime=14.44.35208=h38c0c73_30 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -295,11 +295,11 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 134a0e96..1d5e1509 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 12cc832b6afad224ba7a18f42ebe117e16cedc70424e95b2c7e3894be647d2bf +# input_hash: fe9bea64dc53fd535084a0a107d7688e8632e51eeb8084b72468b0a651a364b6 channels: - conda-forge @@ -29,13 +29,13 @@ dependencies: - discretize=0.11.3=py310h3e8ed56_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py310hdb0e946_0 + - fonttools=4.59.0=py310hdb0e946_0 - freetype=2.13.3=h57928b3_1 - fsspec=2025.7.0=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py310h877c39c_100 - - hdf5=1.14.6=nompi_he30205f_102 + - hdf5=1.14.6=nompi_he30205f_103 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 @@ -55,7 +55,7 @@ dependencies: - libcurl=8.14.1=h88aaa65_0 - libdeflate=1.24=h76ddb4d_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libexpat=2.7.0=he0c23c2_0 + - libexpat=2.7.1=hac47afa_0 - libffi=3.4.6=h537db12_1 - libfreetype=2.13.3=h57928b3_1 - libfreetype6=2.13.3=h0b5ce68_1 @@ -68,7 +68,7 @@ dependencies: - liblzma=5.8.1=h2466b09_2 - libpng=1.6.50=h95bef1e_0 - libspatialindex=2.0.0=h5a68840_0 - - libsqlite=3.50.2=hf5d6505_2 + - libsqlite=3.50.3=hf5d6505_1 - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.0=h05922d8_5 - libwebp-base=1.6.0=h4d5522a_0 @@ -106,14 +106,14 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=7_cp310 + - python_abi=3.10=8_cp310 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h38315fa_2 - rtree=1.2.0=py310h08d5ad2_1 - - scikit-learn=1.5.2=py310hf2a6c47_1 + - scikit-learn=1.4.2=py310hf2a6c47_1 - scipy=1.14.1=py310hbd0dde3_2 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.1.0=pyhd8ed1ab_0 @@ -130,9 +130,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py310ha8f682b_0 - urllib3=2.5.0=pyhd8ed1ab_0 - - vc=14.3=h41ae7f8_26 - - vc14_runtime=14.44.35208=h818238b_26 - - vs2015_runtime=14.44.35208=h38c0c73_26 + - vc=14.3=h2b53caa_30 + - vc14_runtime=14.44.35208=h818238b_30 + - vs2015_runtime=14.44.35208=h38c0c73_30 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - xorg-libxau=1.0.12=h0e40799_0 @@ -145,11 +145,11 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 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 8ae80f8a..53a3b091 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 3bdb725cf9e2e0a18331b01a1fd271c67ce2f7d54cfb3de3bcc9379dc3f52ad6 +# input_hash: c9dba1cefe5fafa1d6916df23312dff6e683994e65910cb3e402d7568b87973d channels: - conda-forge @@ -38,14 +38,14 @@ dependencies: - click=8.2.1=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - - comm=0.2.2=pyhd8ed1ab_1 + - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py311hd18a35c_0 - - coverage=7.9.2=py311h2dc5d0c_0 + - coverage=7.10.0=py311h3778330_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2025.3.0=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.14=py311hfdbb021_0 + - debugpy=1.8.15=py311hc665b79_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py311h2dc5d0c_0 + - fonttools=4.59.0=py311h3778330_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=ha770c72_1 - fsspec=2025.7.0=pyhd8ed1ab_0 @@ -65,7 +65,7 @@ dependencies: - h11=0.16.0=pyhd8ed1ab_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py311h7f87ba5_100 - - hdf5=1.14.6=nompi_h6e4c0c1_102 + - hdf5=1.14.6=nompi_h6e4c0c1_103 - hpack=4.1.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 @@ -75,7 +75,6 @@ dependencies: - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 - importlib_metadata=8.7.0=h40b2b14_1 - - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - ipython=9.4.0=pyhfa0c392_0 @@ -89,18 +88,18 @@ dependencies: - joblib=1.5.1=pyhd8ed1ab_0 - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py311h38be061_1 - - jsonschema=4.24.0=pyhd8ed1ab_0 + - jsonschema=4.25.0=pyhe01879c_0 - jsonschema-specifications=2025.4.1=pyh29332c3_0 - - jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0 + - jsonschema-with-format-nongpl=4.25.0=he01879c_0 - jupyter-book=1.0.3=pyhd8ed1ab_1 - jupyter-cache=1.0.1=pyhff2d567_0 - - jupyter-lsp=2.2.5=pyhe01879c_2 + - jupyter-lsp=2.2.6=pyhe01879c_0 - jupyter_client=8.6.3=pyhd8ed1ab_1 - jupyter_core=5.8.1=pyh31011fe_0 - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.16.0=pyhe01879c_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.4=pyhd8ed1ab_0 + - jupyterlab=4.4.5=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -108,6 +107,7 @@ dependencies: - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.8=py311hd18a35c_1 - krb5=1.21.3=h659f571_0 + - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 @@ -123,7 +123,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libexpat=2.7.0=h5888daf_0 + - libexpat=2.7.1=hecca717_0 - libffi=3.4.6=h2dba641_1 - libfreetype=2.13.3=ha770c72_1 - libfreetype6=2.13.3=h48d6fc4_1 @@ -142,7 +142,7 @@ dependencies: - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - libspatialindex=2.0.0=he02047a_0 - - libsqlite=3.50.2=hee844dc_2 + - libsqlite=3.50.3=hee844dc_1 - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_3 - libstdcxx-ng=15.1.0=h4852527_3 @@ -165,7 +165,7 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - mistune=3.1.3=pyh29332c3_0 - - mkl=2024.2.2=ha957f24_16 + - mkl=2024.2.2=ha770c72_16 - msgpack-python=1.1.1=py311hd18a35c_0 - mumps-include=5.7.3=h82cca05_10 - mumps-seq=5.7.3=h06cbf8f_10 @@ -196,7 +196,6 @@ dependencies: - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py311h82a398c_1 - pip=25.1.1=pyh8b19718_0 - - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.8=pyhe01879c_0 - pluggy=1.6.0=pyhd8ed1ab_0 - prometheus_client=0.22.1=pyhd8ed1ab_0 @@ -225,7 +224,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=7_cp311 + - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - pyzmq=27.0.0=py311h7deb3e3_0 @@ -235,13 +234,14 @@ dependencies: - requests=2.32.4=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 + - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.26.0=py311hdae7d1d_0 - rtree=1.2.0=py311ha1603b9_1 - - scikit-learn=1.5.2=py311h57cc02b_1 + - scikit-learn=1.4.2=py311he08f58d_1 - scipy=1.14.1=py311he9a78e4_2 - send2trash=1.8.3=pyh0d859eb_1 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=3.0.1=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 @@ -308,11 +308,11 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index d7bbbd71..58b5880b 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 3bdb725cf9e2e0a18331b01a1fd271c67ce2f7d54cfb3de3bcc9379dc3f52ad6 +# input_hash: c9dba1cefe5fafa1d6916df23312dff6e683994e65910cb3e402d7568b87973d channels: - conda-forge @@ -31,13 +31,13 @@ dependencies: - discretize=0.11.3=py311h5b7b71f_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py311h2dc5d0c_0 + - fonttools=4.59.0=py311h3778330_0 - freetype=2.13.3=ha770c72_1 - fsspec=2025.7.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py311h7f87ba5_100 - - hdf5=1.14.6=nompi_h6e4c0c1_102 + - hdf5=1.14.6=nompi_h6e4c0c1_103 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 @@ -61,7 +61,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libexpat=2.7.0=h5888daf_0 + - libexpat=2.7.1=hecca717_0 - libffi=3.4.6=h2dba641_1 - libfreetype=2.13.3=ha770c72_1 - libfreetype6=2.13.3=h48d6fc4_1 @@ -79,7 +79,7 @@ dependencies: - libpng=1.6.50=h943b412_0 - libscotch=7.0.6=hea33c07_1 - libspatialindex=2.0.0=he02047a_0 - - libsqlite=3.50.2=hee844dc_2 + - libsqlite=3.50.3=hee844dc_1 - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_3 - libstdcxx-ng=15.1.0=h4852527_3 @@ -95,7 +95,7 @@ dependencies: - markupsafe=3.0.2=py311h2dc5d0c_1 - matplotlib-base=3.8.4=py311ha4ca890_2 - metis=5.1.0=hd0bcaf9_1007 - - mkl=2024.2.2=ha957f24_16 + - mkl=2024.2.2=ha770c72_16 - msgpack-python=1.1.1=py311hd18a35c_0 - mumps-include=5.7.3=h82cca05_10 - mumps-seq=5.7.3=h06cbf8f_10 @@ -123,15 +123,15 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=7_cp311 + - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - readline=8.2=h8c095d6_2 - rtree=1.2.0=py311ha1603b9_1 - - scikit-learn=1.5.2=py311h57cc02b_1 + - scikit-learn=1.4.2=py311he08f58d_1 - scipy=1.14.1=py311he9a78e4_2 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.1.0=pyhd8ed1ab_0 @@ -159,11 +159,11 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 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 e286e278..aff40ed8 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 57805dd7243378b72dd91648b00eb790f855375cd6ad3095c5099809073a0210 +# input_hash: b9f574bd52f02e9a0d8648f478d484cd228f132f708933856414eed155f61a30 channels: - conda-forge @@ -37,15 +37,15 @@ dependencies: - click=8.2.1=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - - comm=0.2.2=pyhd8ed1ab_1 + - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py311h3257749_0 - - coverage=7.9.2=py311h3f79411_0 + - coverage=7.10.0=py311h3f79411_0 - cpython=3.11.13=py311hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311he736701_0 - dask-core=2025.3.0=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.14=py311hda3d55a_0 + - debugpy=1.8.15=py311h5dfdfe8_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py311h3f79411_0 + - fonttools=4.59.0=py311h3f79411_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h57928b3_1 - fsspec=2025.7.0=pyhd8ed1ab_0 @@ -65,7 +65,7 @@ dependencies: - h11=0.16.0=pyhd8ed1ab_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py311h97e6cc2_100 - - hdf5=1.14.6=nompi_he30205f_102 + - hdf5=1.14.6=nompi_he30205f_103 - hpack=4.1.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 @@ -74,7 +74,6 @@ dependencies: - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 - importlib_metadata=8.7.0=h40b2b14_1 - - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 @@ -89,24 +88,25 @@ dependencies: - joblib=1.5.1=pyhd8ed1ab_0 - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py311h1ea47a8_1 - - jsonschema=4.24.0=pyhd8ed1ab_0 + - jsonschema=4.25.0=pyhe01879c_0 - jsonschema-specifications=2025.4.1=pyh29332c3_0 - - jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0 + - jsonschema-with-format-nongpl=4.25.0=he01879c_0 - jupyter-book=1.0.3=pyhd8ed1ab_1 - jupyter-cache=1.0.1=pyhff2d567_0 - - jupyter-lsp=2.2.5=pyhe01879c_2 + - jupyter-lsp=2.2.6=pyhe01879c_0 - jupyter_client=8.6.3=pyhd8ed1ab_1 - jupyter_core=5.8.1=pyh5737063_0 - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.16.0=pyhe01879c_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.4=pyhd8ed1ab_0 + - jupyterlab=4.4.5=pyhd8ed1ab_0 - 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.8=py311h3fd045d_1 - krb5=1.21.3=hdf4eb48_0 + - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -119,7 +119,7 @@ dependencies: - libcurl=8.14.1=h88aaa65_0 - libdeflate=1.24=h76ddb4d_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libexpat=2.7.0=he0c23c2_0 + - libexpat=2.7.1=hac47afa_0 - libffi=3.4.6=h537db12_1 - libfreetype=2.13.3=h57928b3_1 - libfreetype6=2.13.3=h0b5ce68_1 @@ -133,7 +133,7 @@ dependencies: - libpng=1.6.50=h95bef1e_0 - libsodium=1.0.20=hc70643c_0 - libspatialindex=2.0.0=h5a68840_0 - - libsqlite=3.50.2=hf5d6505_2 + - libsqlite=3.50.3=hf5d6505_1 - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.0=h05922d8_5 - libwebp-base=1.6.0=h4d5522a_0 @@ -180,7 +180,6 @@ dependencies: - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py311h5592be9_1 - pip=25.1.1=pyh8b19718_0 - - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.8=pyhe01879c_0 - pluggy=1.6.0=pyhd8ed1ab_0 - prometheus_client=0.22.1=pyhd8ed1ab_0 @@ -208,7 +207,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=7_cp311 + - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py311hefeebc8_0 - pywinpty=2.0.15=py311hda3d55a_0 @@ -219,13 +218,14 @@ dependencies: - requests=2.32.4=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 + - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.26.0=py311hf51aa87_0 - rtree=1.2.0=py311h44d53c4_1 - - scikit-learn=1.5.2=py311hdcb8d17_1 + - scikit-learn=1.4.2=py311hdcb8d17_1 - scipy=1.14.1=py311hf16d85f_2 - send2trash=1.8.3=pyh5737063_1 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=3.0.1=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 @@ -275,9 +275,9 @@ dependencies: - unicodedata2=16.0.0=py311he736701_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - - vc=14.3=h41ae7f8_26 - - vc14_runtime=14.44.35208=h818238b_26 - - vs2015_runtime=14.44.35208=h38c0c73_26 + - vc=14.3=h2b53caa_30 + - vc14_runtime=14.44.35208=h818238b_30 + - vs2015_runtime=14.44.35208=h38c0c73_30 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -298,11 +298,11 @@ dependencies: - zstandard=0.23.0=py311he736701_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 16446d51..964a45b6 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 57805dd7243378b72dd91648b00eb790f855375cd6ad3095c5099809073a0210 +# input_hash: b9f574bd52f02e9a0d8648f478d484cd228f132f708933856414eed155f61a30 channels: - conda-forge @@ -30,13 +30,13 @@ dependencies: - discretize=0.11.3=py311h9b10771_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py311h3f79411_0 + - fonttools=4.59.0=py311h3f79411_0 - freetype=2.13.3=h57928b3_1 - fsspec=2025.7.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py311h97e6cc2_100 - - hdf5=1.14.6=nompi_he30205f_102 + - hdf5=1.14.6=nompi_he30205f_103 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 @@ -56,7 +56,7 @@ dependencies: - libcurl=8.14.1=h88aaa65_0 - libdeflate=1.24=h76ddb4d_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libexpat=2.7.0=he0c23c2_0 + - libexpat=2.7.1=hac47afa_0 - libffi=3.4.6=h537db12_1 - libfreetype=2.13.3=h57928b3_1 - libfreetype6=2.13.3=h0b5ce68_1 @@ -69,7 +69,7 @@ dependencies: - liblzma=5.8.1=h2466b09_2 - libpng=1.6.50=h95bef1e_0 - libspatialindex=2.0.0=h5a68840_0 - - libsqlite=3.50.2=hf5d6505_2 + - libsqlite=3.50.3=hf5d6505_1 - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.0=h05922d8_5 - libwebp-base=1.6.0=h4d5522a_0 @@ -107,14 +107,14 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=7_cp311 + - python_abi=3.11=8_cp311 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h5082efb_2 - rtree=1.2.0=py311h44d53c4_1 - - scikit-learn=1.5.2=py311hdcb8d17_1 + - scikit-learn=1.4.2=py311hdcb8d17_1 - scipy=1.14.1=py311hf16d85f_2 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.1.0=pyhd8ed1ab_0 @@ -131,9 +131,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py311he736701_0 - urllib3=2.5.0=pyhd8ed1ab_0 - - vc=14.3=h41ae7f8_26 - - vc14_runtime=14.44.35208=h818238b_26 - - vs2015_runtime=14.44.35208=h38c0c73_26 + - vc=14.3=h2b53caa_30 + - vc14_runtime=14.44.35208=h818238b_30 + - vs2015_runtime=14.44.35208=h38c0c73_30 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - wrapt=1.17.2=py311he736701_0 @@ -147,11 +147,11 @@ dependencies: - zstandard=0.23.0=py311he736701_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 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 77732ca4..dae41821 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 0411d0bb5b468d1fb923a36f5fc20b1e4f1af3a872d37f6492e422e64a4e5142 +# input_hash: 986de85ed6e6464ef1d28bc0bd68959524a00d49b9d9e57fda77fdcf3447934a channels: - conda-forge @@ -38,14 +38,14 @@ dependencies: - click=8.2.1=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - - comm=0.2.2=pyhd8ed1ab_1 + - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py312h68727a3_0 - - coverage=7.9.2=py312h178313f_0 + - coverage=7.10.0=py312h8a5da7c_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h66e93f0_0 - dask-core=2025.3.0=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.14=py312h2ec8cdc_0 + - debugpy=1.8.15=py312h8285ef7_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py312h178313f_0 + - fonttools=4.59.0=py312h8a5da7c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=ha770c72_1 - fsspec=2025.7.0=pyhd8ed1ab_0 @@ -65,7 +65,7 @@ dependencies: - h11=0.16.0=pyhd8ed1ab_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py312h3faca00_100 - - hdf5=1.14.6=nompi_h6e4c0c1_102 + - hdf5=1.14.6=nompi_h6e4c0c1_103 - hpack=4.1.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 @@ -75,7 +75,6 @@ dependencies: - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 - importlib_metadata=8.7.0=h40b2b14_1 - - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - ipykernel=6.29.5=pyh3099207_0 - ipython=9.4.0=pyhfa0c392_0 @@ -89,18 +88,18 @@ dependencies: - joblib=1.5.1=pyhd8ed1ab_0 - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py312h7900ff3_1 - - jsonschema=4.24.0=pyhd8ed1ab_0 + - jsonschema=4.25.0=pyhe01879c_0 - jsonschema-specifications=2025.4.1=pyh29332c3_0 - - jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0 + - jsonschema-with-format-nongpl=4.25.0=he01879c_0 - jupyter-book=1.0.3=pyhd8ed1ab_1 - jupyter-cache=1.0.1=pyhff2d567_0 - - jupyter-lsp=2.2.5=pyhe01879c_2 + - jupyter-lsp=2.2.6=pyhe01879c_0 - jupyter_client=8.6.3=pyhd8ed1ab_1 - jupyter_core=5.8.1=pyh31011fe_0 - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.16.0=pyhe01879c_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.4=pyhd8ed1ab_0 + - jupyterlab=4.4.5=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -108,6 +107,7 @@ dependencies: - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.8=py312h68727a3_1 - krb5=1.21.3=h659f571_0 + - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.44=h1423503_1 @@ -123,7 +123,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libexpat=2.7.0=h5888daf_0 + - libexpat=2.7.1=hecca717_0 - libffi=3.4.6=h2dba641_1 - libfreetype=2.13.3=ha770c72_1 - libfreetype6=2.13.3=h48d6fc4_1 @@ -142,7 +142,7 @@ dependencies: - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - libspatialindex=2.0.0=he02047a_0 - - libsqlite=3.50.2=hee844dc_2 + - libsqlite=3.50.3=hee844dc_1 - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_3 - libstdcxx-ng=15.1.0=h4852527_3 @@ -165,7 +165,7 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - mistune=3.1.3=pyh29332c3_0 - - mkl=2024.2.2=ha957f24_16 + - mkl=2024.2.2=ha770c72_16 - msgpack-python=1.1.1=py312h68727a3_0 - mumps-include=5.7.3=h82cca05_10 - mumps-seq=5.7.3=h06cbf8f_10 @@ -196,7 +196,6 @@ dependencies: - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py312h287a98d_1 - pip=25.1.1=pyh8b19718_0 - - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.8=pyhe01879c_0 - pluggy=1.6.0=pyhd8ed1ab_0 - prometheus_client=0.22.1=pyhd8ed1ab_0 @@ -225,7 +224,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=7_cp312 + - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - pyzmq=27.0.0=py312hbf22597_0 @@ -235,13 +234,14 @@ dependencies: - requests=2.32.4=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 + - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.26.0=py312h680f630_0 - rtree=1.2.0=py312h3ed4c40_1 - - scikit-learn=1.5.2=py312h7a48858_1 + - scikit-learn=1.4.2=py312h1fcc3ea_1 - scipy=1.14.1=py312h62794b6_2 - send2trash=1.8.3=pyh0d859eb_1 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=3.0.1=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 @@ -308,11 +308,11 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index a279a52c..cc473fcb 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 0411d0bb5b468d1fb923a36f5fc20b1e4f1af3a872d37f6492e422e64a4e5142 +# input_hash: 986de85ed6e6464ef1d28bc0bd68959524a00d49b9d9e57fda77fdcf3447934a channels: - conda-forge @@ -31,13 +31,13 @@ dependencies: - discretize=0.11.3=py312hc39e661_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py312h178313f_0 + - fonttools=4.59.0=py312h8a5da7c_0 - freetype=2.13.3=ha770c72_1 - fsspec=2025.7.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py312h3faca00_100 - - hdf5=1.14.6=nompi_h6e4c0c1_102 + - hdf5=1.14.6=nompi_h6e4c0c1_103 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 @@ -61,7 +61,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libexpat=2.7.0=h5888daf_0 + - libexpat=2.7.1=hecca717_0 - libffi=3.4.6=h2dba641_1 - libfreetype=2.13.3=ha770c72_1 - libfreetype6=2.13.3=h48d6fc4_1 @@ -79,7 +79,7 @@ dependencies: - libpng=1.6.50=h943b412_0 - libscotch=7.0.6=hea33c07_1 - libspatialindex=2.0.0=he02047a_0 - - libsqlite=3.50.2=hee844dc_2 + - libsqlite=3.50.3=hee844dc_1 - libssh2=1.11.1=hcf80075_0 - libstdcxx=15.1.0=h8f9b012_3 - libstdcxx-ng=15.1.0=h4852527_3 @@ -95,7 +95,7 @@ dependencies: - markupsafe=3.0.2=py312h178313f_1 - matplotlib-base=3.8.4=py312h20ab3a6_2 - metis=5.1.0=hd0bcaf9_1007 - - mkl=2024.2.2=ha957f24_16 + - mkl=2024.2.2=ha770c72_16 - msgpack-python=1.1.1=py312h68727a3_0 - mumps-include=5.7.3=h82cca05_10 - mumps-seq=5.7.3=h06cbf8f_10 @@ -123,15 +123,15 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=7_cp312 + - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - readline=8.2=h8c095d6_2 - rtree=1.2.0=py312h3ed4c40_1 - - scikit-learn=1.5.2=py312h7a48858_1 + - scikit-learn=1.4.2=py312h1fcc3ea_1 - scipy=1.14.1=py312h62794b6_2 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.1.0=pyhd8ed1ab_0 @@ -159,11 +159,11 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_2 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 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 c3f773d3..c5808e33 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 2b057dda003b244877434d1dd71bfa18b96472fbaeadeb2cf9c4266efbfdb4e0 +# input_hash: 8ac7e9b31d0a8968577d04b18bfae4e5b55625cc38cfb3a62f6b8f87f8a156f9 channels: - conda-forge @@ -37,15 +37,15 @@ dependencies: - click=8.2.1=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 - colorama=0.4.6=pyhd8ed1ab_1 - - comm=0.2.2=pyhd8ed1ab_1 + - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py312hd5eb7cc_0 - - coverage=7.9.2=py312h05f76fc_0 + - coverage=7.10.0=py312h05f76fc_0 - cpython=3.12.11=py312hd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h4389bb4_0 - dask-core=2025.3.0=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - - debugpy=1.8.14=py312h275cf98_0 + - debugpy=1.8.15=py312ha1a9051_0 - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.3.0=pyhd8ed1ab_0 - executing=2.2.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py312h05f76fc_0 + - fonttools=4.59.0=py312h05f76fc_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h57928b3_1 - fsspec=2025.7.0=pyhd8ed1ab_0 @@ -65,7 +65,7 @@ dependencies: - h11=0.16.0=pyhd8ed1ab_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py312h6cc2a29_100 - - hdf5=1.14.6=nompi_he30205f_102 + - hdf5=1.14.6=nompi_he30205f_103 - hpack=4.1.0=pyhd8ed1ab_0 - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 @@ -74,7 +74,6 @@ dependencies: - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 - importlib_metadata=8.7.0=h40b2b14_1 - - importlib_resources=6.5.2=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_1 - intel-openmp=2024.2.1=h57928b3_1083 - ipykernel=6.29.5=pyh4bbf305_0 @@ -89,24 +88,25 @@ dependencies: - joblib=1.5.1=pyhd8ed1ab_0 - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py312h2e8e312_1 - - jsonschema=4.24.0=pyhd8ed1ab_0 + - jsonschema=4.25.0=pyhe01879c_0 - jsonschema-specifications=2025.4.1=pyh29332c3_0 - - jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0 + - jsonschema-with-format-nongpl=4.25.0=he01879c_0 - jupyter-book=1.0.3=pyhd8ed1ab_1 - jupyter-cache=1.0.1=pyhff2d567_0 - - jupyter-lsp=2.2.5=pyhe01879c_2 + - jupyter-lsp=2.2.6=pyhe01879c_0 - jupyter_client=8.6.3=pyhd8ed1ab_1 - jupyter_core=5.8.1=pyh5737063_0 - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.16.0=pyhe01879c_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.4.4=pyhd8ed1ab_0 + - jupyterlab=4.4.5=pyhd8ed1ab_0 - 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.8=py312hf90b1b7_1 - krb5=1.21.3=hdf4eb48_0 + - lark=1.2.2=pyhd8ed1ab_1 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h6470a55_1 @@ -119,7 +119,7 @@ dependencies: - libcurl=8.14.1=h88aaa65_0 - libdeflate=1.24=h76ddb4d_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libexpat=2.7.0=he0c23c2_0 + - libexpat=2.7.1=hac47afa_0 - libffi=3.4.6=h537db12_1 - libfreetype=2.13.3=h57928b3_1 - libfreetype6=2.13.3=h0b5ce68_1 @@ -133,7 +133,7 @@ dependencies: - libpng=1.6.50=h95bef1e_0 - libsodium=1.0.20=hc70643c_0 - libspatialindex=2.0.0=h5a68840_0 - - libsqlite=3.50.2=hf5d6505_2 + - libsqlite=3.50.3=hf5d6505_1 - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.0=h05922d8_5 - libwebp-base=1.6.0=h4d5522a_0 @@ -180,7 +180,6 @@ dependencies: - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py312h381445a_1 - pip=25.1.1=pyh8b19718_0 - - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.8=pyhe01879c_0 - pluggy=1.6.0=pyhd8ed1ab_0 - prometheus_client=0.22.1=pyhd8ed1ab_0 @@ -208,7 +207,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=7_cp312 + - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - pywin32=311=py312h829343e_0 - pywinpty=2.0.15=py312h275cf98_0 @@ -219,13 +218,14 @@ dependencies: - requests=2.32.4=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 + - rfc3987-syntax=1.1.0=pyhe01879c_1 - rpds-py=0.26.0=py312hdabe01f_0 - rtree=1.2.0=py312h50e5f8f_1 - - scikit-learn=1.5.2=py312h816cc57_1 + - scikit-learn=1.4.2=py312h816cc57_1 - scipy=1.14.1=py312h337df96_2 - send2trash=1.8.3=pyh5737063_1 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=3.0.1=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 @@ -275,9 +275,9 @@ dependencies: - unicodedata2=16.0.0=py312h4389bb4_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.5.0=pyhd8ed1ab_0 - - vc=14.3=h41ae7f8_26 - - vc14_runtime=14.44.35208=h818238b_26 - - vs2015_runtime=14.44.35208=h38c0c73_26 + - vc=14.3=h2b53caa_30 + - vc14_runtime=14.44.35208=h818238b_30 + - vs2015_runtime=14.44.35208=h38c0c73_30 - wcwidth=0.2.13=pyhd8ed1ab_1 - webcolors=24.11.1=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 @@ -298,11 +298,11 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 47a896f3..82a2e6e5 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 2b057dda003b244877434d1dd71bfa18b96472fbaeadeb2cf9c4266efbfdb4e0 +# input_hash: 8ac7e9b31d0a8968577d04b18bfae4e5b55625cc38cfb3a62f6b8f87f8a156f9 channels: - conda-forge @@ -30,13 +30,13 @@ dependencies: - discretize=0.11.3=py312hbaa7e33_0 - distributed=2025.3.0=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.58.5=py312h05f76fc_0 + - fonttools=4.59.0=py312h05f76fc_0 - freetype=2.13.3=h57928b3_1 - fsspec=2025.7.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 - h2=4.2.0=pyhd8ed1ab_0 - h5py=3.14.0=nompi_py312h6cc2a29_100 - - hdf5=1.14.6=nompi_he30205f_102 + - hdf5=1.14.6=nompi_he30205f_103 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - importlib-metadata=8.7.0=pyhe01879c_1 @@ -56,7 +56,7 @@ dependencies: - libcurl=8.14.1=h88aaa65_0 - libdeflate=1.24=h76ddb4d_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libexpat=2.7.0=he0c23c2_0 + - libexpat=2.7.1=hac47afa_0 - libffi=3.4.6=h537db12_1 - libfreetype=2.13.3=h57928b3_1 - libfreetype6=2.13.3=h0b5ce68_1 @@ -69,7 +69,7 @@ dependencies: - liblzma=5.8.1=h2466b09_2 - libpng=1.6.50=h95bef1e_0 - libspatialindex=2.0.0=h5a68840_0 - - libsqlite=3.50.2=hf5d6505_2 + - libsqlite=3.50.3=hf5d6505_1 - libssh2=1.11.1=h9aa295b_0 - libtiff=4.7.0=h05922d8_5 - libwebp-base=1.6.0=h4d5522a_0 @@ -107,14 +107,14 @@ dependencies: - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=7_cp312 + - python_abi=3.12=8_cp312 - pytz=2025.2=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h31fea79_2 - rtree=1.2.0=py312h50e5f8f_1 - - scikit-learn=1.5.2=py312h816cc57_1 + - scikit-learn=1.4.2=py312h816cc57_1 - scipy=1.14.1=py312h337df96_2 - setuptools=80.9.0=pyhff2d567_0 - - six=1.17.0=pyhd8ed1ab_0 + - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.1.0=pyhd8ed1ab_0 @@ -131,9 +131,9 @@ dependencies: - ucrt=10.0.22621.0=h57928b3_1 - unicodedata2=16.0.0=py312h4389bb4_0 - urllib3=2.5.0=pyhd8ed1ab_0 - - vc=14.3=h41ae7f8_26 - - vc14_runtime=14.44.35208=h818238b_26 - - vs2015_runtime=14.44.35208=h38c0c73_26 + - vc=14.3=h2b53caa_30 + - vc14_runtime=14.44.35208=h818238b_30 + - vs2015_runtime=14.44.35208=h38c0c73_30 - wheel=0.45.1=pyhd8ed1ab_1 - win_inet_pton=1.1.0=pyh7428d3b_8 - wrapt=1.17.2=py312h4389bb4_0 @@ -147,11 +147,11 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_2 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index dfdef4a7..f211c3a2 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 12cc832b6afad224ba7a18f42ebe117e16cedc70424e95b2c7e3894be647d2bf - linux-64: 7b2bb2835665234d0ef442f0e4a4c9717b61f9a50ae298c50cf9cae2e9369ece + win-64: fe9bea64dc53fd535084a0a107d7688e8632e51eeb8084b72468b0a651a364b6 + linux-64: 0f54a26695792bef9ae71d11e72896171987869d09020c611e73c9a0622596d6 channels: - url: conda-forge used_env_vars: [] @@ -891,29 +891,27 @@ package: category: main optional: false - name: comm - version: 0.2.2 + version: 0.2.3 manager: conda platform: linux-64 dependencies: - python: '>=3.9' - traitlets: '>=5.3' - url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: - md5: 74673132601ec2b7fc592755605f4c1b - sha256: 7e87ef7c91574d9fac19faedaaee328a70f718c9b4ddadfdc0ba9ac021bd64af + md5: 2da13f2b299d8e1995bafbbe9689a2f7 + sha256: 576a44729314ad9e4e5ebe055fbf48beb8116b60e58f9070278985b2b634f212 category: dev optional: true - name: comm - version: 0.2.2 + version: 0.2.3 manager: conda platform: win-64 dependencies: python: '>=3.9' - traitlets: '>=5.3' - url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: - md5: 74673132601ec2b7fc592755605f4c1b - sha256: 7e87ef7c91574d9fac19faedaaee328a70f718c9b4ddadfdc0ba9ac021bd64af + md5: 2da13f2b299d8e1995bafbbe9689a2f7 + sha256: 576a44729314ad9e4e5ebe055fbf48beb8116b60e58f9070278985b2b634f212 category: dev optional: true - name: contourpy @@ -951,23 +949,23 @@ package: category: main optional: false - name: coverage - version: 7.9.2 + version: 7.10.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.9.2-py310h89163eb_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.0-py310h3406613_0.conda hash: - md5: f02d32dc5b0547e137f871a33e032842 - sha256: 0cc631996a1e5925a811361a3972f964a92f0c49dcbde341a24dc58130d91e52 + md5: 53f445ee472c39ffa4903a8f31af3498 + sha256: 5efbe027b5706c53b1f296cc71ec70324925a21189fe11044595098391d14ab9 category: dev optional: true - name: coverage - version: 7.9.2 + version: 7.10.0 manager: conda platform: win-64 dependencies: @@ -977,10 +975,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/coverage-7.9.2-py310hdb0e946_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.0-py310hdb0e946_0.conda hash: - md5: 99a4cbaef874f64995c896860445a659 - sha256: eea6d08498ff5e141837200b9446528541b72520dd319d62f63a2e27c1fdeb1b + md5: beceb8cbcc26908fd3f746caeb7a4bf1 + sha256: b4d8866094256cc7f5d588d61fd212a5fe18eabc9ea52166b5edeef1e37736a9 category: dev optional: true - name: cpython @@ -1118,35 +1116,35 @@ package: category: dev optional: true - name: debugpy - version: 1.8.14 + version: 1.8.15 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - libstdcxx: '>=13' - python: '>=3.10,<3.11.0a0' + libgcc: '>=14' + libstdcxx: '>=14' + python: '' python_abi: 3.10.* - url: https://repo.prefix.dev/conda-forge/linux-64/debugpy-1.8.14-py310hf71b8c6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/debugpy-1.8.15-py310h25320af_0.conda hash: - md5: f684f79f834ebff4917f1fef366e2ca4 - sha256: 532e0ec65d575b1f2b77febff5e357759e4e463118c0b4c01596d954f491bacc + md5: 513541327fd828430aaf3d3af621664e + sha256: c2c781772677a4b5d8b67328f72b98a9217cdb0ddb31342d29f64f2904aadaa1 category: dev optional: true - name: debugpy - version: 1.8.14 + version: 1.8.15 manager: conda platform: win-64 dependencies: - python: '>=3.10,<3.11.0a0' + python: '' 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/debugpy-1.8.14-py310h9e98ed7_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/debugpy-1.8.15-py310h699e580_0.conda hash: - md5: 4849f4e95ac1018bf446394ee0661e16 - sha256: 81c5c211a59888178a6d9011e74baf3bae5a319dfcd29a2a8ac3b30bcab5ef41 + md5: 71b9b4a4db2133776f0b83d416317a49 + sha256: c39c8de81bbb55e7351a1e1c0095a52f8e6371f8e20c862b9574097594104737 category: dev optional: true - name: decorator @@ -1414,25 +1412,25 @@ package: category: main optional: false - name: fonttools - version: 4.58.5 + version: 4.59.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' brotli: '' - libgcc: '>=13' + libgcc: '>=14' munkres: '' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* unicodedata2: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.58.5-py310h89163eb_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.59.0-py310h3406613_0.conda hash: - md5: f84b125a5ba0e319936be9aba48276ff - sha256: 379c2987b99f45530ca891ad90d5d9175665104c5658a2551776a093c1ae3500 + md5: dc2e5602e20bbffb18314a70094b3c4a + sha256: 7ac6105dbbdb2e648b685b813f38a0df39b1d4264cbd13953c83ff7cf451269d category: main optional: false - name: fonttools - version: 4.58.5 + version: 4.59.0 manager: conda platform: win-64 dependencies: @@ -1444,10 +1442,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.58.5-py310hdb0e946_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.59.0-py310hdb0e946_0.conda hash: - md5: 4838fda5927aa6d029d5951efd350c8e - sha256: 09e4e313b5f36de710edadeef96aec5a684f8834c4da3b4c7a1c9f91a47938c3 + md5: eae900c4fcb37e4a3f9fe9417c669f11 + sha256: 8dc419489a74d368312a685d217896a04936373b409cf0da99807f59857cba48 category: main optional: false - name: fqdn @@ -1701,10 +1699,10 @@ package: libstdcxx: '>=14' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.5.1,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/hdf5-1.14.6-nompi_h6e4c0c1_102.conda + url: https://repo.prefix.dev/conda-forge/linux-64/hdf5-1.14.6-nompi_h6e4c0c1_103.conda hash: - md5: ac96ae31a8bd8c30b9c9a9a39b2a0791 - sha256: becd7b9abb364c1f1d15fd650d8a6b18f7366fd556a123eb216d201541a19475 + md5: c74d83614aec66227ae5199d98852aaf + sha256: 4f173af9e2299de7eee1af3d79e851bca28ee71e7426b377e841648b51d48614 category: main optional: false - name: hdf5 @@ -1719,10 +1717,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/hdf5-1.14.6-nompi_he30205f_102.conda + url: https://repo.prefix.dev/conda-forge/win-64/hdf5-1.14.6-nompi_he30205f_103.conda hash: - md5: b5e1c8fc36d0e1e3d29275f5c06a58e2 - sha256: 60659bce0bfa562a8a2f2129b094c56ed797ff11995c50feec8cd9f47aa3d33b + md5: f1f7aaf642cefd2190582550eaca4658 + sha256: 0a90263b97e9860cec6c2540160ff1a1fff2a609b3d96452f8716ae63489dac5 category: main optional: false - name: hpack @@ -1951,32 +1949,6 @@ package: sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 category: dev optional: true -- name: importlib_resources - version: 6.5.2 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - zipp: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda - hash: - md5: c85c76dc67d75619a92f51dfbce06992 - sha256: acc1d991837c0afb67c75b77fdc72b4bf022aac71fedd8b9ea45918ac9b08a80 - category: dev - optional: true -- name: importlib_resources - version: 6.5.2 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - zipp: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda - hash: - md5: c85c76dc67d75619a92f51dfbce06992 - sha256: acc1d991837c0afb67c75b77fdc72b4bf022aac71fedd8b9ea45918ac9b08a80 - category: dev - optional: true - name: iniconfig version: 2.0.0 manager: conda @@ -2349,39 +2321,35 @@ package: category: dev optional: true - name: jsonschema - version: 4.24.0 + version: 4.25.0 manager: conda platform: linux-64 dependencies: attrs: '>=22.2.0' - importlib_resources: '>=1.4.0' - jsonschema-specifications: '>=2023.03.6' - pkgutil-resolve-name: '>=1.3.10' - python: '>=3.9' + jsonschema-specifications: '>=2023.3.6' + python: '' referencing: '>=0.28.4' rpds-py: '>=0.7.1' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.24.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.0-pyhe01879c_0.conda hash: - md5: 59220749abcd119d645e6879983497a1 - sha256: 812134fabb49493a50f7f443dc0ffafd0f63766f403a0bd8e71119763e57456a + md5: c6e3fd94e058dba67d917f38a11b50ab + sha256: 87ba7cf3a65c8e8d1005368b9aee3f49e295115381b7a0b180e56f7b68b5975f category: dev optional: true - name: jsonschema - version: 4.24.0 + version: 4.25.0 manager: conda platform: win-64 dependencies: attrs: '>=22.2.0' - importlib_resources: '>=1.4.0' - jsonschema-specifications: '>=2023.03.6' - pkgutil-resolve-name: '>=1.3.10' + jsonschema-specifications: '>=2023.3.6' python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.24.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.0-pyhe01879c_0.conda hash: - md5: 59220749abcd119d645e6879983497a1 - sha256: 812134fabb49493a50f7f443dc0ffafd0f63766f403a0bd8e71119763e57456a + md5: c6e3fd94e058dba67d917f38a11b50ab + sha256: 87ba7cf3a65c8e8d1005368b9aee3f49e295115381b7a0b180e56f7b68b5975f category: dev optional: true - name: jsonschema-specifications @@ -2411,7 +2379,7 @@ package: category: dev optional: true - name: jsonschema-with-format-nongpl - version: 4.24.0 + version: 4.25.0 manager: conda platform: linux-64 dependencies: @@ -2419,19 +2387,20 @@ package: idna: '' isoduration: '' jsonpointer: '>1.13' - jsonschema: '>=4.24.0,<4.24.1.0a0' + jsonschema: '>=4.25.0,<4.25.1.0a0' rfc3339-validator: '' rfc3986-validator: '>0.1.0' + rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.24.0-hd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.25.0-he01879c_0.conda hash: - md5: b4eaebf6fac318db166238796d2a9702 - sha256: 970a1efffe29474d6bb3e4d63bc04105c5611d1c7e2cd7e2d43d1ba468f33c20 + md5: f4c7afaf838ab5bb1c4e73eb3095fb26 + sha256: 72604d07afaddf2156e61d128256d686aee4a7bdc06e235d7be352955de7527a category: dev optional: true - name: jsonschema-with-format-nongpl - version: 4.24.0 + version: 4.25.0 manager: conda platform: win-64 dependencies: @@ -2439,15 +2408,16 @@ package: idna: '' isoduration: '' jsonpointer: '>1.13' - jsonschema: '>=4.24.0,<4.24.1.0a0' + jsonschema: '>=4.25.0,<4.25.1.0a0' rfc3339-validator: '' rfc3986-validator: '>0.1.0' + rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.24.0-hd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.25.0-he01879c_0.conda hash: - md5: b4eaebf6fac318db166238796d2a9702 - sha256: 970a1efffe29474d6bb3e4d63bc04105c5611d1c7e2cd7e2d43d1ba468f33c20 + md5: f4c7afaf838ab5bb1c4e73eb3095fb26 + sha256: 72604d07afaddf2156e61d128256d686aee4a7bdc06e235d7be352955de7527a category: dev optional: true - name: jupyter-book @@ -2553,31 +2523,31 @@ package: category: dev optional: true - name: jupyter-lsp - version: 2.2.5 + version: 2.2.6 manager: conda platform: linux-64 dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' python: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.5-pyhe01879c_2.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.6-pyhe01879c_0.conda hash: - md5: 7ed6505c703f3c4e1a58864bf84505e2 - sha256: f2ca86b121bcfeaf0241a927824459ba8712e64806b98dd262eb2b1a7c4e82a6 + md5: 7129ed52335cc7164baf4d6508a3f233 + sha256: 6f2d6c5983e013af68e7e1d7082cc46b11f55e28147bd0a72a44488972ed90a3 category: dev optional: true - name: jupyter-lsp - version: 2.2.5 + version: 2.2.6 manager: conda platform: win-64 dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.5-pyhe01879c_2.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.6-pyhe01879c_0.conda hash: - md5: 7ed6505c703f3c4e1a58864bf84505e2 - sha256: f2ca86b121bcfeaf0241a927824459ba8712e64806b98dd262eb2b1a7c4e82a6 + md5: 7129ed52335cc7164baf4d6508a3f233 + sha256: 6f2d6c5983e013af68e7e1d7082cc46b11f55e28147bd0a72a44488972ed90a3 category: dev optional: true - name: jupyter_client @@ -2775,7 +2745,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.4.4 + version: 4.4.5 manager: conda platform: linux-64 dependencies: @@ -2795,14 +2765,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.4-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.5-pyhd8ed1ab_0.conda hash: - md5: dbd991d0080c48dae5113a27ab6d0d70 - sha256: a6efcdbe973e12bc8bd61aa26af77f733364975000c8fdaa0d6374338018e0db + md5: ad6bbe770780dcf9cf55d724c5a213fd + sha256: 2013c2dd13bc773167e1ad11ae885b550c0297d030e2107bdc303243ff05d3f2 category: dev optional: true - name: jupyterlab - version: 4.4.4 + version: 4.4.5 manager: conda platform: win-64 dependencies: @@ -2822,10 +2792,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.4-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.5-pyhd8ed1ab_0.conda hash: - md5: dbd991d0080c48dae5113a27ab6d0d70 - sha256: a6efcdbe973e12bc8bd61aa26af77f733364975000c8fdaa0d6374338018e0db + md5: ad6bbe770780dcf9cf55d724c5a213fd + sha256: 2013c2dd13bc773167e1ad11ae885b550c0297d030e2107bdc303243ff05d3f2 category: dev optional: true - name: jupyterlab_pygments @@ -3029,6 +2999,30 @@ package: sha256: 18e8b3430d7d232dad132f574268f56b3eb1a19431d6d5de8c53c29e6c18fa81 category: main optional: false +- name: lark + version: 1.2.2 + manager: conda + platform: linux-64 + dependencies: + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + hash: + md5: 3a8063b25e603999188ed4bbf3485404 + sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + category: dev + optional: true +- name: lark + version: 1.2.2 + manager: conda + platform: win-64 + dependencies: + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + hash: + md5: 3a8063b25e603999188ed4bbf3485404 + sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + category: dev + optional: true - name: latexcodec version: 2.0.1 manager: conda @@ -3403,30 +3397,30 @@ package: category: main optional: false - name: libexpat - version: 2.7.0 + version: 2.7.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - url: https://repo.prefix.dev/conda-forge/linux-64/libexpat-2.7.0-h5888daf_0.conda + libgcc: '>=14' + url: https://repo.prefix.dev/conda-forge/linux-64/libexpat-2.7.1-hecca717_0.conda hash: - md5: db0bfbe7dd197b68ad5f30333bae6ce0 - sha256: 33ab03438aee65d6aa667cf7d90c91e5e7d734c19a67aa4c7040742c0a13d505 + md5: 4211416ecba1866fab0c6470986c22d6 + sha256: da2080da8f0288b95dd86765c801c6e166c4619b910b11f9a8446fb852438dc2 category: main optional: false - name: libexpat - version: 2.7.0 + version: 2.7.1 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/libexpat-2.7.0-he0c23c2_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/libexpat-2.7.1-hac47afa_0.conda hash: - md5: b6f5352fdb525662f4169a0431d2dd7a - sha256: 1a227c094a4e06bd54e8c2f3ec40c17ff99dcf3037d812294f842210aa66dbeb + md5: 3608ffde260281fa641e70d6e34b1b96 + sha256: 8432ca842bdf8073ccecf016ccc9140c41c7114dc4ec77ca754551c01f780845 category: main optional: false - name: libffi @@ -3855,7 +3849,7 @@ package: category: main optional: false - name: libsqlite - version: 3.50.2 + version: 3.50.3 manager: conda platform: linux-64 dependencies: @@ -3863,24 +3857,24 @@ package: icu: '>=75.1,<76.0a0' libgcc: '>=14' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libsqlite-3.50.2-hee844dc_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libsqlite-3.50.3-hee844dc_1.conda hash: - md5: be96b9fdd7b579159df77ece9bb80e48 - sha256: 62040da9b55f409cd43697eb7391381ffede90b2ea53634a94876c6c867dcd73 + md5: 18d2ac95b507ada9ca159a6bd73255f7 + sha256: 8c4faf560815a6d6b5edadc019f76d22a45171eaa707a1f1d1898ceda74b2e3f category: main optional: false - name: libsqlite - version: 3.50.2 + version: 3.50.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libsqlite-3.50.2-hf5d6505_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/libsqlite-3.50.3-hf5d6505_1.conda hash: - md5: 58f810279ac6caec2d996a56236c3254 - sha256: f12cdfe29c248d6a1c7d11b6fe1a3e0d0563206deb422ddb1b84b909818168d4 + md5: 8b63428047c82a0b853aa348fe56071c + sha256: 9bf199ca8b388d8585c53432949524767532f84a5a881f1cef4808d0e7a3f95a category: main optional: false - name: libssh2 @@ -4471,12 +4465,12 @@ package: platform: linux-64 dependencies: _openmp_mutex: '>=4.5' - llvm-openmp: '>=19.1.2' + llvm-openmp: '>=20.1.8' tbb: 2021.* - url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha957f24_16.conda + url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha770c72_16.conda hash: - md5: 1459379c79dda834673426504d52b319 - sha256: 77906b0acead8f86b489da46f53916e624897338770dbf70b04b8f673c9273c1 + md5: 06fc17a281d2f71995f3bb58a7b7f4e5 + sha256: 9be33c297dd53e4eafef7c6ec597f1b4dee99296a768816d9bf793e2432a027f category: main optional: false - name: mkl @@ -5383,30 +5377,6 @@ package: sha256: ebfa591d39092b111b9ebb3210eb42251be6da89e26c823ee03e5e838655a43e category: main optional: false -- name: pkgutil-resolve-name - version: 1.3.10 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_2.conda - hash: - md5: 5a5870a74432aa332f7d32180633ad05 - sha256: adb2dde5b4f7da70ae81309cce6188ed3286ff280355cf1931b45d91164d2ad8 - category: dev - optional: true -- name: pkgutil-resolve-name - version: 1.3.10 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_2.conda - hash: - md5: 5a5870a74432aa332f7d32180633ad05 - sha256: adb2dde5b4f7da70ae81309cce6188ed3286ff280355cf1931b45d91164d2ad8 - category: dev - optional: true - name: platformdirs version: 4.3.8 manager: conda @@ -6241,10 +6211,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.10-7_cp310.conda + url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.10-8_cp310.conda hash: - md5: 44e871cba2b162368476a84b8d040b6c - sha256: 1316c66889313d9caebcfa5d5e9e6af25f8ba09396fc1bc196a08a3febbbabb8 + md5: 05e00f3b21e88bb3d658ac700b2ce58c + sha256: 7ad76fa396e4bde336872350124c0819032a9e8a0a40590744ff9527b54351c1 category: main optional: false - name: python_abi @@ -6252,10 +6222,10 @@ package: manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.10-7_cp310.conda + url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.10-8_cp310.conda hash: - md5: 44e871cba2b162368476a84b8d040b6c - sha256: 1316c66889313d9caebcfa5d5e9e6af25f8ba09396fc1bc196a08a3febbbabb8 + md5: 05e00f3b21e88bb3d658ac700b2ce58c + sha256: 7ad76fa396e4bde336872350124c0819032a9e8a0a40590744ff9527b54351c1 category: main optional: false - name: pytz @@ -6539,6 +6509,32 @@ package: sha256: 2a5b495a1de0f60f24d8a74578ebc23b24aa53279b1ad583755f223097c41c37 category: dev optional: true +- name: rfc3987-syntax + version: 1.1.0 + manager: conda + platform: linux-64 + dependencies: + lark: '>=1.2.2' + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda + hash: + md5: 7234f99325263a5af6d4cd195035e8f2 + sha256: 70001ac24ee62058557783d9c5a7bbcfd97bd4911ef5440e3f7a576f9e43bc92 + category: dev + optional: true +- name: rfc3987-syntax + version: 1.1.0 + manager: conda + platform: win-64 + dependencies: + lark: '>=1.2.2' + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda + hash: + md5: 7234f99325263a5af6d4cd195035e8f2 + sha256: 70001ac24ee62058557783d9c5a7bbcfd97bd4911ef5440e3f7a576f9e43bc92 + category: dev + optional: true - name: rpds-py version: 0.26.0 manager: conda @@ -6599,28 +6595,27 @@ package: category: main optional: false - name: scikit-learn - version: 1.5.2 + version: 1.4.2 manager: conda platform: linux-64 dependencies: - __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' joblib: '>=1.2.0' - libgcc: '>=13' - libstdcxx: '>=13' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' numpy: '>=1.19,<3' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '' - threadpoolctl: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/scikit-learn-1.5.2-py310h27f47ee_1.conda + threadpoolctl: '>=2.0.0' + url: https://repo.prefix.dev/conda-forge/linux-64/scikit-learn-1.4.2-py310h981052a_1.conda hash: - md5: 374383a1c0d197bdc1eee7c4973b732d - sha256: 777580d5ba89c5382fa63807a7981ae2261784258e84f5a9e747f5bd3d3428f3 + md5: 672f0238a945f1c98fe97b147c8a040a + sha256: b3718226723c94f5a93f417acb29ad82b0520acf945a06ae90e0b7ed076191a7 category: main optional: false - name: scikit-learn - version: 1.5.2 + version: 1.4.2 manager: conda platform: win-64 dependencies: @@ -6629,14 +6624,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '' - threadpoolctl: '>=3.1.0' + threadpoolctl: '>=2.0.0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/scikit-learn-1.5.2-py310hf2a6c47_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/scikit-learn-1.4.2-py310hf2a6c47_1.conda hash: - md5: bef8985d120ce63d9d68c3799fb9d10c - sha256: 2beccd9ca490ece4cc9a3915b2c2d499885b5b21ecbf2236511268befccbdd7e + md5: 9142e7e901c0f6e76541b523d480043e + sha256: 24e9f3db0a2f477cbe20d1c98b48edd0d768af21dd7e6c3553e286f01deabfe5 category: main optional: false - name: scipy @@ -6737,11 +6732,11 @@ package: manager: conda platform: linux-64 dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: - md5: a451d576819089b0d672f18768be0f65 - sha256: 41db0180680cc67c3fa76544ffd48d6a5679d96f4b71d7498a759e94edc9a2db + md5: 3339e3b65d58accf4ca4fb8748ab16b3 + sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d category: main optional: false - name: six @@ -6750,10 +6745,10 @@ package: platform: win-64 dependencies: python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: - md5: a451d576819089b0d672f18768be0f65 - sha256: 41db0180680cc67c3fa76544ffd48d6a5679d96f4b71d7498a759e94edc9a2db + md5: 3339e3b65d58accf4ca4fb8748ab16b3 + sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d category: main optional: false - name: sniffio @@ -8069,11 +8064,11 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/vc-14.3-h41ae7f8_26.conda + vc14_runtime: '>=14.42.34433' + url: https://repo.prefix.dev/conda-forge/win-64/vc-14.3-h2b53caa_30.conda hash: - md5: 18b6bf6f878501547786f7bf8052a34d - sha256: b388d88e04aa0257df4c1d28f8d85d985ad07c1e5645aa62335673c98704c4c6 + md5: 76b6febe6dea7991df4c86f826f396c5 + sha256: 8e16a8c3270d88735234a8097d45efea02b49751800c83b6fd5f2167a3828f52 category: main optional: false - name: vc14_runtime @@ -8082,10 +8077,10 @@ package: platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://repo.prefix.dev/conda-forge/win-64/vc14_runtime-14.44.35208-h818238b_26.conda + url: https://repo.prefix.dev/conda-forge/win-64/vc14_runtime-14.44.35208-h818238b_30.conda hash: - md5: 14d65350d3f5c8ff163dc4f76d6e2830 - sha256: 7bad6e25a7c836d99011aee59dcf600b7f849a6fa5caa05a406255527e80a703 + md5: fa6802b52e903c42f882ecd67731e10a + sha256: 2958ef637509d69ea496b091dc579f1bf38687575b65744e73d157cfe56c9eca category: main optional: false - name: vs2015_runtime @@ -8094,10 +8089,10 @@ package: platform: win-64 dependencies: vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/vs2015_runtime-14.44.35208-h38c0c73_26.conda + url: https://repo.prefix.dev/conda-forge/win-64/vs2015_runtime-14.44.35208-h38c0c73_30.conda hash: - md5: 312f3a0a6b3c5908e79ce24002411e32 - sha256: d18d77c8edfbad37fa0e0bb0f543ad80feb85e8fe5ced0f686b8be463742ec0b + md5: 1a877c8c882c297656e4bea2c0d55adc + sha256: 99785cef95465045eb10b4e72ae9c2c4e25626a676b859c51af01ab3b92e7ef0 category: main optional: false - name: wcwidth @@ -8591,12 +8586,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@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a hash: - sha256: a7a5280079f39ca35c502bddedb56ccc3f77f29d + sha256: 53f7981670df120297945a4c3c1f7fce74f5ed3a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a category: main optional: false - name: geoh5py @@ -8608,16 +8603,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@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a hash: - sha256: a7a5280079f39ca35c502bddedb56ccc3f77f29d + sha256: 53f7981670df120297945a4c3c1f7fce74f5ed3a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a category: main optional: false - name: mira-simpeg - version: 0.23.0.1a5.dev37+g86e22e6fa + version: 0.23.0.1a5.dev45+g01a7068fd manager: pip platform: linux-64 dependencies: @@ -8629,16 +8624,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df hash: - sha256: 86e22e6fa457859d494d94552e6431728e513d7a + sha256: 01a7068fdab7fba8695ad371c9fd9164760a09df source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df category: main optional: false - name: mira-simpeg - version: 0.23.0.1a5.dev37+g86e22e6fa + version: 0.23.0.1a5.dev45+g01a7068fd manager: pip platform: win-64 dependencies: @@ -8650,12 +8645,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df hash: - sha256: 86e22e6fa457859d494d94552e6431728e513d7a + sha256: 01a7068fdab7fba8695ad371c9fd9164760a09df source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df category: main optional: false - name: octree-creation-app diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 7048eac0..a5133369 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 57805dd7243378b72dd91648b00eb790f855375cd6ad3095c5099809073a0210 - linux-64: 3bdb725cf9e2e0a18331b01a1fd271c67ce2f7d54cfb3de3bcc9379dc3f52ad6 + win-64: b9f574bd52f02e9a0d8648f478d484cd228f132f708933856414eed155f61a30 + linux-64: c9dba1cefe5fafa1d6916df23312dff6e683994e65910cb3e402d7568b87973d channels: - url: conda-forge used_env_vars: [] @@ -889,29 +889,27 @@ package: category: main optional: false - name: comm - version: 0.2.2 + version: 0.2.3 manager: conda platform: linux-64 dependencies: python: '>=3.9' - traitlets: '>=5.3' - url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: - md5: 74673132601ec2b7fc592755605f4c1b - sha256: 7e87ef7c91574d9fac19faedaaee328a70f718c9b4ddadfdc0ba9ac021bd64af + md5: 2da13f2b299d8e1995bafbbe9689a2f7 + sha256: 576a44729314ad9e4e5ebe055fbf48beb8116b60e58f9070278985b2b634f212 category: dev optional: true - name: comm - version: 0.2.2 + version: 0.2.3 manager: conda platform: win-64 dependencies: python: '>=3.9' - traitlets: '>=5.3' - url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: - md5: 74673132601ec2b7fc592755605f4c1b - sha256: 7e87ef7c91574d9fac19faedaaee328a70f718c9b4ddadfdc0ba9ac021bd64af + md5: 2da13f2b299d8e1995bafbbe9689a2f7 + sha256: 576a44729314ad9e4e5ebe055fbf48beb8116b60e58f9070278985b2b634f212 category: dev optional: true - name: contourpy @@ -949,23 +947,23 @@ package: category: main optional: false - name: coverage - version: 7.9.2 + version: 7.10.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.9.2-py311h2dc5d0c_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.0-py311h3778330_0.conda hash: - md5: 4a4d2bb7e4d14efb7320206a57467029 - sha256: bd58cbea4606052fc7f1236d4ae8febc95f877dd34e588f6060147e4f43aafde + md5: 2f62d3939cc0ce55d8b371cf9f5f3c82 + sha256: 1223c410786ae545eb51ed3611010aa29931864ea38cb9dc6652b7301290ef3b category: dev optional: true - name: coverage - version: 7.9.2 + version: 7.10.0 manager: conda platform: win-64 dependencies: @@ -975,10 +973,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/coverage-7.9.2-py311h3f79411_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.0-py311h3f79411_0.conda hash: - md5: 9aa6ae84c02129fb9ba65336eed930bf - sha256: 5e59efb460966daa47c4bfc8b2b3db99bd26edef97c598c4cf5140f77dfe33f7 + md5: aab7055a5e8a3aa623fdf00766446824 + sha256: 555fe72ea12d0611389338fd8e3a6aa8ffd1d59e335a47e57a7d0ae150c3ff82 category: dev optional: true - name: cpython @@ -1116,35 +1114,35 @@ package: category: dev optional: true - name: debugpy - version: 1.8.14 + version: 1.8.15 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - libstdcxx: '>=13' - python: '>=3.11,<3.12.0a0' + libgcc: '>=14' + libstdcxx: '>=14' + python: '' python_abi: 3.11.* - url: https://repo.prefix.dev/conda-forge/linux-64/debugpy-1.8.14-py311hfdbb021_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/debugpy-1.8.15-py311hc665b79_0.conda hash: - md5: 1c229452e28e2c4607457c7b6c839bc7 - sha256: 2f6d43724f60828fa226a71f519248ecd1dd456f0d4fc5f887936c763ea726e4 + md5: 27fd3bb353295538b2c81a26c618ecc8 + sha256: fc50d7e7930d8cb3c21bcb987b7dc50a8369cba56f33347b2efcaeddbd928eef category: dev optional: true - name: debugpy - version: 1.8.14 + version: 1.8.15 manager: conda platform: win-64 dependencies: - python: '>=3.11,<3.12.0a0' + python: '' 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/debugpy-1.8.14-py311hda3d55a_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/debugpy-1.8.15-py311h5dfdfe8_0.conda hash: - md5: 253acd78a14d333ea1c6de5b16b5a0ae - sha256: 71127b53485a633f708f6645d8d023aef2efa325ca063466b21446b778d49b94 + md5: 8937917a1e7cfc2451418260f082c582 + sha256: 0f6e582014a2dfb6e1a32d075b57d4392f7575784b717710ce2319d536cab9d5 category: dev optional: true - name: decorator @@ -1438,25 +1436,25 @@ package: category: main optional: false - name: fonttools - version: 4.58.5 + version: 4.59.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' brotli: '' - libgcc: '>=13' + libgcc: '>=14' munkres: '' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* unicodedata2: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.58.5-py311h2dc5d0c_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.59.0-py311h3778330_0.conda hash: - md5: 13ca35ec6ae88e9c2c71cef129ac73f2 - sha256: ef571847af828f47addd4df366c85dd0a0515c6899aad2222106b68a7ed08ab3 + md5: 2eaecc2e416852815abb85dc47d425b3 + sha256: d82af0b7a12c6fdb30de81f83da5aba89ac8628744630dc67cd9cfc5eedadb3d category: main optional: false - name: fonttools - version: 4.58.5 + version: 4.59.0 manager: conda platform: win-64 dependencies: @@ -1468,10 +1466,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.58.5-py311h3f79411_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.59.0-py311h3f79411_0.conda hash: - md5: ff4c3b92e086ac37cd4b6b66d504b5f7 - sha256: c7ac08f1c0b93cd7edd57d9adf4fa5a5fdfd8da299551a45e0dcc2a2a6caf290 + md5: 4ca28d9b6582ba8c7dfc0d738ca43258 + sha256: f26dafd8a4fd0b98a8e8363e6ff98bfc1c1be8a378f89829323b16ce6e05e675 category: main optional: false - name: fqdn @@ -1725,10 +1723,10 @@ package: libstdcxx: '>=14' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.5.1,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/hdf5-1.14.6-nompi_h6e4c0c1_102.conda + url: https://repo.prefix.dev/conda-forge/linux-64/hdf5-1.14.6-nompi_h6e4c0c1_103.conda hash: - md5: ac96ae31a8bd8c30b9c9a9a39b2a0791 - sha256: becd7b9abb364c1f1d15fd650d8a6b18f7366fd556a123eb216d201541a19475 + md5: c74d83614aec66227ae5199d98852aaf + sha256: 4f173af9e2299de7eee1af3d79e851bca28ee71e7426b377e841648b51d48614 category: main optional: false - name: hdf5 @@ -1743,10 +1741,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/hdf5-1.14.6-nompi_he30205f_102.conda + url: https://repo.prefix.dev/conda-forge/win-64/hdf5-1.14.6-nompi_he30205f_103.conda hash: - md5: b5e1c8fc36d0e1e3d29275f5c06a58e2 - sha256: 60659bce0bfa562a8a2f2129b094c56ed797ff11995c50feec8cd9f47aa3d33b + md5: f1f7aaf642cefd2190582550eaca4658 + sha256: 0a90263b97e9860cec6c2540160ff1a1fff2a609b3d96452f8716ae63489dac5 category: main optional: false - name: hpack @@ -1975,32 +1973,6 @@ package: sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 category: dev optional: true -- name: importlib_resources - version: 6.5.2 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - zipp: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda - hash: - md5: c85c76dc67d75619a92f51dfbce06992 - sha256: acc1d991837c0afb67c75b77fdc72b4bf022aac71fedd8b9ea45918ac9b08a80 - category: dev - optional: true -- name: importlib_resources - version: 6.5.2 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - zipp: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda - hash: - md5: c85c76dc67d75619a92f51dfbce06992 - sha256: acc1d991837c0afb67c75b77fdc72b4bf022aac71fedd8b9ea45918ac9b08a80 - category: dev - optional: true - name: iniconfig version: 2.0.0 manager: conda @@ -2401,39 +2373,35 @@ package: category: dev optional: true - name: jsonschema - version: 4.24.0 + version: 4.25.0 manager: conda platform: linux-64 dependencies: attrs: '>=22.2.0' - importlib_resources: '>=1.4.0' - jsonschema-specifications: '>=2023.03.6' - pkgutil-resolve-name: '>=1.3.10' + jsonschema-specifications: '>=2023.3.6' python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.24.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.0-pyhe01879c_0.conda hash: - md5: 59220749abcd119d645e6879983497a1 - sha256: 812134fabb49493a50f7f443dc0ffafd0f63766f403a0bd8e71119763e57456a + md5: c6e3fd94e058dba67d917f38a11b50ab + sha256: 87ba7cf3a65c8e8d1005368b9aee3f49e295115381b7a0b180e56f7b68b5975f category: dev optional: true - name: jsonschema - version: 4.24.0 + version: 4.25.0 manager: conda platform: win-64 dependencies: attrs: '>=22.2.0' - importlib_resources: '>=1.4.0' - jsonschema-specifications: '>=2023.03.6' - pkgutil-resolve-name: '>=1.3.10' + jsonschema-specifications: '>=2023.3.6' python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.24.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.0-pyhe01879c_0.conda hash: - md5: 59220749abcd119d645e6879983497a1 - sha256: 812134fabb49493a50f7f443dc0ffafd0f63766f403a0bd8e71119763e57456a + md5: c6e3fd94e058dba67d917f38a11b50ab + sha256: 87ba7cf3a65c8e8d1005368b9aee3f49e295115381b7a0b180e56f7b68b5975f category: dev optional: true - name: jsonschema-specifications @@ -2463,7 +2431,7 @@ package: category: dev optional: true - name: jsonschema-with-format-nongpl - version: 4.24.0 + version: 4.25.0 manager: conda platform: linux-64 dependencies: @@ -2471,19 +2439,20 @@ package: idna: '' isoduration: '' jsonpointer: '>1.13' - jsonschema: '>=4.24.0,<4.24.1.0a0' + jsonschema: '>=4.25.0,<4.25.1.0a0' rfc3339-validator: '' rfc3986-validator: '>0.1.0' + rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.24.0-hd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.25.0-he01879c_0.conda hash: - md5: b4eaebf6fac318db166238796d2a9702 - sha256: 970a1efffe29474d6bb3e4d63bc04105c5611d1c7e2cd7e2d43d1ba468f33c20 + md5: f4c7afaf838ab5bb1c4e73eb3095fb26 + sha256: 72604d07afaddf2156e61d128256d686aee4a7bdc06e235d7be352955de7527a category: dev optional: true - name: jsonschema-with-format-nongpl - version: 4.24.0 + version: 4.25.0 manager: conda platform: win-64 dependencies: @@ -2491,15 +2460,16 @@ package: idna: '' isoduration: '' jsonpointer: '>1.13' - jsonschema: '>=4.24.0,<4.24.1.0a0' + jsonschema: '>=4.25.0,<4.25.1.0a0' rfc3339-validator: '' rfc3986-validator: '>0.1.0' + rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.24.0-hd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.25.0-he01879c_0.conda hash: - md5: b4eaebf6fac318db166238796d2a9702 - sha256: 970a1efffe29474d6bb3e4d63bc04105c5611d1c7e2cd7e2d43d1ba468f33c20 + md5: f4c7afaf838ab5bb1c4e73eb3095fb26 + sha256: 72604d07afaddf2156e61d128256d686aee4a7bdc06e235d7be352955de7527a category: dev optional: true - name: jupyter-book @@ -2605,31 +2575,31 @@ package: category: dev optional: true - name: jupyter-lsp - version: 2.2.5 + version: 2.2.6 manager: conda platform: linux-64 dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.5-pyhe01879c_2.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.6-pyhe01879c_0.conda hash: - md5: 7ed6505c703f3c4e1a58864bf84505e2 - sha256: f2ca86b121bcfeaf0241a927824459ba8712e64806b98dd262eb2b1a7c4e82a6 + md5: 7129ed52335cc7164baf4d6508a3f233 + sha256: 6f2d6c5983e013af68e7e1d7082cc46b11f55e28147bd0a72a44488972ed90a3 category: dev optional: true - name: jupyter-lsp - version: 2.2.5 + version: 2.2.6 manager: conda platform: win-64 dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.5-pyhe01879c_2.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.6-pyhe01879c_0.conda hash: - md5: 7ed6505c703f3c4e1a58864bf84505e2 - sha256: f2ca86b121bcfeaf0241a927824459ba8712e64806b98dd262eb2b1a7c4e82a6 + md5: 7129ed52335cc7164baf4d6508a3f233 + sha256: 6f2d6c5983e013af68e7e1d7082cc46b11f55e28147bd0a72a44488972ed90a3 category: dev optional: true - name: jupyter_client @@ -2827,7 +2797,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.4.4 + version: 4.4.5 manager: conda platform: linux-64 dependencies: @@ -2847,14 +2817,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.4-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.5-pyhd8ed1ab_0.conda hash: - md5: dbd991d0080c48dae5113a27ab6d0d70 - sha256: a6efcdbe973e12bc8bd61aa26af77f733364975000c8fdaa0d6374338018e0db + md5: ad6bbe770780dcf9cf55d724c5a213fd + sha256: 2013c2dd13bc773167e1ad11ae885b550c0297d030e2107bdc303243ff05d3f2 category: dev optional: true - name: jupyterlab - version: 4.4.4 + version: 4.4.5 manager: conda platform: win-64 dependencies: @@ -2874,10 +2844,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.4-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.5-pyhd8ed1ab_0.conda hash: - md5: dbd991d0080c48dae5113a27ab6d0d70 - sha256: a6efcdbe973e12bc8bd61aa26af77f733364975000c8fdaa0d6374338018e0db + md5: ad6bbe770780dcf9cf55d724c5a213fd + sha256: 2013c2dd13bc773167e1ad11ae885b550c0297d030e2107bdc303243ff05d3f2 category: dev optional: true - name: jupyterlab_pygments @@ -3081,6 +3051,30 @@ package: sha256: 18e8b3430d7d232dad132f574268f56b3eb1a19431d6d5de8c53c29e6c18fa81 category: main optional: false +- name: lark + version: 1.2.2 + manager: conda + platform: linux-64 + dependencies: + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + hash: + md5: 3a8063b25e603999188ed4bbf3485404 + sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + category: dev + optional: true +- name: lark + version: 1.2.2 + manager: conda + platform: win-64 + dependencies: + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + hash: + md5: 3a8063b25e603999188ed4bbf3485404 + sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + category: dev + optional: true - name: latexcodec version: 2.0.1 manager: conda @@ -3455,30 +3449,30 @@ package: category: main optional: false - name: libexpat - version: 2.7.0 + version: 2.7.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - url: https://repo.prefix.dev/conda-forge/linux-64/libexpat-2.7.0-h5888daf_0.conda + libgcc: '>=14' + url: https://repo.prefix.dev/conda-forge/linux-64/libexpat-2.7.1-hecca717_0.conda hash: - md5: db0bfbe7dd197b68ad5f30333bae6ce0 - sha256: 33ab03438aee65d6aa667cf7d90c91e5e7d734c19a67aa4c7040742c0a13d505 + md5: 4211416ecba1866fab0c6470986c22d6 + sha256: da2080da8f0288b95dd86765c801c6e166c4619b910b11f9a8446fb852438dc2 category: main optional: false - name: libexpat - version: 2.7.0 + version: 2.7.1 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/libexpat-2.7.0-he0c23c2_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/libexpat-2.7.1-hac47afa_0.conda hash: - md5: b6f5352fdb525662f4169a0431d2dd7a - sha256: 1a227c094a4e06bd54e8c2f3ec40c17ff99dcf3037d812294f842210aa66dbeb + md5: 3608ffde260281fa641e70d6e34b1b96 + sha256: 8432ca842bdf8073ccecf016ccc9140c41c7114dc4ec77ca754551c01f780845 category: main optional: false - name: libffi @@ -3907,7 +3901,7 @@ package: category: main optional: false - name: libsqlite - version: 3.50.2 + version: 3.50.3 manager: conda platform: linux-64 dependencies: @@ -3915,24 +3909,24 @@ package: icu: '>=75.1,<76.0a0' libgcc: '>=14' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libsqlite-3.50.2-hee844dc_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libsqlite-3.50.3-hee844dc_1.conda hash: - md5: be96b9fdd7b579159df77ece9bb80e48 - sha256: 62040da9b55f409cd43697eb7391381ffede90b2ea53634a94876c6c867dcd73 + md5: 18d2ac95b507ada9ca159a6bd73255f7 + sha256: 8c4faf560815a6d6b5edadc019f76d22a45171eaa707a1f1d1898ceda74b2e3f category: main optional: false - name: libsqlite - version: 3.50.2 + version: 3.50.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libsqlite-3.50.2-hf5d6505_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/libsqlite-3.50.3-hf5d6505_1.conda hash: - md5: 58f810279ac6caec2d996a56236c3254 - sha256: f12cdfe29c248d6a1c7d11b6fe1a3e0d0563206deb422ddb1b84b909818168d4 + md5: 8b63428047c82a0b853aa348fe56071c + sha256: 9bf199ca8b388d8585c53432949524767532f84a5a881f1cef4808d0e7a3f95a category: main optional: false - name: libssh2 @@ -4523,12 +4517,12 @@ package: platform: linux-64 dependencies: _openmp_mutex: '*' - llvm-openmp: '>=19.1.2' + llvm-openmp: '>=20.1.8' tbb: 2021.* - url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha957f24_16.conda + url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha770c72_16.conda hash: - md5: 1459379c79dda834673426504d52b319 - sha256: 77906b0acead8f86b489da46f53916e624897338770dbf70b04b8f673c9273c1 + md5: 06fc17a281d2f71995f3bb58a7b7f4e5 + sha256: 9be33c297dd53e4eafef7c6ec597f1b4dee99296a768816d9bf793e2432a027f category: main optional: false - name: mkl @@ -5437,30 +5431,6 @@ package: sha256: ebfa591d39092b111b9ebb3210eb42251be6da89e26c823ee03e5e838655a43e category: main optional: false -- name: pkgutil-resolve-name - version: 1.3.10 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_2.conda - hash: - md5: 5a5870a74432aa332f7d32180633ad05 - sha256: adb2dde5b4f7da70ae81309cce6188ed3286ff280355cf1931b45d91164d2ad8 - category: dev - optional: true -- name: pkgutil-resolve-name - version: 1.3.10 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_2.conda - hash: - md5: 5a5870a74432aa332f7d32180633ad05 - sha256: adb2dde5b4f7da70ae81309cce6188ed3286ff280355cf1931b45d91164d2ad8 - category: dev - optional: true - name: platformdirs version: 4.3.8 manager: conda @@ -6295,10 +6265,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.11-7_cp311.conda + url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.11-8_cp311.conda hash: - md5: 6320dac78b3b215ceac35858b2cfdb70 - sha256: 705d06b15c497b585d235e7e87f6c893ffe5fbfdb3326e376e56c842879e0a09 + md5: 8fcb6b0e2161850556231336dae58358 + sha256: fddf123692aa4b1fc48f0471e346400d9852d96eeed77dbfdd746fa50a8ff894 category: main optional: false - name: python_abi @@ -6306,10 +6276,10 @@ package: manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.11-7_cp311.conda + url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.11-8_cp311.conda hash: - md5: 6320dac78b3b215ceac35858b2cfdb70 - sha256: 705d06b15c497b585d235e7e87f6c893ffe5fbfdb3326e376e56c842879e0a09 + md5: 8fcb6b0e2161850556231336dae58358 + sha256: fddf123692aa4b1fc48f0471e346400d9852d96eeed77dbfdd746fa50a8ff894 category: main optional: false - name: pytz @@ -6593,6 +6563,32 @@ package: sha256: 2a5b495a1de0f60f24d8a74578ebc23b24aa53279b1ad583755f223097c41c37 category: dev optional: true +- name: rfc3987-syntax + version: 1.1.0 + manager: conda + platform: linux-64 + dependencies: + lark: '>=1.2.2' + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda + hash: + md5: 7234f99325263a5af6d4cd195035e8f2 + sha256: 70001ac24ee62058557783d9c5a7bbcfd97bd4911ef5440e3f7a576f9e43bc92 + category: dev + optional: true +- name: rfc3987-syntax + version: 1.1.0 + manager: conda + platform: win-64 + dependencies: + lark: '>=1.2.2' + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda + hash: + md5: 7234f99325263a5af6d4cd195035e8f2 + sha256: 70001ac24ee62058557783d9c5a7bbcfd97bd4911ef5440e3f7a576f9e43bc92 + category: dev + optional: true - name: rpds-py version: 0.26.0 manager: conda @@ -6653,28 +6649,27 @@ package: category: main optional: false - name: scikit-learn - version: 1.5.2 + version: 1.4.2 manager: conda platform: linux-64 dependencies: - __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' joblib: '>=1.2.0' - libgcc: '>=13' - libstdcxx: '>=13' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' numpy: '>=1.19,<3' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* scipy: '' - threadpoolctl: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/scikit-learn-1.5.2-py311h57cc02b_1.conda + threadpoolctl: '>=2.0.0' + url: https://repo.prefix.dev/conda-forge/linux-64/scikit-learn-1.4.2-py311he08f58d_1.conda hash: - md5: d1b6d7a73364d9fe20d2863bd2c43e3a - sha256: b6489f65911847d1f9807e254e9af0815548454b911df4d0b5019f9ab16fe530 + md5: fd4a80e35c05513590b33c83fc81dcc7 + sha256: b818f7df6ae949012a38b41b6577ac2319569971b1a063c0386447ec2c6c09ed category: main optional: false - name: scikit-learn - version: 1.5.2 + version: 1.4.2 manager: conda platform: win-64 dependencies: @@ -6683,14 +6678,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* scipy: '' - threadpoolctl: '>=3.1.0' + threadpoolctl: '>=2.0.0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/scikit-learn-1.5.2-py311hdcb8d17_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/scikit-learn-1.4.2-py311hdcb8d17_1.conda hash: - md5: c3e550b20baa56f911022f6304c8f547 - sha256: 3f23a54f327af0227115b1ac3a8d6b32926e87bfe0097e3c906bd205bb9340b7 + md5: 4179839852432a4e95b5ff86dd5faa9c + sha256: e38cac2faa50b04ae06da6a7c9690ad8f893f2b3318b052ac15710221f32e231 category: main optional: false - name: scipy @@ -6792,10 +6787,10 @@ package: platform: linux-64 dependencies: python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: - md5: a451d576819089b0d672f18768be0f65 - sha256: 41db0180680cc67c3fa76544ffd48d6a5679d96f4b71d7498a759e94edc9a2db + md5: 3339e3b65d58accf4ca4fb8748ab16b3 + sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d category: main optional: false - name: six @@ -6804,10 +6799,10 @@ package: platform: win-64 dependencies: python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: - md5: a451d576819089b0d672f18768be0f65 - sha256: 41db0180680cc67c3fa76544ffd48d6a5679d96f4b71d7498a759e94edc9a2db + md5: 3339e3b65d58accf4ca4fb8748ab16b3 + sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d category: main optional: false - name: sniffio @@ -8123,11 +8118,11 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/vc-14.3-h41ae7f8_26.conda + vc14_runtime: '>=14.42.34433' + url: https://repo.prefix.dev/conda-forge/win-64/vc-14.3-h2b53caa_30.conda hash: - md5: 18b6bf6f878501547786f7bf8052a34d - sha256: b388d88e04aa0257df4c1d28f8d85d985ad07c1e5645aa62335673c98704c4c6 + md5: 76b6febe6dea7991df4c86f826f396c5 + sha256: 8e16a8c3270d88735234a8097d45efea02b49751800c83b6fd5f2167a3828f52 category: main optional: false - name: vc14_runtime @@ -8136,10 +8131,10 @@ package: platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://repo.prefix.dev/conda-forge/win-64/vc14_runtime-14.44.35208-h818238b_26.conda + url: https://repo.prefix.dev/conda-forge/win-64/vc14_runtime-14.44.35208-h818238b_30.conda hash: - md5: 14d65350d3f5c8ff163dc4f76d6e2830 - sha256: 7bad6e25a7c836d99011aee59dcf600b7f849a6fa5caa05a406255527e80a703 + md5: fa6802b52e903c42f882ecd67731e10a + sha256: 2958ef637509d69ea496b091dc579f1bf38687575b65744e73d157cfe56c9eca category: main optional: false - name: vs2015_runtime @@ -8148,10 +8143,10 @@ package: platform: win-64 dependencies: vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/vs2015_runtime-14.44.35208-h38c0c73_26.conda + url: https://repo.prefix.dev/conda-forge/win-64/vs2015_runtime-14.44.35208-h38c0c73_30.conda hash: - md5: 312f3a0a6b3c5908e79ce24002411e32 - sha256: d18d77c8edfbad37fa0e0bb0f543ad80feb85e8fe5ced0f686b8be463742ec0b + md5: 1a877c8c882c297656e4bea2c0d55adc + sha256: 99785cef95465045eb10b4e72ae9c2c4e25626a676b859c51af01ab3b92e7ef0 category: main optional: false - name: wcwidth @@ -8676,12 +8671,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@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a hash: - sha256: a7a5280079f39ca35c502bddedb56ccc3f77f29d + sha256: 53f7981670df120297945a4c3c1f7fce74f5ed3a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a category: main optional: false - name: geoh5py @@ -8693,16 +8688,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@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a hash: - sha256: a7a5280079f39ca35c502bddedb56ccc3f77f29d + sha256: 53f7981670df120297945a4c3c1f7fce74f5ed3a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a category: main optional: false - name: mira-simpeg - version: 0.23.0.1a5.dev37+g86e22e6fa + version: 0.23.0.1a5.dev45+g01a7068fd manager: pip platform: linux-64 dependencies: @@ -8714,16 +8709,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df hash: - sha256: 86e22e6fa457859d494d94552e6431728e513d7a + sha256: 01a7068fdab7fba8695ad371c9fd9164760a09df source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df category: main optional: false - name: mira-simpeg - version: 0.23.0.1a5.dev37+g86e22e6fa + version: 0.23.0.1a5.dev45+g01a7068fd manager: pip platform: win-64 dependencies: @@ -8735,12 +8730,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df hash: - sha256: 86e22e6fa457859d494d94552e6431728e513d7a + sha256: 01a7068fdab7fba8695ad371c9fd9164760a09df source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df category: main optional: false - name: octree-creation-app diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 1c287ae8..3b82a24c 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 2b057dda003b244877434d1dd71bfa18b96472fbaeadeb2cf9c4266efbfdb4e0 - linux-64: 0411d0bb5b468d1fb923a36f5fc20b1e4f1af3a872d37f6492e422e64a4e5142 + win-64: 8ac7e9b31d0a8968577d04b18bfae4e5b55625cc38cfb3a62f6b8f87f8a156f9 + linux-64: 986de85ed6e6464ef1d28bc0bd68959524a00d49b9d9e57fda77fdcf3447934a channels: - url: conda-forge used_env_vars: [] @@ -889,29 +889,27 @@ package: category: main optional: false - name: comm - version: 0.2.2 + version: 0.2.3 manager: conda platform: linux-64 dependencies: python: '>=3.9' - traitlets: '>=5.3' - url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: - md5: 74673132601ec2b7fc592755605f4c1b - sha256: 7e87ef7c91574d9fac19faedaaee328a70f718c9b4ddadfdc0ba9ac021bd64af + md5: 2da13f2b299d8e1995bafbbe9689a2f7 + sha256: 576a44729314ad9e4e5ebe055fbf48beb8116b60e58f9070278985b2b634f212 category: dev optional: true - name: comm - version: 0.2.2 + version: 0.2.3 manager: conda platform: win-64 dependencies: python: '>=3.9' - traitlets: '>=5.3' - url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.2-pyhd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/comm-0.2.3-pyhe01879c_0.conda hash: - md5: 74673132601ec2b7fc592755605f4c1b - sha256: 7e87ef7c91574d9fac19faedaaee328a70f718c9b4ddadfdc0ba9ac021bd64af + md5: 2da13f2b299d8e1995bafbbe9689a2f7 + sha256: 576a44729314ad9e4e5ebe055fbf48beb8116b60e58f9070278985b2b634f212 category: dev optional: true - name: contourpy @@ -949,23 +947,23 @@ package: category: main optional: false - name: coverage - version: 7.9.2 + version: 7.10.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.9.2-py312h178313f_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.10.0-py312h8a5da7c_0.conda hash: - md5: c6fbd05ceaeed83ef044de66e3f26fef - sha256: fff058f8a145faed110680339ebbadfeb57b8ecb7164a415856d27f3c2fb6b1f + md5: 10c5a17b4546b4e236031ef8177cf9d1 + sha256: dd85469de0d62d65c456abfefd62939a28cb53704120b4f43f14f967b5123d53 category: dev optional: true - name: coverage - version: 7.9.2 + version: 7.10.0 manager: conda platform: win-64 dependencies: @@ -975,10 +973,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/coverage-7.9.2-py312h05f76fc_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.10.0-py312h05f76fc_0.conda hash: - md5: a210adf138c93e937a61548442be65b1 - sha256: e1eca9b5dccb42fe3b6030cc6ec2a54a8ba62416dad77981a4d9e6db04d80db4 + md5: c0d9603e15feb84f6f5e1ecd8b1eed07 + sha256: a0bdd2400fe78dac723385b6ba502ec46443cb290d1b1fe83f88425d5ef95d7d category: dev optional: true - name: cpython @@ -1116,35 +1114,35 @@ package: category: dev optional: true - name: debugpy - version: 1.8.14 + version: 1.8.15 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - libstdcxx: '>=13' - python: '>=3.12,<3.13.0a0' + libgcc: '>=14' + libstdcxx: '>=14' + python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/debugpy-1.8.14-py312h2ec8cdc_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/debugpy-1.8.15-py312h8285ef7_0.conda hash: - md5: 089cf3a3becf0e2f403feaf16e921678 - sha256: 8f0b338687f79ea87324f067bedddd2168f07b8eec234f0fe63b522344c6a919 + md5: 76fb845cd7dbd34670c5b191ba0dc6fd + sha256: 3bb8c99e7aa89e5af3a8ebf8c1f9191b766adae767afe5fef0217a6accf93321 category: dev optional: true - name: debugpy - version: 1.8.14 + version: 1.8.15 manager: conda platform: win-64 dependencies: - python: '>=3.12,<3.13.0a0' + python: '' 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/debugpy-1.8.14-py312h275cf98_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/debugpy-1.8.15-py312ha1a9051_0.conda hash: - md5: 331737db69ae5431acb6ef3e198ec623 - sha256: 02ceea9c12eaaf29c7c40142e4789b77c5c98aa477bdfca1db3ae97440b9e2fe + md5: a83150a83e2148ce523df7822a9ba3e3 + sha256: f01cfa0ca5452bf52d7dc6adefd28d2d911df5345fa4531bd911bca03d251c43 category: dev optional: true - name: decorator @@ -1438,25 +1436,25 @@ package: category: main optional: false - name: fonttools - version: 4.58.5 + version: 4.59.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' brotli: '' - libgcc: '>=13' + libgcc: '>=14' munkres: '' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* unicodedata2: '>=15.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.58.5-py312h178313f_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/fonttools-4.59.0-py312h8a5da7c_0.conda hash: - md5: 867170cb17a9497811c303a2e5e502bf - sha256: 55c772e6eda4e9acb1cf7279d3cd715b96ce118a683c9f1b0920fd3780d9c750 + md5: 008d44a468c24a59d2e67c014fba8f12 + sha256: ead830a4d12f26066f09b6ea54fb5c9e26a548c901063381412636db92cf7f61 category: main optional: false - name: fonttools - version: 4.58.5 + version: 4.59.0 manager: conda platform: win-64 dependencies: @@ -1468,10 +1466,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.58.5-py312h05f76fc_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/fonttools-4.59.0-py312h05f76fc_0.conda hash: - md5: a05150dc1d6b40efd0671f1c31f84187 - sha256: 63080138e8128b0859387b3e8a7c74a21834475c5b6942373ee2251d65b9b906 + md5: 42adff2f96da04998250e18d965bc4f9 + sha256: 8a3f1183933f67bd845db6dbe85f18157b6160947ab1001d1ee5b5fa654d9832 category: main optional: false - name: fqdn @@ -1725,10 +1723,10 @@ package: libstdcxx: '>=14' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.5.1,<4.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/hdf5-1.14.6-nompi_h6e4c0c1_102.conda + url: https://repo.prefix.dev/conda-forge/linux-64/hdf5-1.14.6-nompi_h6e4c0c1_103.conda hash: - md5: ac96ae31a8bd8c30b9c9a9a39b2a0791 - sha256: becd7b9abb364c1f1d15fd650d8a6b18f7366fd556a123eb216d201541a19475 + md5: c74d83614aec66227ae5199d98852aaf + sha256: 4f173af9e2299de7eee1af3d79e851bca28ee71e7426b377e841648b51d48614 category: main optional: false - name: hdf5 @@ -1743,10 +1741,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/hdf5-1.14.6-nompi_he30205f_102.conda + url: https://repo.prefix.dev/conda-forge/win-64/hdf5-1.14.6-nompi_he30205f_103.conda hash: - md5: b5e1c8fc36d0e1e3d29275f5c06a58e2 - sha256: 60659bce0bfa562a8a2f2129b094c56ed797ff11995c50feec8cd9f47aa3d33b + md5: f1f7aaf642cefd2190582550eaca4658 + sha256: 0a90263b97e9860cec6c2540160ff1a1fff2a609b3d96452f8716ae63489dac5 category: main optional: false - name: hpack @@ -1975,32 +1973,6 @@ package: sha256: 46b11943767eece9df0dc9fba787996e4f22cc4c067f5e264969cfdfcb982c39 category: dev optional: true -- name: importlib_resources - version: 6.5.2 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - zipp: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda - hash: - md5: c85c76dc67d75619a92f51dfbce06992 - sha256: acc1d991837c0afb67c75b77fdc72b4bf022aac71fedd8b9ea45918ac9b08a80 - category: dev - optional: true -- name: importlib_resources - version: 6.5.2 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - zipp: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/noarch/importlib_resources-6.5.2-pyhd8ed1ab_0.conda - hash: - md5: c85c76dc67d75619a92f51dfbce06992 - sha256: acc1d991837c0afb67c75b77fdc72b4bf022aac71fedd8b9ea45918ac9b08a80 - category: dev - optional: true - name: iniconfig version: 2.0.0 manager: conda @@ -2401,39 +2373,35 @@ package: category: dev optional: true - name: jsonschema - version: 4.24.0 + version: 4.25.0 manager: conda platform: linux-64 dependencies: attrs: '>=22.2.0' - importlib_resources: '>=1.4.0' - jsonschema-specifications: '>=2023.03.6' - pkgutil-resolve-name: '>=1.3.10' + jsonschema-specifications: '>=2023.3.6' python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.24.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.0-pyhe01879c_0.conda hash: - md5: 59220749abcd119d645e6879983497a1 - sha256: 812134fabb49493a50f7f443dc0ffafd0f63766f403a0bd8e71119763e57456a + md5: c6e3fd94e058dba67d917f38a11b50ab + sha256: 87ba7cf3a65c8e8d1005368b9aee3f49e295115381b7a0b180e56f7b68b5975f category: dev optional: true - name: jsonschema - version: 4.24.0 + version: 4.25.0 manager: conda platform: win-64 dependencies: attrs: '>=22.2.0' - importlib_resources: '>=1.4.0' - jsonschema-specifications: '>=2023.03.6' - pkgutil-resolve-name: '>=1.3.10' + jsonschema-specifications: '>=2023.3.6' python: '>=3.9' referencing: '>=0.28.4' rpds-py: '>=0.7.1' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.24.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-4.25.0-pyhe01879c_0.conda hash: - md5: 59220749abcd119d645e6879983497a1 - sha256: 812134fabb49493a50f7f443dc0ffafd0f63766f403a0bd8e71119763e57456a + md5: c6e3fd94e058dba67d917f38a11b50ab + sha256: 87ba7cf3a65c8e8d1005368b9aee3f49e295115381b7a0b180e56f7b68b5975f category: dev optional: true - name: jsonschema-specifications @@ -2463,7 +2431,7 @@ package: category: dev optional: true - name: jsonschema-with-format-nongpl - version: 4.24.0 + version: 4.25.0 manager: conda platform: linux-64 dependencies: @@ -2471,19 +2439,20 @@ package: idna: '' isoduration: '' jsonpointer: '>1.13' - jsonschema: '>=4.24.0,<4.24.1.0a0' + jsonschema: '>=4.25.0,<4.25.1.0a0' rfc3339-validator: '' rfc3986-validator: '>0.1.0' + rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.24.0-hd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.25.0-he01879c_0.conda hash: - md5: b4eaebf6fac318db166238796d2a9702 - sha256: 970a1efffe29474d6bb3e4d63bc04105c5611d1c7e2cd7e2d43d1ba468f33c20 + md5: f4c7afaf838ab5bb1c4e73eb3095fb26 + sha256: 72604d07afaddf2156e61d128256d686aee4a7bdc06e235d7be352955de7527a category: dev optional: true - name: jsonschema-with-format-nongpl - version: 4.24.0 + version: 4.25.0 manager: conda platform: win-64 dependencies: @@ -2491,15 +2460,16 @@ package: idna: '' isoduration: '' jsonpointer: '>1.13' - jsonschema: '>=4.24.0,<4.24.1.0a0' + jsonschema: '>=4.25.0,<4.25.1.0a0' rfc3339-validator: '' rfc3986-validator: '>0.1.0' + rfc3987-syntax: '>=1.1.0' uri-template: '' webcolors: '>=24.6.0' - url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.24.0-hd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jsonschema-with-format-nongpl-4.25.0-he01879c_0.conda hash: - md5: b4eaebf6fac318db166238796d2a9702 - sha256: 970a1efffe29474d6bb3e4d63bc04105c5611d1c7e2cd7e2d43d1ba468f33c20 + md5: f4c7afaf838ab5bb1c4e73eb3095fb26 + sha256: 72604d07afaddf2156e61d128256d686aee4a7bdc06e235d7be352955de7527a category: dev optional: true - name: jupyter-book @@ -2605,31 +2575,31 @@ package: category: dev optional: true - name: jupyter-lsp - version: 2.2.5 + version: 2.2.6 manager: conda platform: linux-64 dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.5-pyhe01879c_2.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.6-pyhe01879c_0.conda hash: - md5: 7ed6505c703f3c4e1a58864bf84505e2 - sha256: f2ca86b121bcfeaf0241a927824459ba8712e64806b98dd262eb2b1a7c4e82a6 + md5: 7129ed52335cc7164baf4d6508a3f233 + sha256: 6f2d6c5983e013af68e7e1d7082cc46b11f55e28147bd0a72a44488972ed90a3 category: dev optional: true - name: jupyter-lsp - version: 2.2.5 + version: 2.2.6 manager: conda platform: win-64 dependencies: importlib-metadata: '>=4.8.3' jupyter_server: '>=1.1.2' python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.5-pyhe01879c_2.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter-lsp-2.2.6-pyhe01879c_0.conda hash: - md5: 7ed6505c703f3c4e1a58864bf84505e2 - sha256: f2ca86b121bcfeaf0241a927824459ba8712e64806b98dd262eb2b1a7c4e82a6 + md5: 7129ed52335cc7164baf4d6508a3f233 + sha256: 6f2d6c5983e013af68e7e1d7082cc46b11f55e28147bd0a72a44488972ed90a3 category: dev optional: true - name: jupyter_client @@ -2827,7 +2797,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.4.4 + version: 4.4.5 manager: conda platform: linux-64 dependencies: @@ -2847,14 +2817,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.4-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.5-pyhd8ed1ab_0.conda hash: - md5: dbd991d0080c48dae5113a27ab6d0d70 - sha256: a6efcdbe973e12bc8bd61aa26af77f733364975000c8fdaa0d6374338018e0db + md5: ad6bbe770780dcf9cf55d724c5a213fd + sha256: 2013c2dd13bc773167e1ad11ae885b550c0297d030e2107bdc303243ff05d3f2 category: dev optional: true - name: jupyterlab - version: 4.4.4 + version: 4.4.5 manager: conda platform: win-64 dependencies: @@ -2874,10 +2844,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.4-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyterlab-4.4.5-pyhd8ed1ab_0.conda hash: - md5: dbd991d0080c48dae5113a27ab6d0d70 - sha256: a6efcdbe973e12bc8bd61aa26af77f733364975000c8fdaa0d6374338018e0db + md5: ad6bbe770780dcf9cf55d724c5a213fd + sha256: 2013c2dd13bc773167e1ad11ae885b550c0297d030e2107bdc303243ff05d3f2 category: dev optional: true - name: jupyterlab_pygments @@ -3081,6 +3051,30 @@ package: sha256: 18e8b3430d7d232dad132f574268f56b3eb1a19431d6d5de8c53c29e6c18fa81 category: main optional: false +- name: lark + version: 1.2.2 + manager: conda + platform: linux-64 + dependencies: + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + hash: + md5: 3a8063b25e603999188ed4bbf3485404 + sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + category: dev + optional: true +- name: lark + version: 1.2.2 + manager: conda + platform: win-64 + dependencies: + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/lark-1.2.2-pyhd8ed1ab_1.conda + hash: + md5: 3a8063b25e603999188ed4bbf3485404 + sha256: 637a9c32e15a4333f1f9c91e0a506dbab4a6dab7ee83e126951159c916c81c99 + category: dev + optional: true - name: latexcodec version: 2.0.1 manager: conda @@ -3455,30 +3449,30 @@ package: category: main optional: false - name: libexpat - version: 2.7.0 + version: 2.7.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - url: https://repo.prefix.dev/conda-forge/linux-64/libexpat-2.7.0-h5888daf_0.conda + libgcc: '>=14' + url: https://repo.prefix.dev/conda-forge/linux-64/libexpat-2.7.1-hecca717_0.conda hash: - md5: db0bfbe7dd197b68ad5f30333bae6ce0 - sha256: 33ab03438aee65d6aa667cf7d90c91e5e7d734c19a67aa4c7040742c0a13d505 + md5: 4211416ecba1866fab0c6470986c22d6 + sha256: da2080da8f0288b95dd86765c801c6e166c4619b910b11f9a8446fb852438dc2 category: main optional: false - name: libexpat - version: 2.7.0 + version: 2.7.1 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/libexpat-2.7.0-he0c23c2_0.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/libexpat-2.7.1-hac47afa_0.conda hash: - md5: b6f5352fdb525662f4169a0431d2dd7a - sha256: 1a227c094a4e06bd54e8c2f3ec40c17ff99dcf3037d812294f842210aa66dbeb + md5: 3608ffde260281fa641e70d6e34b1b96 + sha256: 8432ca842bdf8073ccecf016ccc9140c41c7114dc4ec77ca754551c01f780845 category: main optional: false - name: libffi @@ -3907,7 +3901,7 @@ package: category: main optional: false - name: libsqlite - version: 3.50.2 + version: 3.50.3 manager: conda platform: linux-64 dependencies: @@ -3915,24 +3909,24 @@ package: icu: '>=75.1,<76.0a0' libgcc: '>=14' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libsqlite-3.50.2-hee844dc_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libsqlite-3.50.3-hee844dc_1.conda hash: - md5: be96b9fdd7b579159df77ece9bb80e48 - sha256: 62040da9b55f409cd43697eb7391381ffede90b2ea53634a94876c6c867dcd73 + md5: 18d2ac95b507ada9ca159a6bd73255f7 + sha256: 8c4faf560815a6d6b5edadc019f76d22a45171eaa707a1f1d1898ceda74b2e3f category: main optional: false - name: libsqlite - version: 3.50.2 + version: 3.50.3 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libsqlite-3.50.2-hf5d6505_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/libsqlite-3.50.3-hf5d6505_1.conda hash: - md5: 58f810279ac6caec2d996a56236c3254 - sha256: f12cdfe29c248d6a1c7d11b6fe1a3e0d0563206deb422ddb1b84b909818168d4 + md5: 8b63428047c82a0b853aa348fe56071c + sha256: 9bf199ca8b388d8585c53432949524767532f84a5a881f1cef4808d0e7a3f95a category: main optional: false - name: libssh2 @@ -4523,12 +4517,12 @@ package: platform: linux-64 dependencies: _openmp_mutex: '*' - llvm-openmp: '>=19.1.2' + llvm-openmp: '>=20.1.8' tbb: 2021.* - url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha957f24_16.conda + url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2024.2.2-ha770c72_16.conda hash: - md5: 1459379c79dda834673426504d52b319 - sha256: 77906b0acead8f86b489da46f53916e624897338770dbf70b04b8f673c9273c1 + md5: 06fc17a281d2f71995f3bb58a7b7f4e5 + sha256: 9be33c297dd53e4eafef7c6ec597f1b4dee99296a768816d9bf793e2432a027f category: main optional: false - name: mkl @@ -5437,30 +5431,6 @@ package: sha256: ebfa591d39092b111b9ebb3210eb42251be6da89e26c823ee03e5e838655a43e category: main optional: false -- name: pkgutil-resolve-name - version: 1.3.10 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_2.conda - hash: - md5: 5a5870a74432aa332f7d32180633ad05 - sha256: adb2dde5b4f7da70ae81309cce6188ed3286ff280355cf1931b45d91164d2ad8 - category: dev - optional: true -- name: pkgutil-resolve-name - version: 1.3.10 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_2.conda - hash: - md5: 5a5870a74432aa332f7d32180633ad05 - sha256: adb2dde5b4f7da70ae81309cce6188ed3286ff280355cf1931b45d91164d2ad8 - category: dev - optional: true - name: platformdirs version: 4.3.8 manager: conda @@ -6295,10 +6265,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.12-7_cp312.conda + url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.12-8_cp312.conda hash: - md5: 0dfcdc155cf23812a0c9deada86fb723 - sha256: a1bbced35e0df66cc713105344263570e835625c28d1bdee8f748f482b2d7793 + md5: c3efd25ac4d74b1584d2f7a57195ddf1 + sha256: 80677180dd3c22deb7426ca89d6203f1c7f1f256f2d5a94dc210f6e758229809 category: main optional: false - name: python_abi @@ -6306,10 +6276,10 @@ package: manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.12-7_cp312.conda + url: https://repo.prefix.dev/conda-forge/noarch/python_abi-3.12-8_cp312.conda hash: - md5: 0dfcdc155cf23812a0c9deada86fb723 - sha256: a1bbced35e0df66cc713105344263570e835625c28d1bdee8f748f482b2d7793 + md5: c3efd25ac4d74b1584d2f7a57195ddf1 + sha256: 80677180dd3c22deb7426ca89d6203f1c7f1f256f2d5a94dc210f6e758229809 category: main optional: false - name: pytz @@ -6593,6 +6563,32 @@ package: sha256: 2a5b495a1de0f60f24d8a74578ebc23b24aa53279b1ad583755f223097c41c37 category: dev optional: true +- name: rfc3987-syntax + version: 1.1.0 + manager: conda + platform: linux-64 + dependencies: + lark: '>=1.2.2' + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda + hash: + md5: 7234f99325263a5af6d4cd195035e8f2 + sha256: 70001ac24ee62058557783d9c5a7bbcfd97bd4911ef5440e3f7a576f9e43bc92 + category: dev + optional: true +- name: rfc3987-syntax + version: 1.1.0 + manager: conda + platform: win-64 + dependencies: + lark: '>=1.2.2' + python: '>=3.9' + url: https://repo.prefix.dev/conda-forge/noarch/rfc3987-syntax-1.1.0-pyhe01879c_1.conda + hash: + md5: 7234f99325263a5af6d4cd195035e8f2 + sha256: 70001ac24ee62058557783d9c5a7bbcfd97bd4911ef5440e3f7a576f9e43bc92 + category: dev + optional: true - name: rpds-py version: 0.26.0 manager: conda @@ -6653,28 +6649,27 @@ package: category: main optional: false - name: scikit-learn - version: 1.5.2 + version: 1.4.2 manager: conda platform: linux-64 dependencies: - __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' joblib: '>=1.2.0' - libgcc: '>=13' - libstdcxx: '>=13' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' numpy: '>=1.19,<3' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* scipy: '' - threadpoolctl: '>=3.1.0' - url: https://repo.prefix.dev/conda-forge/linux-64/scikit-learn-1.5.2-py312h7a48858_1.conda + threadpoolctl: '>=2.0.0' + url: https://repo.prefix.dev/conda-forge/linux-64/scikit-learn-1.4.2-py312h1fcc3ea_1.conda hash: - md5: 6b5f4c68483bd0c22bca9094dafc606b - sha256: 3118b687c7cfb4484cc5c65591b611d834e3ea2424cb75e1e0b0980d0de72afc + md5: e6610a08bdbc02525c597e555da55a3a + sha256: c2676b9aa8380a4d7e10a815cfc684a66fe312234841574397283d09eba45578 category: main optional: false - name: scikit-learn - version: 1.5.2 + version: 1.4.2 manager: conda platform: win-64 dependencies: @@ -6683,14 +6678,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* scipy: '' - threadpoolctl: '>=3.1.0' + threadpoolctl: '>=2.0.0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/scikit-learn-1.5.2-py312h816cc57_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/scikit-learn-1.4.2-py312h816cc57_1.conda hash: - md5: e2b5c3288bd3f8e89a46b98f8d9e8768 - sha256: 7c64942d20339e965c22e27ceca72e0f0ff7d32962d9621903c3812714835f4f + md5: 9d5234a79af607372f44932132ca2c29 + sha256: b89ae982911b956158e474777ce7d568da946db0aad91d7aa9686641b7080b9f category: main optional: false - name: scipy @@ -6792,10 +6787,10 @@ package: platform: linux-64 dependencies: python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: - md5: a451d576819089b0d672f18768be0f65 - sha256: 41db0180680cc67c3fa76544ffd48d6a5679d96f4b71d7498a759e94edc9a2db + md5: 3339e3b65d58accf4ca4fb8748ab16b3 + sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d category: main optional: false - name: six @@ -6804,10 +6799,10 @@ package: platform: win-64 dependencies: python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/six-1.17.0-pyhe01879c_1.conda hash: - md5: a451d576819089b0d672f18768be0f65 - sha256: 41db0180680cc67c3fa76544ffd48d6a5679d96f4b71d7498a759e94edc9a2db + md5: 3339e3b65d58accf4ca4fb8748ab16b3 + sha256: 458227f759d5e3fcec5d9b7acce54e10c9e1f4f4b7ec978f3bfd54ce4ee9853d category: main optional: false - name: sniffio @@ -8123,11 +8118,11 @@ package: manager: conda platform: win-64 dependencies: - vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/vc-14.3-h41ae7f8_26.conda + vc14_runtime: '>=14.42.34433' + url: https://repo.prefix.dev/conda-forge/win-64/vc-14.3-h2b53caa_30.conda hash: - md5: 18b6bf6f878501547786f7bf8052a34d - sha256: b388d88e04aa0257df4c1d28f8d85d985ad07c1e5645aa62335673c98704c4c6 + md5: 76b6febe6dea7991df4c86f826f396c5 + sha256: 8e16a8c3270d88735234a8097d45efea02b49751800c83b6fd5f2167a3828f52 category: main optional: false - name: vc14_runtime @@ -8136,10 +8131,10 @@ package: platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - url: https://repo.prefix.dev/conda-forge/win-64/vc14_runtime-14.44.35208-h818238b_26.conda + url: https://repo.prefix.dev/conda-forge/win-64/vc14_runtime-14.44.35208-h818238b_30.conda hash: - md5: 14d65350d3f5c8ff163dc4f76d6e2830 - sha256: 7bad6e25a7c836d99011aee59dcf600b7f849a6fa5caa05a406255527e80a703 + md5: fa6802b52e903c42f882ecd67731e10a + sha256: 2958ef637509d69ea496b091dc579f1bf38687575b65744e73d157cfe56c9eca category: main optional: false - name: vs2015_runtime @@ -8148,10 +8143,10 @@ package: platform: win-64 dependencies: vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/vs2015_runtime-14.44.35208-h38c0c73_26.conda + url: https://repo.prefix.dev/conda-forge/win-64/vs2015_runtime-14.44.35208-h38c0c73_30.conda hash: - md5: 312f3a0a6b3c5908e79ce24002411e32 - sha256: d18d77c8edfbad37fa0e0bb0f543ad80feb85e8fe5ced0f686b8be463742ec0b + md5: 1a877c8c882c297656e4bea2c0d55adc + sha256: 99785cef95465045eb10b4e72ae9c2c4e25626a676b859c51af01ab3b92e7ef0 category: main optional: false - name: wcwidth @@ -8676,12 +8671,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@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a hash: - sha256: a7a5280079f39ca35c502bddedb56ccc3f77f29d + sha256: 53f7981670df120297945a4c3c1f7fce74f5ed3a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a category: main optional: false - name: geoh5py @@ -8693,16 +8688,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@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a hash: - sha256: a7a5280079f39ca35c502bddedb56ccc3f77f29d + sha256: 53f7981670df120297945a4c3c1f7fce74f5ed3a source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a7a5280079f39ca35c502bddedb56ccc3f77f29d + url: git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a category: main optional: false - name: mira-simpeg - version: 0.23.0.1a5.dev37+g86e22e6fa + version: 0.23.0.1a5.dev45+g01a7068fd manager: pip platform: linux-64 dependencies: @@ -8714,16 +8709,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df hash: - sha256: 86e22e6fa457859d494d94552e6431728e513d7a + sha256: 01a7068fdab7fba8695ad371c9fd9164760a09df source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df category: main optional: false - name: mira-simpeg - version: 0.23.0.1a5.dev37+g86e22e6fa + version: 0.23.0.1a5.dev45+g01a7068fd manager: pip platform: win-64 dependencies: @@ -8735,12 +8730,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df hash: - sha256: 86e22e6fa457859d494d94552e6431728e513d7a + sha256: 01a7068fdab7fba8695ad371c9fd9164760a09df source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@86e22e6fa457859d494d94552e6431728e513d7a + url: git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df category: main optional: false - name: octree-creation-app diff --git a/simpeg_drivers/components/data.py b/simpeg_drivers/components/data.py index e28d2a7b..588d125d 100644 --- a/simpeg_drivers/components/data.py +++ b/simpeg_drivers/components/data.py @@ -11,20 +11,14 @@ from __future__ import annotations -from typing import TYPE_CHECKING, Any - - -if TYPE_CHECKING: - from geoh5py.workspace import Workspace - - from simpeg_drivers.components.meshes import InversionMesh - from simpeg_drivers.options import InversionBaseOptions - from copy import deepcopy from re import findall +from typing import TYPE_CHECKING, Any import numpy as np from discretize import TensorMesh, TreeMesh +from geoh5py.objects import PotentialElectrode +from scipy.sparse import csgraph, csr_matrix from scipy.spatial import cKDTree from simpeg import maps from simpeg.electromagnetics.static.utils.static_utils import geometric_factor @@ -41,6 +35,13 @@ from .locations import InversionLocations +if TYPE_CHECKING: + from geoh5py.workspace import Workspace + + from simpeg_drivers.components.meshes import InversionMesh + from simpeg_drivers.options import InversionBaseOptions + + class InversionData(InversionLocations): """ Retrieve and store data from the workspace and apply normalizations. @@ -139,6 +140,28 @@ def uncertainties(self): return self._uncertainties + @property + def parts(self): + """ + Return parts indices from the entity. + """ + if isinstance(self.entity, PotentialElectrode): + edge_array = csr_matrix( + ( + np.ones(self.entity.n_cells * 2), + ( + np.kron(self.entity.cells[:, 0], [1, 1]), + self.entity.cells.flatten(), + ), + ), + shape=(self.entity.n_vertices, self.entity.n_vertices), + ) + + connections = csgraph.connected_components(edge_array)[1] + return connections[self.entity.cells[:, 0]] + + return getattr(self.entity, "parts", None) + def drape_locations(self, locations: np.ndarray) -> np.ndarray: """ Return pseudo locations along line in distance, depth. diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 4ded8bfa..fc4dc8f5 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -13,6 +13,9 @@ from __future__ import annotations +import cProfile +import pstats + import multiprocessing import contextlib from copy import deepcopy @@ -593,18 +596,16 @@ def get_regularization(self): def get_tiles(self): if "2d" in self.params.inversion_type: - tiles = [np.arange(self.inversion_data.mask.sum())] - elif "1d" in self.params.inversion_type: - tiles = np.arange(self.inversion_data.mask.sum()).reshape((-1, 1)) - else: - locations = self.inversion_data.locations - tiles = tile_locations( - locations, - self.params.compute.tile_spatial, - method="kmeans", - ) + return [np.arange(self.inversion_data.mask.sum())] + + if "1d" in self.params.inversion_type: + return np.arange(self.inversion_data.mask.sum()).reshape((-1, 1)) - return tiles + return tile_locations( + self.inversion_data.locations, + self.params.compute.tile_spatial, + labels=self.inversion_data.parts, + ) def configure_dask(self): """Sets Dask config settings.""" @@ -745,20 +746,27 @@ def get_path(self, filepath: str | Path) -> str: if ((n_workers is not None and n_workers > 1) or n_threads is not None) else None ) + profiler = cProfile.Profile() + profiler.enable() with ( cluster.get_client() if cluster is not None else contextlib.nullcontext() as client ): - if not isinstance(client, Client) and save_report: - save_report = False - # Full run with ( performance_report(filename=file.parent / "dask_profile.html") - if save_report + if (save_report and isinstance(client, Client)) else contextlib.nullcontext() ): InversionDriver.start(input_file) sys.stdout.close() + + profiler.disable() + + if save_report: + with open(file.parent / "runtime_profile.txt", encoding="utf-8", mode="w") as s: + ps = pstats.Stats(profiler, stream=s) + ps.sort_stats("cumulative") + ps.print_stats() diff --git a/simpeg_drivers/electromagnetics/time_domain/driver.py b/simpeg_drivers/electromagnetics/time_domain/driver.py index 66b4e779..c77c5e6c 100644 --- a/simpeg_drivers/electromagnetics/time_domain/driver.py +++ b/simpeg_drivers/electromagnetics/time_domain/driver.py @@ -55,7 +55,6 @@ def tile_large_group_transmitters( tx_tiles = tile_locations( np.vstack(locations), n_groups, - method="kmeans", ) receivers_tx_ids = survey.tx_id_property.values tiles = [] @@ -74,7 +73,6 @@ def tile_large_group_transmitters( new_tiles = tile_locations( survey.vertices[tile], 2, - method="kmeans", ) tiles += [tile[new_tiles[0]], tile[new_tiles[1]]] diff --git a/simpeg_drivers/utils/tile_estimate.py b/simpeg_drivers/utils/tile_estimate.py index 9fecfdb5..59becb23 100644 --- a/simpeg_drivers/utils/tile_estimate.py +++ b/simpeg_drivers/utils/tile_estimate.py @@ -35,6 +35,7 @@ from tqdm import tqdm from simpeg_drivers import assets_path +from simpeg_drivers.components.data import InversionData from simpeg_drivers.components.factories.misfit_factory import MisfitFactory from simpeg_drivers.driver import InversionDriver from simpeg_drivers.utils.utils import ( @@ -75,7 +76,7 @@ class TileEstimator(Driver): def __init__(self, params: TileParameters): self._driver: InversionDriver | None = None self._mesh: TreeMesh | None = None - self._locations: np.ndarray | None = None + self._data: np.ndarray | None = None self._active_cells: np.ndarray | None = None super().__init__(params) @@ -92,14 +93,10 @@ def get_results(self, max_tiles: int = 13) -> dict: counts.append(max_tiles) for count in tqdm(counts, desc="Estimating tiles:"): - if count > len(self.locations): + if count > len(self.data.locations): break - tiles = tile_locations( - self.locations, - count, - method="kmeans", - ) + tiles = tile_locations(self.data.locations, count, labels=self.data.parts) # Get the median tile ind = int(np.argsort([len(tile) for tile in tiles])[int(count / 2)]) self.driver.params.compute.tile_spatial = int(count) @@ -145,7 +142,7 @@ def run(self) -> SimPEGGroup: fig_name = "tile_estimator.png" logger.info("Saving figure '%s' to disk and to geoh5.", fig_name) path = self.params.geoh5.h5file.parent / fig_name - figure = self.plot(results, self.locations, optimal) + figure = self.plot(results, self.data, optimal) figure.savefig(path) out_group.add_file(path) @@ -175,14 +172,14 @@ def mesh(self) -> TreeMesh: return self._mesh @property - def locations(self) -> np.ndarray: + def data(self) -> InversionData: """ - All receiver locations. + All receiver data locations. """ - if self._locations is None: - self._locations = self.driver.inversion_data.locations + if self._data is None: + self._data = self.driver.inversion_data - return self._locations + return self._data @property def active_cells(self) -> np.ndarray: @@ -191,7 +188,7 @@ def active_cells(self) -> np.ndarray: """ if self._active_cells is None: self._active_cells = active_from_xyz( - self.driver.inversion_mesh.entity, self.locations, method="nearest" + self.driver.inversion_mesh.entity, self.data.locations, method="nearest" ) return self._active_cells @@ -231,7 +228,7 @@ def generate_optimal_group(self, optimal: int): return out_group @staticmethod - def plot(results: dict, locations: np.ndarray, optimal: int): + def plot(results: dict, data: InversionData, optimal: int): """ Plot the results of the tile estimator. @@ -254,12 +251,12 @@ def plot(results: dict, locations: np.ndarray, optimal: int): ax2 = plt.subplot(2, 1, 2) tiles = tile_locations( - locations, + data.locations, optimal, - method="kmeans", + labels=data.parts, ) for tile in tiles: - ax2.scatter(locations[tile, 0], locations[tile, 1], s=1) + ax2.scatter(data.locations[tile, 0], data.locations[tile, 1], s=1) ax2.set_xlabel("Easting (m)") ax2.set_ylabel("Northing (m)") diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index 3a4f5989..425a2ae4 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -31,13 +31,14 @@ from geoh5py.ui_json import InputFile from octree_creation_app.utils import octree_2_treemesh from scipy.interpolate import LinearNDInterpolator, NearestNDInterpolator, interp1d +from scipy.optimize import linear_sum_assignment from scipy.spatial import ConvexHull, Delaunay, cKDTree +from scipy.spatial.distance import cdist from simpeg.electromagnetics.frequency_domain.sources import ( LineCurrent as FEMLineCurrent, ) from simpeg.electromagnetics.time_domain.sources import LineCurrent as TEMLineCurrent from simpeg.survey import BaseSurvey -from simpeg.utils import mkvc from simpeg_drivers import DRIVER_MAP from simpeg_drivers.utils.surveys import ( @@ -506,165 +507,69 @@ def xyz_2_drape_model( def tile_locations( - locations, - n_tiles, - minimize=True, - method="kmeans", - bounding_box=False, - count=False, - unique_id=False, -): - """ - Function to tile a survey points into smaller square subsets of points - - :param numpy.ndarray locations: n x 2 array of locations [x,y] - :param integer n_tiles: number of tiles (for 'cluster'), or number of - refinement steps ('other') - :param Bool minimize: shrink tile sizes to minimum - :param string method: set to 'kmeans' to use better quality clustering, or anything - else to use more memory efficient method for large problems - :param bounding_box: bool [False] - Return the SW and NE corners of each tile. - :param count: bool [False] - Return the number of locations in each tile. - :param unique_id: bool [False] - Return the unique identifiers of all tiles. - - RETURNS: - :param list: Return a list of arrays with the for the SW and NE - limits of each tiles - :param integer binCount: Number of points in each tile - :param list labels: Cluster index of each point n=0:(nTargetTiles-1) - :param numpy.array tile_numbers: Vector of tile numbers for each count in binCount - - NOTE: All X Y and xy products are legacy now values, and are only used - for plotting functions. They are not used in any calculations and could - be dropped from the return calls in future versions. - - + locations: np.ndarray, + n_tiles: int, + labels: np.ndarray | None = None, +) -> list[np.ndarray]: """ + Function to tile a survey points into smaller square subsets of points using + a k-means clustering approach. - if method == "kmeans": - # Best for smaller problems - - # Cluster - # TODO turn off filter once sklearn has dealt with the issue causing the warning - with warnings.catch_warnings(): - warnings.simplefilter("ignore", category=UserWarning) - from sklearn.cluster import KMeans - - cluster = KMeans(n_clusters=n_tiles, random_state=0, n_init="auto") - cluster.fit_predict(locations[:, :2]) + If labels are provided and the number of unique labels is less than or equal to + the number of tiles, the function will return an even split of the unique labels. - labels = cluster.labels_ - - # nData in each tile - binCount = np.zeros(int(n_tiles)) - - # x and y limits on each tile - X1 = np.zeros_like(binCount) - X2 = np.zeros_like(binCount) - Y1 = np.zeros_like(binCount) - Y2 = np.zeros_like(binCount) - - for ii in range(int(n_tiles)): - mask = cluster.labels_ == ii - X1[ii] = locations[mask, 0].min() - X2[ii] = locations[mask, 0].max() - Y1[ii] = locations[mask, 1].min() - Y2[ii] = locations[mask, 1].max() - binCount[ii] = mask.sum() - - xy1 = np.c_[X1[binCount > 0], Y1[binCount > 0]] - xy2 = np.c_[X2[binCount > 0], Y2[binCount > 0]] - - # Get the tile numbers that exist, for compatibility with the next method - tile_id = np.unique(cluster.labels_) + :param locations: Array of locations. + :param n_tiles: Number of tiles (for 'cluster') + :param labels: Array of values to append to the locations + :return: List of arrays containing the indices of the points in each tile. + """ + grid_locs = locations[:, :2].copy() + + if labels is not None: + if len(labels) != grid_locs.shape[0]: + raise ValueError( + "Labels array must have the same length as the locations array." + ) + + if len(np.unique(labels)) >= n_tiles: + label_groups = np.array_split(np.unique(labels), n_tiles) + return [np.where(np.isin(labels, group))[0] for group in label_groups] + + # Normalize location coordinates to [0, 1] range + grid_locs -= grid_locs.min(axis=0) + max_val = grid_locs.max(axis=0) + grid_locs[:, max_val > 0] /= max_val[max_val > 0] + grid_locs = np.c_[grid_locs, labels] + + # Cluster + # TODO turn off filter once sklearn has dealt with the issue causing the warning + with warnings.catch_warnings(): + warnings.simplefilter("ignore", category=UserWarning) + from sklearn.cluster import KMeans + + kmeans = KMeans(n_clusters=n_tiles, random_state=0, n_init="auto") + cluster_size = int(np.ceil(grid_locs.shape[0] / n_tiles)) + kmeans.fit(grid_locs) + + if labels is not None: + cluster_id = kmeans.labels_ else: - # Works on larger problems - # Initialize variables - # Test each refinement level for maximum space coverage - nTx = 1 - nTy = 1 - for _ in range(int(n_tiles + 1)): - nTx += 1 - nTy += 1 - - testx = np.percentile(locations[:, 0], np.arange(0, 100, 100 / nTx)) - testy = np.percentile(locations[:, 1], np.arange(0, 100, 100 / nTy)) - - dx = testx[:-1] - testx[1:] - dy = testy[:-1] - testy[1:] - - if np.mean(dx) > np.mean(dy): - nTx -= 1 - else: - nTy -= 1 - - print(nTx, nTy) - tilex = np.percentile(locations[:, 0], np.arange(0, 100, 100 / nTx)) - tiley = np.percentile(locations[:, 1], np.arange(0, 100, 100 / nTy)) - - X1, Y1 = np.meshgrid(tilex, tiley) - X2, Y2 = np.meshgrid( - np.r_[tilex[1:], locations[:, 0].max()], - np.r_[tiley[1:], locations[:, 1].max()], + # Redistribute cluster centers to even out the number of points + centers = kmeans.cluster_centers_ + centers = ( + centers.reshape(-1, 1, grid_locs.shape[1]) + .repeat(cluster_size, 1) + .reshape(-1, grid_locs.shape[1]) ) - - # Plot data and tiles - X1, Y1, X2, Y2 = mkvc(X1), mkvc(Y1), mkvc(X2), mkvc(Y2) - binCount = np.zeros_like(X1) - labels = np.zeros_like(locations[:, 0]) - for ii in range(X1.shape[0]): - mask = ( - (locations[:, 0] >= X1[ii]) - * (locations[:, 0] <= X2[ii]) - * (locations[:, 1] >= Y1[ii]) - * (locations[:, 1] <= Y2[ii]) - ) == 1 - - # Re-adjust the window size for tight fit - if minimize: - if mask.sum(): - X1[ii], X2[ii] = ( - locations[:, 0][mask].min(), - locations[:, 0][mask].max(), - ) - Y1[ii], Y2[ii] = ( - locations[:, 1][mask].min(), - locations[:, 1][mask].max(), - ) - - labels[mask] = ii - binCount[ii] = mask.sum() - - xy1 = np.c_[X1[binCount > 0], Y1[binCount > 0]] - xy2 = np.c_[X2[binCount > 0], Y2[binCount > 0]] - - # Get the tile numbers that exist - # Since some tiles may have 0 data locations, and are removed by - # [binCount > 0], the tile numbers are no longer contiguous 0:nTiles - tile_id = np.unique(labels) + distance_matrix = cdist(grid_locs, centers) + cluster_id = linear_sum_assignment(distance_matrix)[1] // cluster_size tiles = [] - for tid in tile_id.tolist(): - tiles += [np.where(labels == tid)[0]] - - out = [tiles] - - if bounding_box: - out.append([xy1, xy2]) - - if count: - out.append(binCount[binCount > 0]) - - if unique_id: - out.append(tile_id) + for tid in set(cluster_id): + tiles += [np.where(cluster_id == tid)[0]] - if len(out) == 1: - return out[0] - return tuple(out) + return tiles def get_containing_cells( diff --git a/tests/data_test.py b/tests/data_test.py index e829caa6..851cdad8 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -13,7 +13,6 @@ from pathlib import Path import numpy as np -import pytest import simpeg from discretize.utils import mesh_builder_xyz from geoh5py.objects import Points @@ -22,6 +21,9 @@ from octree_creation_app.utils import treemesh_2_octree from simpeg_drivers.components import InversionData +from simpeg_drivers.electricals.direct_current.three_dimensions.options import ( + DC3DForwardOptions, +) from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields.magnetic_vector.driver import ( MVIInversionDriver, @@ -29,7 +31,7 @@ from simpeg_drivers.potential_fields.magnetic_vector.options import ( MVIInversionOptions, ) -from tests.testing_utils import Geoh5Tester, setup_inversion_workspace +from tests.testing_utils import setup_inversion_workspace def get_mvi_params(tmp_path: Path, **kwargs) -> MVIInversionOptions: @@ -236,3 +238,28 @@ def test_get_survey(tmp_path: Path): data = InversionData(geoh5, params) survey = data.create_survey() assert isinstance(survey[0], simpeg.potential_fields.magnetics.Survey) + + +def test_data_parts(tmp_path: Path): + n_lines = 8 + geoh5, entity, model, survey, topography = setup_inversion_workspace( + tmp_path, + background=0.01, + anomaly=10, + n_electrodes=10, + n_lines=n_lines, + drape_height=0.0, + inversion_type="direct current 3d", + flatten=False, + ) + with geoh5.open(): + params = DC3DForwardOptions.build( + geoh5=geoh5, + data_object=survey, + topography_object=topography, + mesh=model.parent, + starting_model=model, + ) + data = InversionData(geoh5, params) + + assert len(set(data.parts)) == n_lines diff --git a/tests/locations_test.py b/tests/locations_test.py index 6754485d..948e8825 100644 --- a/tests/locations_test.py +++ b/tests/locations_test.py @@ -14,11 +14,14 @@ import numpy as np import pytest -from geoh5py.objects import Grid2D, Points +from geoh5py import Workspace +from geoh5py.objects import Curve, Grid2D, Points +from scipy.spatial import ConvexHull from simpeg_drivers.components.locations import InversionLocations from simpeg_drivers.options import ActiveCellsOptions from simpeg_drivers.potential_fields import MVIInversionOptions +from simpeg_drivers.utils.utils import tile_locations from tests.testing_utils import Geoh5Tester, setup_inversion_workspace @@ -105,3 +108,81 @@ def test_filter(tmp_path: Path): test_data = {"key": test_data} filtered_data = locations.filter(test_data) assert np.all(filtered_data["key"] == [2, 3, 4]) + + +def test_tile_locations(tmp_path: Path): + with Workspace.create(tmp_path / f"{__name__}.geoh5") as ws: + grid_x, grid_y = np.meshgrid(np.arange(100), np.arange(100)) + choices = np.c_[grid_x.ravel(), grid_y.ravel(), np.zeros(grid_x.size)] + inds = np.random.randint(0, 10000, 1000) + pts = Points.create( + ws, + name="test-points", + vertices=choices[inds], + ) + tiles = tile_locations(pts.vertices[:, :2], n_tiles=8) + + values = np.zeros(pts.n_vertices) + pop = [] + for ind, tile in enumerate(tiles): + values[tile] = ind + pop.append(len(tile)) + + pts.add_data( + { + "values": { + "values": values, + } + } + ) + assert np.std(pop) / np.mean(pop) < 0.02, ( + "Population of tiles are not almost equal." + ) + + +def test_tile_locations_labels(tmp_path: Path): + stn = np.arange(0, 10000, 1000) + x_locs = np.kron(stn, np.ones(100)) + np.random.randn(1000) * 10 + y_locs = np.kron(np.ones(len(stn)), np.arange(100) * 1000) + locations = np.c_[x_locs, y_locs, np.random.randn(len(x_locs)) * 100] + line_id = np.kron(np.arange(len(stn)), np.ones(100)) + + with Workspace.create(tmp_path / f"{__name__}.geoh5") as ws: + curve = Curve.create( + ws, + vertices=locations, + parts=line_id, + ) + + # Test that the tiles are assigned to the correct parts + tiles = tile_locations(curve.vertices, n_tiles=10, labels=curve.parts) + values = np.zeros(curve.n_vertices) + single_part = [] + for ind, tile in enumerate(tiles): + values[tile] = ind + single_part.append(len(set(curve.parts[tile])) == 1) + + assert all(single_part) + + curve.add_data( + { + "values": { + "values": values, + } + } + ) + + # Repeat with fewer tiles than parts (at most grab two lines) + tiles = tile_locations(curve.vertices, n_tiles=5, labels=curve.parts) + values = np.zeros(curve.n_vertices) + two_parts = [] + for ind, tile in enumerate(tiles): + values[tile] = ind + two_parts.append(len(set(curve.parts[tile])) == 2) + + assert all(two_parts) + assert ( + len({len(tile) for tile in tiles}) == 1 + ) # All tiles have the same number of vertices + with pytest.raises(ValueError, match="Labels array must have the same length"): + tile_locations(curve.vertices, n_tiles=8, labels=curve.parts[:-1])