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 1e19a082..1c962764 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -6,13 +6,13 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=8_kmp_llvm + - _openmp_mutex=4.5=7_kmp_llvm - _python_abi3_support=1.0=hd8ed1ab_3 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=26.1.0=py312h5cc1888_1 + - argon2-cffi-bindings=26.1.0=py312h5cc1888_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py312h7900ff3_0 @@ -50,7 +50,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312h0a2e395_4 - - coverage=7.16.0=py312h8b7ec3f_0 + - coverage=7.15.4=py312h589e9ff_1 - cpython=3.12.14=py312hd8ed1ab_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py312h4c3975b_2 @@ -82,18 +82,18 @@ dependencies: - icu=75.1=he02047a_0 - idna=3.19=pyhcf101f3_0 - imagesize=2.0.1=pyhd8ed1ab_0 - - importlib-metadata=9.0.1=pyhcf101f3_0 + - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyha191276_0 - - ipython=9.17.0=pyh53cf698_0 + - ipython=9.16.1=pyh53cf698_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=9.0.1=pyhd8ed1ab_0 + - isort=8.0.1=pyhd8ed1ab_0 - jedi=0.20.0=pyhcf101f3_0 - jinja2=3.1.6=pyhcf101f3_1 - - joblib=1.6.0=pyhcf101f3_0 + - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - jsonschema=4.26.0=pyhcf101f3_1 @@ -102,10 +102,10 @@ dependencies: - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 - - jupyter_client=8.10.0=pyhcf101f3_0 + - jupyter_client=8.9.1=pyhcf101f3_0 - jupyter_core=5.9.1=pyhc90fa1f_0 - jupyter_events=0.12.1=pyhcf101f3_0 - - jupyter_server=2.21.0=pyhcf101f3_0 + - jupyter_server=2.20.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - jupyterlab=4.6.3=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 @@ -113,10 +113,10 @@ dependencies: - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - jupytext=1.19.5=pyh0398c0e_0 - keyutils=1.6.3=h7cc23a3_1 - - kiwisolver=1.5.1=py312h9be0db6_0 + - kiwisolver=1.5.0=py312h0a2e395_0 - krb5=1.22.2=hbc21106_2 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.19.1=h9073bf1_2 + - lcms2=2.19.1=h0c24ade_1 - ld_impl_linux-64=2.46.1=default_hbd61a6d_102 - lerc=4.2.0=hdb68285_0 - libaec=1.1.5=h088129d_0 @@ -157,7 +157,7 @@ dependencies: - libuuid=2.42.2=h5347b49_0 - libuv=1.52.1=h280c20c_1 - libwebp-base=1.6.0=hd42ef1d_1 - - libxcb=1.17.0=hb83e432_2 + - libxcb=1.17.0=hb83e432_1 - libxcrypt=4.4.38=h280c20c_0 - libxml2=2.15.1=h26afc86_0 - libxml2-16=2.15.1=ha9997c6_0 @@ -174,11 +174,10 @@ dependencies: - metis=5.1.0=hd0bcaf9_1007 - mistune=3.3.4=pyhcf101f3_0 - mkl=2025.3.1=h0e700b2_12 - - msgpack-python=1.2.2=py312h9be0db6_1 + - msgpack-python=1.2.1=py312h0a2e395_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 - munkres=1.1.4=pyhd8ed1ab_1 - - mypy_extensions=1.1.0=pyha770c72_0 - nbclient=0.11.0=pyhd8ed1ab_0 - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 @@ -198,14 +197,14 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py312hf79963d_1 - - pandoc=3.11=ha770c72_0 + - pandoc=3.10.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.7=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 - pexpect=4.9.0=pyhd8ed1ab_1 - pillow=12.3.0=py312h50c33e8_0 - pip=26.2.1=pyh8b19718_0 - - platformdirs=4.11.5=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 @@ -218,7 +217,7 @@ dependencies: - pydantic-core=2.41.5=py312h868fb18_1 - pydiso=0.2.0=np2py312h1cfd70e_1 - pygments=2.21.0=pyhcf101f3_0 - - pylint=4.0.8=pyhcf101f3_0 + - pylint=4.0.7=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -284,13 +283,13 @@ dependencies: - unicodedata2=17.0.1=py312h4c3975b_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.7.0=pyhd8ed1ab_0 - - wcwidth=0.8.3=pyhcf101f3_0 + - wcwidth=0.8.2=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 - wheel=0.48.0=pyhd8ed1ab_0 - widgetsnbextension=3.6.10=pyhd8ed1ab_0 - - wrapt=2.4.0=py312h1b36aeb_0 + - wrapt=2.3.0=py312h4c3975b_0 - xorg-libxau=1.0.12=hb03c661_2 - xorg-libxdmcp=1.1.5=hb03c661_2 - xyzservices=2026.3.0=pyhd8ed1ab_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 d7b079f7..40262156 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=26.1.0=py312he06e257_1 + - argon2-cffi-bindings=26.1.0=py312he06e257_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py312h2e8e312_0 @@ -49,7 +49,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312h78d62e6_4 - - coverage=7.16.0=py312h6fa65f5_0 + - coverage=7.15.4=py312h6fa65f5_1 - cpython=3.12.14=py312hd8ed1ab_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py312he06e257_2 @@ -81,18 +81,18 @@ dependencies: - icu=78.3=h5112557_2 - idna=3.19=pyhcf101f3_0 - imagesize=2.0.1=pyhd8ed1ab_0 - - importlib-metadata=9.0.1=pyhcf101f3_0 + - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyh6dadd2b_0 - - ipython=9.17.0=pyhe2676ad_0 + - ipython=9.16.1=pyhe2676ad_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=9.0.1=pyhd8ed1ab_0 + - isort=8.0.1=pyhd8ed1ab_0 - jedi=0.20.0=pyhcf101f3_0 - jinja2=3.1.6=pyhcf101f3_1 - - joblib=1.6.0=pyhcf101f3_0 + - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - jsonschema=4.26.0=pyhcf101f3_1 @@ -101,20 +101,20 @@ dependencies: - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 - - jupyter_client=8.10.0=pyhcf101f3_0 + - jupyter_client=8.9.1=pyhcf101f3_0 - jupyter_core=5.9.1=pyh6dadd2b_0 - jupyter_events=0.12.1=pyhcf101f3_0 - - jupyter_server=2.21.0=pyhcf101f3_0 + - jupyter_server=2.20.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - jupyterlab=4.6.3=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - jupytext=1.19.5=pyh0398c0e_0 - - kiwisolver=1.5.1=py312h78d62e6_0 + - kiwisolver=1.5.0=py312h78d62e6_0 - krb5=1.22.2=h719d79b_2 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.19.1=hf2c6c5f_2 + - lcms2=2.19.1=hf2c6c5f_1 - lerc=4.2.0=hd936e49_0 - libaec=1.1.5=haf901d7_0 - libblas=3.11.0=6_hf2e6a31_mkl @@ -145,7 +145,7 @@ dependencies: - libtiff=4.7.2=h8f73337_1 - libwebp-base=1.6.0=h4d5522a_1 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h11686cb_11 - - libxcb=1.17.0=h874e120_2 + - libxcb=1.17.0=h874e120_1 - libxml2=2.15.3=h8ef44ab_1 - libxml2-16=2.15.3=h3cfd58e_1 - libzlib=1.3.2=hfd05255_3 @@ -160,10 +160,9 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - mistune=3.3.4=pyhcf101f3_0 - mkl=2025.3.1=hac47afa_13 - - msgpack-python=1.2.2=py312h78d62e6_1 + - msgpack-python=1.2.1=py312h78d62e6_1 - mumps-seq=5.8.2=h607cc0b_2 - munkres=1.1.4=pyhd8ed1ab_1 - - mypy_extensions=1.1.0=pyha770c72_0 - nbclient=0.11.0=pyhd8ed1ab_0 - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 @@ -182,13 +181,13 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py312hc128f0a_2 - - pandoc=3.11=h57928b3_0 + - pandoc=3.10.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.7=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py312h31f0997_0 - pip=26.2.1=pyh8b19718_0 - - platformdirs=4.11.5=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 @@ -200,7 +199,7 @@ dependencies: - pydantic-core=2.41.5=py312hdabe01f_1 - pydiso=0.2.0=np2py312hd8dafd6_1 - pygments=2.21.0=pyhcf101f3_0 - - pylint=4.0.8=pyhcf101f3_0 + - pylint=4.0.7=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -270,7 +269,7 @@ dependencies: - vc=14.5=ha367084_41 - vc14_runtime=14.51.36247=habf1de7_41 - vcomp14=14.51.36247=habf1de7_41 - - wcwidth=0.8.3=pyhcf101f3_0 + - wcwidth=0.8.2=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -278,7 +277,7 @@ dependencies: - widgetsnbextension=3.6.10=pyhd8ed1ab_0 - win_inet_pton=1.1.0=pyh7428d3b_8 - winpty=0.4.3=4 - - wrapt=2.4.0=py312he5662c2_0 + - wrapt=2.3.0=py312he06e257_0 - xorg-libxau=1.0.12=hba3369d_2 - xorg-libxdmcp=1.1.5=hba3369d_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index dc331b99..a9043fbd 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -6,13 +6,13 @@ channels: - conda-forge - nodefaults dependencies: - - _openmp_mutex=4.5=8_kmp_llvm + - _openmp_mutex=4.5=7_kmp_llvm - _python_abi3_support=1.0=hd8ed1ab_3 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=26.1.0=py313h995f894_1 + - argon2-cffi-bindings=26.1.0=py313h995f894_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py313h78bf25f_0 @@ -50,7 +50,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py313hc8edb43_4 - - coverage=7.16.0=py313h2af15c8_0 + - coverage=7.15.4=py313h55b89ea_1 - cpython=3.13.15=py313hd8ed1ab_101 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py313h07c4f96_2 @@ -82,18 +82,18 @@ dependencies: - icu=75.1=he02047a_0 - idna=3.19=pyhcf101f3_0 - imagesize=2.0.1=pyhd8ed1ab_0 - - importlib-metadata=9.0.1=pyhcf101f3_0 + - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyha191276_0 - - ipython=9.17.0=pyh53cf698_0 + - ipython=9.16.1=pyh53cf698_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=9.0.1=pyhd8ed1ab_0 + - isort=8.0.1=pyhd8ed1ab_0 - jedi=0.20.0=pyhcf101f3_0 - jinja2=3.1.6=pyhcf101f3_1 - - joblib=1.6.0=pyhcf101f3_0 + - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - jsonschema=4.26.0=pyhcf101f3_1 @@ -102,10 +102,10 @@ dependencies: - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 - - jupyter_client=8.10.0=pyhcf101f3_0 + - jupyter_client=8.9.1=pyhcf101f3_0 - jupyter_core=5.9.1=pyhc90fa1f_0 - jupyter_events=0.12.1=pyhcf101f3_0 - - jupyter_server=2.21.0=pyhcf101f3_0 + - jupyter_server=2.20.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - jupyterlab=4.6.3=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 @@ -113,10 +113,10 @@ dependencies: - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - jupytext=1.19.5=pyh0398c0e_0 - keyutils=1.6.3=h7cc23a3_1 - - kiwisolver=1.5.1=py313h2551ef2_0 + - kiwisolver=1.5.0=py313hc8edb43_0 - krb5=1.22.2=hbc21106_2 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.19.1=h9073bf1_2 + - lcms2=2.19.1=h0c24ade_1 - ld_impl_linux-64=2.46.1=default_hbd61a6d_102 - lerc=4.2.0=hdb68285_0 - libaec=1.1.5=h088129d_0 @@ -157,7 +157,7 @@ dependencies: - libuuid=2.42.2=h5347b49_0 - libuv=1.52.1=h280c20c_1 - libwebp-base=1.6.0=hd42ef1d_1 - - libxcb=1.17.0=hb83e432_2 + - libxcb=1.17.0=hb83e432_1 - libxml2=2.15.1=h26afc86_0 - libxml2-16=2.15.1=ha9997c6_0 - libzlib=1.3.2=h25fd6f3_3 @@ -173,11 +173,10 @@ dependencies: - metis=5.1.0=hd0bcaf9_1007 - mistune=3.3.4=pyhcf101f3_0 - mkl=2025.3.1=h0e700b2_12 - - msgpack-python=1.2.2=py313h2551ef2_1 + - msgpack-python=1.2.1=py313hc8edb43_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 - munkres=1.1.4=pyhd8ed1ab_1 - - mypy_extensions=1.1.0=pyha770c72_0 - nbclient=0.11.0=pyhd8ed1ab_0 - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 @@ -197,14 +196,14 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py313h08cd8bf_2 - - pandoc=3.11=ha770c72_0 + - pandoc=3.10.2=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.7=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 - pexpect=4.9.0=pyhd8ed1ab_1 - pillow=12.3.0=py313h80991f8_0 - pip=26.2.1=pyh145f28c_0 - - platformdirs=4.11.5=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 @@ -217,7 +216,7 @@ dependencies: - pydantic-core=2.41.5=py313h843e2db_1 - pydiso=0.2.0=np2py313h5fc5e36_1 - pygments=2.21.0=pyhcf101f3_0 - - pylint=4.0.8=pyhcf101f3_0 + - pylint=4.0.7=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 @@ -248,6 +247,7 @@ dependencies: - scikit-learn=1.8.0=np2py313h16d504d_1 - scipy=1.17.1=py313h4b8bb8b_1 - send2trash=2.1.0=pyha191276_1 + - setuptools=84.0.0=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.1.1=pyhd8ed1ab_0 @@ -281,12 +281,12 @@ dependencies: - tzdata=2026c=h151e31d_0 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.7.0=pyhd8ed1ab_0 - - wcwidth=0.8.3=pyhcf101f3_0 + - wcwidth=0.8.2=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 - widgetsnbextension=3.6.10=pyhd8ed1ab_0 - - wrapt=2.4.0=py313hd42f317_0 + - wrapt=2.3.0=py313h07c4f96_0 - xorg-libxau=1.0.12=hb03c661_2 - xorg-libxdmcp=1.1.5=hb03c661_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index f92e4c24..23486e7a 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -12,7 +12,7 @@ dependencies: - annotated-types=0.8.0=pyhd8ed1ab_0 - anyio=4.14.2=pyhcf101f3_0 - argon2-cffi=25.1.0=pyhd8ed1ab_0 - - argon2-cffi-bindings=26.1.0=py313h5ea7bf4_1 + - argon2-cffi-bindings=26.1.0=py313h5ea7bf4_0 - arrow=1.4.0=pyhcf101f3_0 - asciitree=0.3.3=py_2 - astroid=4.0.4=py313hfa70ccb_0 @@ -49,7 +49,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py313h1a38498_4 - - coverage=7.16.0=py313h868807b_0 + - coverage=7.15.4=py313h868807b_1 - cpython=3.13.15=py313hd8ed1ab_101 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py313h5ea7bf4_2 @@ -81,18 +81,18 @@ dependencies: - icu=78.3=h5112557_2 - idna=3.19=pyhcf101f3_0 - imagesize=2.0.1=pyhd8ed1ab_0 - - importlib-metadata=9.0.1=pyhcf101f3_0 + - importlib-metadata=9.0.0=pyhcf101f3_0 - iniconfig=2.3.0=pyhd8ed1ab_0 - ipykernel=7.3.0=pyh6dadd2b_0 - - ipython=9.17.0=pyhe2676ad_0 + - ipython=9.16.1=pyhe2676ad_0 - ipython_genutils=0.2.0=pyhd8ed1ab_2 - ipython_pygments_lexers=1.1.1=pyhd8ed1ab_0 - ipywidgets=7.8.5=pyhd8ed1ab_0 - isoduration=20.11.0=pyhd8ed1ab_1 - - isort=9.0.1=pyhd8ed1ab_0 + - isort=8.0.1=pyhd8ed1ab_0 - jedi=0.20.0=pyhcf101f3_0 - jinja2=3.1.6=pyhcf101f3_1 - - joblib=1.6.0=pyhcf101f3_0 + - joblib=1.5.3=pyhd8ed1ab_0 - json5=0.15.0=pyhd8ed1ab_0 - jsonpointer=3.1.1=pyhcf101f3_0 - jsonschema=4.26.0=pyhcf101f3_1 @@ -101,20 +101,20 @@ dependencies: - jupyter-book=2.1.6=pyhcf101f3_0 - jupyter-builder=1.2.2=pyhcf101f3_0 - jupyter-lsp=2.3.1=pyhcf101f3_0 - - jupyter_client=8.10.0=pyhcf101f3_0 + - jupyter_client=8.9.1=pyhcf101f3_0 - jupyter_core=5.9.1=pyh6dadd2b_0 - jupyter_events=0.12.1=pyhcf101f3_0 - - jupyter_server=2.21.0=pyhcf101f3_0 + - jupyter_server=2.20.0=pyhcf101f3_0 - jupyter_server_terminals=0.5.4=pyhcf101f3_0 - jupyterlab=4.6.3=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - jupytext=1.19.5=pyh0398c0e_0 - - kiwisolver=1.5.1=py313h1a38498_0 + - kiwisolver=1.5.0=py313h1a38498_0 - krb5=1.22.2=h719d79b_2 - lark=1.3.1=pyhd8ed1ab_0 - - lcms2=2.19.1=hf2c6c5f_2 + - lcms2=2.19.1=hf2c6c5f_1 - lerc=4.2.0=hd936e49_0 - libaec=1.1.5=haf901d7_0 - libblas=3.11.0=6_hf2e6a31_mkl @@ -146,7 +146,7 @@ dependencies: - libtiff=4.7.2=h8f73337_1 - libwebp-base=1.6.0=h4d5522a_1 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h11686cb_11 - - libxcb=1.17.0=h874e120_2 + - libxcb=1.17.0=h874e120_1 - libxml2=2.15.3=h8ef44ab_1 - libxml2-16=2.15.3=h3cfd58e_1 - libzlib=1.3.2=hfd05255_3 @@ -161,10 +161,9 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - mistune=3.3.4=pyhcf101f3_0 - mkl=2025.3.1=hac47afa_13 - - msgpack-python=1.2.2=py313h1a38498_1 + - msgpack-python=1.2.1=py313h1a38498_1 - mumps-seq=5.8.2=h607cc0b_2 - munkres=1.1.4=pyhd8ed1ab_1 - - mypy_extensions=1.1.0=pyha770c72_0 - nbclient=0.11.0=pyhd8ed1ab_0 - nbconvert=7.16.6=hc388f54_1 - nbconvert-core=7.16.6=pyhcf101f3_1 @@ -183,13 +182,13 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.3=pyhc364b38_0 - pandas=2.3.3=py313hc90dcd4_2 - - pandoc=3.11=h57928b3_0 + - pandoc=3.10.2=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.7=pyhcf101f3_0 - partd=1.4.2=pyhd8ed1ab_0 - pillow=12.3.0=py313h38f99e1_0 - pip=26.2.1=pyh145f28c_0 - - platformdirs=4.11.5=pyhcf101f3_0 + - platformdirs=4.11.4=pyhcf101f3_0 - pluggy=1.6.0=pyhf9edf01_1 - prometheus_client=0.26.0=pyhd8ed1ab_0 - prompt-toolkit=3.0.53=pyha770c72_0 @@ -201,7 +200,7 @@ dependencies: - pydantic-core=2.41.5=py313hfbe8231_1 - pydiso=0.2.0=np2py313h16cfc55_1 - pygments=2.21.0=pyhcf101f3_0 - - pylint=4.0.8=pyhcf101f3_0 + - pylint=4.0.7=pyhcf101f3_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 @@ -232,6 +231,7 @@ dependencies: - scikit-learn=1.8.0=np2py313h4ce4a18_1 - scipy=1.17.1=py313he51e9a2_1 - send2trash=2.1.0=pyh6dadd2b_1 + - setuptools=84.0.0=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.1.1=pyhd8ed1ab_0 @@ -269,14 +269,14 @@ dependencies: - vc=14.5=ha367084_41 - vc14_runtime=14.51.36247=habf1de7_41 - vcomp14=14.51.36247=habf1de7_41 - - wcwidth=0.8.3=pyhcf101f3_0 + - wcwidth=0.8.2=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 - widgetsnbextension=3.6.10=pyhd8ed1ab_0 - win_inet_pton=1.1.0=pyh7428d3b_8 - winpty=0.4.3=4 - - wrapt=2.4.0=py313h5fd188c_0 + - wrapt=2.3.0=py313h5ea7bf4_0 - xorg-libxau=1.0.12=hba3369d_2 - xorg-libxdmcp=1.1.5=hba3369d_2 - xyzservices=2026.3.0=pyhd8ed1ab_0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index fdb8d86b..8ca65004 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -35,10 +35,10 @@ package: platform: linux-64 dependencies: llvm-openmp: '>=9.0.1' - url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-8_kmp_llvm.conda + url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-7_kmp_llvm.conda hash: - md5: b4d1b93dd1dab4eea23395fd5e5b357d - sha256: b8de006376660eb12c7fc40803c97e1480bf4bc1253f0d59694b12f81b52fe14 + md5: 887b70e1d607fba7957aa02f9ee0d939 + sha256: c0cddb66070dd6355311f7667ce2acccf70d1013edaa6e97f22859502fefdb22 category: main optional: false - name: _openmp_mutex @@ -198,10 +198,10 @@ package: libgcc: '>=15' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-26.1.0-py312h5cc1888_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-26.1.0-py312h5cc1888_0.conda hash: - md5: ae00593f27c3455cf443ec5ff5ad3b9e - sha256: f6edbce9e164e92929258596ae797fbf28394b6e7f51a50f8d4f4a8d802be7ff + md5: 206a3c2e73a15a4956df784f165f4ed8 + sha256: 9b97ce25a43e1aa998286971da972a13f5803cccb12df45013edff46ed3dc2b3 category: dev optional: true - name: argon2-cffi-bindings @@ -215,10 +215,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/argon2-cffi-bindings-26.1.0-py312he06e257_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-26.1.0-py312he06e257_0.conda hash: - md5: 8c3b07127d2866a6ef3ebb3dfcd3611c - sha256: 9d14a3054e7e59325946700c0326a312ac7fcf26df40d3d3d9dfe13e35a6d21b + md5: 38764c8f1723841acac6c0bc2d766afc + sha256: ae4d0f74b48266849555b69b195ee96e5db7067359ffde700d5f35dc41d5f8f1 category: dev optional: true - name: arrow @@ -1264,34 +1264,36 @@ package: category: main optional: false - name: coverage - version: 7.16.0 + version: 7.15.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' + libgcc: '>=14' python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.16.0-py312h8b7ec3f_0.conda + tomli: '' + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.15.4-py312h589e9ff_1.conda hash: - md5: 385233507bd4b374469cc6563734c22b - sha256: aaea290a54335ad42ca4a416936c51acbd6f5be7cc2ed6c49fb629f3e8946a31 + md5: da913109cf05fb71022186f534874a5d + sha256: 12157c219d58e85b0454705ba23caed5b6a1e1129715fab1a38d1c974a82a5ff category: dev optional: true - name: coverage - version: 7.16.0 + version: 7.15.4 manager: conda platform: win-64 dependencies: python: '' python_abi: 3.12.* + tomli: '' 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.16.0-py312h6fa65f5_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.15.4-py312h6fa65f5_1.conda hash: - md5: 5aa9c52279cbf4421764cfee64b09a0c - sha256: 7a1432991ac5d7e9ab6ab9c50df392c77a26e3bad8d5146b660f98883587833c + md5: a8780743191eaee55c337c36a385ef5e + sha256: 72155f060e2647f5795f7aff2a624e88137280428cea0046219480a2d57838bf category: dev optional: true - name: cpython @@ -2223,29 +2225,29 @@ package: category: dev optional: true - name: importlib-metadata - version: 9.0.1 + version: 9.0.0 manager: conda platform: linux-64 dependencies: python: '' zipp: '>=3.20' - url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.0-pyhcf101f3_0.conda hash: - md5: 77ec68e0aa61c3fff9ecbf840f93d64e - sha256: 95a074a7d3f58b3494c068d4789c364dcb591c56b70ca6b12f149a540f9aeea4 + md5: ffc17e785d64e12fc311af9184221839 + sha256: 43e2a5497cad1598ff88a3e69f69bc88b7b8f141fa63c60eab5db296317318b8 category: main optional: false - name: importlib-metadata - version: 9.0.1 + version: 9.0.0 manager: conda platform: win-64 dependencies: python: '' zipp: '>=3.20' - url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.0-pyhcf101f3_0.conda hash: - md5: 77ec68e0aa61c3fff9ecbf840f93d64e - sha256: 95a074a7d3f58b3494c068d4789c364dcb591c56b70ca6b12f149a540f9aeea4 + md5: ffc17e785d64e12fc311af9184221839 + sha256: 43e2a5497cad1598ff88a3e69f69bc88b7b8f141fa63c60eab5db296317318b8 category: main optional: false - name: iniconfig @@ -2323,7 +2325,7 @@ package: category: dev optional: true - name: ipython - version: 9.17.0 + version: 9.16.1 manager: conda platform: linux-64 dependencies: @@ -2339,14 +2341,14 @@ package: stack_data: '>=0.6.0' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.17.0-pyh53cf698_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.16.1-pyh53cf698_0.conda hash: - md5: 6ebd34681d8bc56e474fac76999de45a - sha256: 8165024016181bf7d32a027180239cf15c4447ec02080b31dcae731809c0b3e2 + md5: 23564ed27c9c7714905be96ac5786500 + sha256: 8470648b5e790d1881c09c02068d53e1bf0126f020db02a6dc2e73400cf1eeeb category: dev optional: true - name: ipython - version: 9.17.0 + version: 9.16.1 manager: conda platform: win-64 dependencies: @@ -2362,10 +2364,10 @@ package: stack_data: '>=0.6.0' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.17.0-pyhe2676ad_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.16.1-pyhe2676ad_0.conda hash: - md5: c2cf78253e434f1283cfd276ec9abd2f - sha256: de5052db34cd414d5993dc7330c7f9ce422fadd6e5f3c1422d48040e0319c633 + md5: d7c95d926befcfa22bee69bb1980e2ce + sha256: 2a0cd24e5c0e1eb8b7baf06346906673f6b8abea151ce302d7d978a3c416aeec category: dev optional: true - name: ipython_genutils @@ -2481,31 +2483,29 @@ package: category: dev optional: true - name: isort - version: 9.0.1 + version: 8.0.1 manager: conda platform: linux-64 dependencies: importlib-metadata: '>=4.6.0' - mypy_extensions: '>=1.1.0' python: '>=3.10,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-9.0.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/isort-8.0.1-pyhd8ed1ab_0.conda hash: - md5: e8665745d29e065eb0cb912f535fcdb0 - sha256: 4975afff44b4c3b63804010d6998aae26996bbfe987132e24c8953f5d5d6c550 + md5: 98cdd8615792e90da1023bc546f806d9 + sha256: cc5c2b513143ea9675ba5b3570182f7568fd1029b299ee3bc58424dcce8c5539 category: dev optional: true - name: isort - version: 9.0.1 + version: 8.0.1 manager: conda platform: win-64 dependencies: importlib-metadata: '>=4.6.0' - mypy_extensions: '>=1.1.0' python: '>=3.10,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-9.0.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/isort-8.0.1-pyhd8ed1ab_0.conda hash: - md5: e8665745d29e065eb0cb912f535fcdb0 - sha256: 4975afff44b4c3b63804010d6998aae26996bbfe987132e24c8953f5d5d6c550 + md5: 98cdd8615792e90da1023bc546f806d9 + sha256: cc5c2b513143ea9675ba5b3570182f7568fd1029b299ee3bc58424dcce8c5539 category: dev optional: true - name: jedi @@ -2561,29 +2561,29 @@ package: category: main optional: false - name: joblib - version: 1.6.0 + version: 1.5.3 manager: conda platform: linux-64 dependencies: - cloudpickle: '>=3.0' - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.6.0-pyhcf101f3_0.conda + python: '>=3.10' + setuptools: '' + url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.5.3-pyhd8ed1ab_0.conda hash: - md5: 4ebc70ef1af2e21cdc8edb1bfa1ec28d - sha256: 96b76ace583404ce4fbc234baa6cdb3de485887913104d4ac51994f9b6656696 + md5: 615de2a4d97af50c350e5cf160149e77 + sha256: 301539229d7be6420c084490b8145583291123f0ce6b92f56be5948a2c83a379 category: main optional: false - name: joblib - version: 1.6.0 + version: 1.5.3 manager: conda platform: win-64 dependencies: - cloudpickle: '>=3.0' - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.6.0-pyhcf101f3_0.conda + python: '>=3.10' + setuptools: '' + url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.5.3-pyhd8ed1ab_0.conda hash: - md5: 4ebc70ef1af2e21cdc8edb1bfa1ec28d - sha256: 96b76ace583404ce4fbc234baa6cdb3de485887913104d4ac51994f9b6656696 + md5: 615de2a4d97af50c350e5cf160149e77 + sha256: 301539229d7be6420c084490b8145583291123f0ce6b92f56be5948a2c83a379 category: main optional: false - name: json5 @@ -2827,7 +2827,7 @@ package: category: dev optional: true - name: jupyter_client - version: 8.10.0 + version: 8.9.1 manager: conda platform: linux-64 dependencies: @@ -2838,14 +2838,14 @@ package: tornado: '>=6.4.1' traitlets: '>=5.3' typing_extensions: '>=4.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.10.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.9.1-pyhcf101f3_0.conda hash: - md5: 85130259a26c023f53108dc9ab1cfb44 - sha256: 94f11bbdbac51a68415fb0a8bb441fb3475c0138e778664a3fb48f5698688ebf + md5: 49440e66df843bee2273937e8032ec43 + sha256: 48b18974cc93b2c0d2681563237034e521f51d1878f0bbc6a5a67ca31b1608a6 category: dev optional: true - name: jupyter_client - version: 8.10.0 + version: 8.9.1 manager: conda platform: win-64 dependencies: @@ -2856,10 +2856,10 @@ package: tornado: '>=6.4.1' traitlets: '>=5.3' typing_extensions: '>=4.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.10.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.9.1-pyhcf101f3_0.conda hash: - md5: 85130259a26c023f53108dc9ab1cfb44 - sha256: 94f11bbdbac51a68415fb0a8bb441fb3475c0138e778664a3fb48f5698688ebf + md5: 49440e66df843bee2273937e8032ec43 + sha256: 48b18974cc93b2c0d2681563237034e521f51d1878f0bbc6a5a67ca31b1608a6 category: dev optional: true - name: jupyter_core @@ -2934,7 +2934,7 @@ package: category: dev optional: true - name: jupyter_server - version: 2.21.0 + version: 2.20.0 manager: conda platform: linux-64 dependencies: @@ -2957,14 +2957,14 @@ package: tornado: '>=6.2.0' traitlets: '>=5.6.0' websocket-client: '>=1.7' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.21.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.20.0-pyhcf101f3_0.conda hash: - md5: b6163da641d1f178977dd36aebced0d5 - sha256: fa26acd3777095662c34cbbcfacad163a3a17c90a935f9357fe511c975c8241f + md5: b2ddb0e13b5600070c4019c4db8a78e6 + sha256: 3e8759fdc404f149e7e722e0af472044a0ef9e70d0a3a7690ddcfe1232a0e868 category: dev optional: true - name: jupyter_server - version: 2.21.0 + version: 2.20.0 manager: conda platform: win-64 dependencies: @@ -2987,10 +2987,10 @@ package: tornado: '>=6.2.0' traitlets: '>=5.6.0' websocket-client: '>=1.7' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.21.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.20.0-pyhcf101f3_0.conda hash: - md5: b6163da641d1f178977dd36aebced0d5 - sha256: fa26acd3777095662c34cbbcfacad163a3a17c90a935f9357fe511c975c8241f + md5: b2ddb0e13b5600070c4019c4db8a78e6 + sha256: 3e8759fdc404f149e7e722e0af472044a0ef9e70d0a3a7690ddcfe1232a0e868 category: dev optional: true - name: jupyter_server_terminals @@ -3211,23 +3211,23 @@ package: category: main optional: false - name: kiwisolver - version: 1.5.1 + version: 1.5.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - libstdcxx: '>=15' + libgcc: '>=14' + libstdcxx: '>=14' python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.5.1-py312h9be0db6_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.5.0-py312h0a2e395_0.conda hash: - md5: 6ec45525bac89c279b6e5f4c47eec6bf - sha256: 09f3578b5cf4484d236e02f5b9fe455e45448419b86ef16aee46d45e9fd3b715 + md5: cd74a9525dc74bbbf93cf8aa2fa9eb5b + sha256: eec7654c2d68f06590862c6e845cc70987b6d6559222b6f0e619dea4268f5dd5 category: main optional: false - name: kiwisolver - version: 1.5.1 + version: 1.5.0 manager: conda platform: win-64 dependencies: @@ -3236,10 +3236,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.5.1-py312h78d62e6_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.5.0-py312h78d62e6_0.conda hash: - md5: 689627fd6df0326475e2c12d615f3455 - sha256: 98b6d8250bf7cb5d58561c401cdb7a72b1b2059d480cb8a923c8a37f97f11638 + md5: 4ff6f76c2c16c85806ee7533768f5e64 + sha256: 5942bd7ae7b1d68906a00681e733b41ac8577ca7ac8da7523eb514d698b6e1f2 category: main optional: false - name: krb5 @@ -3304,13 +3304,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - libjpeg-turbo: '>=3.2.0,<4.0a0' - libtiff: '>=4.7.2,<4.8.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.19.1-h9073bf1_2.conda + libgcc: '>=14' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libtiff: '>=4.7.1,<4.8.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.19.1-h0c24ade_1.conda hash: - md5: b68c7304d2edb0f1a5bdfb875094d603 - sha256: 8cdec1ff3f276cd2069dca0dae4f45f3dc5c224e2d72daef78227832938467a6 + md5: 8b3ce45e929cd8e8e5f4d18586b56d8b + sha256: 112b5b9462572d970f4abd2912f76a25ee7db158b1e7260163d91dd8a630db84 category: main optional: false - name: lcms2 @@ -3318,15 +3318,15 @@ package: manager: conda platform: win-64 dependencies: - libjpeg-turbo: '>=3.2.0,<4.0a0' - libtiff: '>=4.7.2,<4.8.0a0' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libtiff: '>=4.7.1,<4.8.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.19.1-hf2c6c5f_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.19.1-hf2c6c5f_1.conda hash: - md5: 2bd9052d2e496ea54f47d9db8ae4f881 - sha256: df1c1a4dd44c54f238dc0a230d31eab9e73ada472dc4fa357552333b35641804 + md5: 1df4012c8a2478699d07bc26af66d41e + sha256: 5ed63a32639a130564a870becb679fd52dfb816666a61ed3c023917389010480 category: main optional: false - name: ld_impl_linux-64 @@ -4318,10 +4318,10 @@ package: pthread-stubs: '' xorg-libxau: '>=1.0.12,<2.0a0' xorg-libxdmcp: '>=1.1.5,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxcb-1.17.0-hb83e432_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxcb-1.17.0-hb83e432_1.conda hash: - md5: 61f0ffba9161cbb3a77722869b21e4bb - sha256: 7b49e6fd2a584b7f072943e6adf4149677af5121246975278804782d37752837 + md5: 64e856c420205b009da26471d3ac161d + sha256: ce25a1efa85a78a3ce3b16721d9c36153814adbf2fb004a15f72ec69894b4cb1 category: main optional: false - name: libxcb @@ -4335,10 +4335,10 @@ package: ucrt: '>=10.0.20348.0' xorg-libxau: '>=1.0.12,<2.0a0' xorg-libxdmcp: '>=1.1.5,<2.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libxcb-1.17.0-h874e120_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxcb-1.17.0-h874e120_1.conda hash: - md5: 3658b0201b32da9607ea5e3c1c463c1f - sha256: f5932cbcadb67bef9374ee864fed72411af29e88690435c6c7fc5633c89dabee + md5: 98046512ad7f2c44e48ff77bce854052 + sha256: a99f266ade1140c3106cca0f71ae2b5627ff77e1e791db3837129d28d596800e category: main optional: false - name: libxcrypt @@ -4794,23 +4794,23 @@ package: category: main optional: false - name: msgpack-python - version: 1.2.2 + version: 1.2.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - libstdcxx: '>=15' + libgcc: '>=14' + libstdcxx: '>=14' python: '' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/msgpack-python-1.2.2-py312h9be0db6_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/msgpack-python-1.2.1-py312h0a2e395_1.conda hash: - md5: 371a80205eebd8c13fcb0218c96a2d9c - sha256: 79266ea6c816d490d6b9f19beb14a683520d8f70df7113a5c18293c20c53fdbf + md5: a142257c1b69e37cfefc66dc228a4d93 + sha256: c9764c77dd7f9c581c1d8a24c3024edf777cacfb5a4180de5badc6638dc8590f category: main optional: false - name: msgpack-python - version: 1.2.2 + version: 1.2.1 manager: conda platform: win-64 dependencies: @@ -4819,10 +4819,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/msgpack-python-1.2.2-py312h78d62e6_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/msgpack-python-1.2.1-py312h78d62e6_1.conda hash: - md5: 636c485abfb477b7f74de914784d9af0 - sha256: 375f70edb14b2f563062863bb77051435082cfc2217e78246d5f78729441d363 + md5: 0ac1766b278a8547f22cd0820b8a7e96 + sha256: f43cc72ae92759d661187cb4bc4fb4721b97128d150f336b9b0ebf24b8600a27 category: main optional: false - name: mumps-include @@ -4898,30 +4898,6 @@ package: sha256: d09c47c2cf456de5c09fa66d2c3c5035aa1fa228a1983a433c47b876aa16ce90 category: main optional: false -- name: mypy_extensions - version: 1.1.0 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/mypy_extensions-1.1.0-pyha770c72_0.conda - hash: - md5: e9c622e0d00fa24a6292279af3ab6d06 - sha256: 6ed158e4e5dd8f6a10ad9e525631e35cee8557718f83de7a4e3966b1f772c4b1 - category: dev - optional: true -- name: mypy_extensions - version: 1.1.0 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/mypy_extensions-1.1.0-pyha770c72_0.conda - hash: - md5: e9c622e0d00fa24a6292279af3ab6d06 - sha256: 6ed158e4e5dd8f6a10ad9e525631e35cee8557718f83de7a4e3966b1f772c4b1 - category: dev - optional: true - name: nbclient version: 0.11.0 manager: conda @@ -5507,25 +5483,25 @@ package: category: main optional: false - name: pandoc - version: '3.11' + version: 3.10.2 manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.11-ha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.10.2-ha770c72_0.conda hash: - md5: 2c71f77db75fa5e9dd64abb706c66788 - sha256: cb14839e33fbbb2163f259476091dd99f9e83fbb1690b789cd1e6e6a05d17db7 + md5: 80b992667dc547968afb633772891f71 + sha256: 509d03571e126232f9eb38f1988ac9116f8c51df4a151071c4c6f3761d3fcb44 category: dev optional: true - name: pandoc - version: '3.11' + version: 3.10.2 manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.11-h57928b3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.10.2-h57928b3_0.conda hash: - md5: 4587e6544ff96ef0ee50b042f9d3719d - sha256: 03b03e1c841f25e738bafe60e20cae65a98951683f14e72aae6a8ac359e0501c + md5: 7643f65d7e954c60f69b353ae536730a + sha256: afcb977d62149f0e0c7f946e50f29a0b7ac24ef04c6d11b29478ea11dd63d825 category: dev optional: true - name: pandocfilters @@ -5697,27 +5673,27 @@ package: category: main optional: false - name: platformdirs - version: 4.11.5 + version: 4.11.4 manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 152ec36401f710145a7db03475594410 - sha256: 4496a7e0b584a388b3580ab594a4f384696ab7d702282588fd33a7ee38af983c + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: platformdirs - version: 4.11.5 + version: 4.11.4 manager: conda platform: win-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 152ec36401f710145a7db03475594410 - sha256: 4496a7e0b584a388b3580ab594a4f384696ab7d702282588fd33a7ee38af983c + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: pluggy @@ -6041,43 +6017,43 @@ package: category: dev optional: true - name: pylint - version: 4.0.8 + version: 4.0.7 manager: conda platform: linux-64 dependencies: astroid: '>=4.0.2,<=4.1.dev0' colorama: '>=0.4.5' dill: '>=0.3.7' - isort: '>=5,!=5.13,<10' + isort: '>=5,!=5.13,<9' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2' python: '' tomli: '>=1.1' tomlkit: '>=0.10.1' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.8-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.7-pyhcf101f3_0.conda hash: - md5: 80d0380362bf3d3c0b4ed5c103d253b5 - sha256: 9e037b4f94e5f7f8accd214d6611970b9949ae4eb8f8da9f0b2044dda1848d20 + md5: 7aaab460cb599b2370a782b4eff8127d + sha256: 9c9ba2e6f17193ede911f8c095232a8c5a1edb3cc6cc49d07cfdde0b86e7c97f category: dev optional: true - name: pylint - version: 4.0.8 + version: 4.0.7 manager: conda platform: win-64 dependencies: astroid: '>=4.0.2,<=4.1.dev0' colorama: '>=0.4.5' dill: '>=0.3.7' - isort: '>=5,!=5.13,<10' + isort: '>=5,!=5.13,<9' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2' python: '' tomli: '>=1.1' tomlkit: '>=0.10.1' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.8-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.7-pyhcf101f3_0.conda hash: - md5: 80d0380362bf3d3c0b4ed5c103d253b5 - sha256: 9e037b4f94e5f7f8accd214d6611970b9949ae4eb8f8da9f0b2044dda1848d20 + md5: 7aaab460cb599b2370a782b4eff8127d + sha256: 9c9ba2e6f17193ede911f8c095232a8c5a1edb3cc6cc49d07cfdde0b86e7c97f category: dev optional: true - name: pymatsolver @@ -7970,27 +7946,27 @@ package: category: main optional: false - name: wcwidth - version: 0.8.3 + version: 0.8.2 manager: conda platform: linux-64 dependencies: - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.3-pyhcf101f3_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.2-pyhd8ed1ab_0.conda hash: - md5: f62991f907a9830ab003b12d07dd3478 - sha256: 3b0599d59d70bbe792702d1b5404ac501c9c25bd7b2fd9ccbb5da8ad6587a703 + md5: 99f7755ec8648a042b0dbe906234f888 + sha256: 4acf845da404e84cef1acccc66cc0156af1b83a5b5d7077b2ca19b705c561e57 category: dev optional: true - name: wcwidth - version: 0.8.3 + version: 0.8.2 manager: conda platform: win-64 dependencies: - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.3-pyhcf101f3_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.2-pyhd8ed1ab_0.conda hash: - md5: f62991f907a9830ab003b12d07dd3478 - sha256: 3b0599d59d70bbe792702d1b5404ac501c9c25bd7b2fd9ccbb5da8ad6587a703 + md5: 99f7755ec8648a042b0dbe906234f888 + sha256: 4acf845da404e84cef1acccc66cc0156af1b83a5b5d7077b2ca19b705c561e57 category: dev optional: true - name: webcolors @@ -8142,34 +8118,34 @@ package: category: dev optional: true - name: wrapt - version: 2.4.0 + version: 2.3.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - python: '' + libgcc: '>=14' + python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - url: https://repo.prefix.dev/conda-forge/linux-64/wrapt-2.4.0-py312h1b36aeb_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/wrapt-2.3.0-py312h4c3975b_0.conda hash: - md5: ec38f58c4e14a55ac1be0ace3483aff0 - sha256: 53e09feeab7ebd1271d36f2adedc8af3513329b5ab86e7b26316f1ca29a9df47 + md5: 2363ebfeefdd644eb27dabba5491ba9f + sha256: 3ddbf9236f795e85dcce1de5d23e2b536d7d61a68b4032d966972dc0cc25e6f9 category: main optional: false - name: wrapt - version: 2.4.0 + version: 2.3.0 manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.12,<3.13.0a0' python_abi: 3.12.* ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/wrapt-2.4.0-py312he5662c2_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/wrapt-2.3.0-py312he06e257_0.conda hash: - md5: 83fba190ec8ddc9506ae1b2e9bc7679d - sha256: b596e6a8d01ec39c502488a5648e779b472e2a4c8d22618a1131cf9e26fd66ac + md5: 55b75557b330ab9efdeca405b9e581ca + sha256: d2a343c4967c3edbede148ba3ab4eeeebfdfd5b584969a477469f561408d4421 category: main optional: false - name: xorg-libxau diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index adb1d88e..c1efe1ec 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -35,10 +35,10 @@ package: platform: linux-64 dependencies: llvm-openmp: '>=9.0.1' - url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-8_kmp_llvm.conda + url: https://repo.prefix.dev/conda-forge/linux-64/_openmp_mutex-4.5-7_kmp_llvm.conda hash: - md5: b4d1b93dd1dab4eea23395fd5e5b357d - sha256: b8de006376660eb12c7fc40803c97e1480bf4bc1253f0d59694b12f81b52fe14 + md5: 887b70e1d607fba7957aa02f9ee0d939 + sha256: c0cddb66070dd6355311f7667ce2acccf70d1013edaa6e97f22859502fefdb22 category: main optional: false - name: _openmp_mutex @@ -198,10 +198,10 @@ package: libgcc: '>=15' python: '>=3.13,<3.14.0a0' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-26.1.0-py313h995f894_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/argon2-cffi-bindings-26.1.0-py313h995f894_0.conda hash: - md5: 37037283eae4f3f43484935a8308c45a - sha256: 0fc6e08e0970ebead828b9ba6f7bcdd5c04030a62872a8eb9a1e3b5bff6c1360 + md5: db73f7be4911943040efc5ca79c9775e + sha256: e07a2c721f480ee8109b519ca2201603abcc3aed5a9673fb830adbc9b6768ab8 category: dev optional: true - name: argon2-cffi-bindings @@ -215,10 +215,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/argon2-cffi-bindings-26.1.0-py313h5ea7bf4_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/argon2-cffi-bindings-26.1.0-py313h5ea7bf4_0.conda hash: - md5: 0aa2681c4ace8d31082b2d9ee69b0dd2 - sha256: 4049cd134f4777c3ea78a72e8cc4d685c9d0927417aefbc21c706be5de947558 + md5: 0e05f2b2dba8c28bc6be0ee952ce4fbc + sha256: 0532093a043aa452c90798cbff19dfc3ab4e331726239dad42ffce83538d94cc category: dev optional: true - name: arrow @@ -1264,34 +1264,36 @@ package: category: main optional: false - name: coverage - version: 7.16.0 + version: 7.15.4 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' + libgcc: '>=14' python: '' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.16.0-py313h2af15c8_0.conda + tomli: '' + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.15.4-py313h55b89ea_1.conda hash: - md5: e53c02d7a82ec851a22628cdd241f182 - sha256: c95c677deaae32f2cca15f5c6e1a9267d6c0ba072f82d6667596946c5b30dff3 + md5: b8f4dc4f7a959ab778cd11e463d90e0f + sha256: 04f234ebf4d9b697b1674108263ad5d651f7ec467ef93f09f34c26be8a32dbf7 category: dev optional: true - name: coverage - version: 7.16.0 + version: 7.15.4 manager: conda platform: win-64 dependencies: python: '' python_abi: 3.13.* + tomli: '' 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.16.0-py313h868807b_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.15.4-py313h868807b_1.conda hash: - md5: 9e9fea8f9bdcec2eaf1ef4b04a308b8a - sha256: 44d57f80436a2bb079e912c1f8d24949d59e83483ba4f9a92d195fee17092f9d + md5: f96b7d02d9935b5e9fed8f4de37ce5c7 + sha256: 9f43c7c2005145fc5d6041a7e9c3ec407fe570f62d142f667ad2df7dd12a3e9a category: dev optional: true - name: cpython @@ -2221,29 +2223,29 @@ package: category: dev optional: true - name: importlib-metadata - version: 9.0.1 + version: 9.0.0 manager: conda platform: linux-64 dependencies: python: '' zipp: '>=3.20' - url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.0-pyhcf101f3_0.conda hash: - md5: 77ec68e0aa61c3fff9ecbf840f93d64e - sha256: 95a074a7d3f58b3494c068d4789c364dcb591c56b70ca6b12f149a540f9aeea4 + md5: ffc17e785d64e12fc311af9184221839 + sha256: 43e2a5497cad1598ff88a3e69f69bc88b7b8f141fa63c60eab5db296317318b8 category: main optional: false - name: importlib-metadata - version: 9.0.1 + version: 9.0.0 manager: conda platform: win-64 dependencies: python: '' zipp: '>=3.20' - url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.1-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/importlib-metadata-9.0.0-pyhcf101f3_0.conda hash: - md5: 77ec68e0aa61c3fff9ecbf840f93d64e - sha256: 95a074a7d3f58b3494c068d4789c364dcb591c56b70ca6b12f149a540f9aeea4 + md5: ffc17e785d64e12fc311af9184221839 + sha256: 43e2a5497cad1598ff88a3e69f69bc88b7b8f141fa63c60eab5db296317318b8 category: main optional: false - name: iniconfig @@ -2321,7 +2323,7 @@ package: category: dev optional: true - name: ipython - version: 9.17.0 + version: 9.16.1 manager: conda platform: linux-64 dependencies: @@ -2337,14 +2339,14 @@ package: stack_data: '>=0.6.0' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.17.0-pyh53cf698_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.16.1-pyh53cf698_0.conda hash: - md5: 6ebd34681d8bc56e474fac76999de45a - sha256: 8165024016181bf7d32a027180239cf15c4447ec02080b31dcae731809c0b3e2 + md5: 23564ed27c9c7714905be96ac5786500 + sha256: 8470648b5e790d1881c09c02068d53e1bf0126f020db02a6dc2e73400cf1eeeb category: dev optional: true - name: ipython - version: 9.17.0 + version: 9.16.1 manager: conda platform: win-64 dependencies: @@ -2360,10 +2362,10 @@ package: stack_data: '>=0.6.0' traitlets: '>=5.13.0' typing_extensions: '>=4.6' - url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.17.0-pyhe2676ad_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/ipython-9.16.1-pyhe2676ad_0.conda hash: - md5: c2cf78253e434f1283cfd276ec9abd2f - sha256: de5052db34cd414d5993dc7330c7f9ce422fadd6e5f3c1422d48040e0319c633 + md5: d7c95d926befcfa22bee69bb1980e2ce + sha256: 2a0cd24e5c0e1eb8b7baf06346906673f6b8abea151ce302d7d978a3c416aeec category: dev optional: true - name: ipython_genutils @@ -2479,31 +2481,29 @@ package: category: dev optional: true - name: isort - version: 9.0.1 + version: 8.0.1 manager: conda platform: linux-64 dependencies: importlib-metadata: '>=4.6.0' - mypy_extensions: '>=1.1.0' python: '>=3.10,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-9.0.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/isort-8.0.1-pyhd8ed1ab_0.conda hash: - md5: e8665745d29e065eb0cb912f535fcdb0 - sha256: 4975afff44b4c3b63804010d6998aae26996bbfe987132e24c8953f5d5d6c550 + md5: 98cdd8615792e90da1023bc546f806d9 + sha256: cc5c2b513143ea9675ba5b3570182f7568fd1029b299ee3bc58424dcce8c5539 category: dev optional: true - name: isort - version: 9.0.1 + version: 8.0.1 manager: conda platform: win-64 dependencies: importlib-metadata: '>=4.6.0' - mypy_extensions: '>=1.1.0' python: '>=3.10,<4.0' - url: https://repo.prefix.dev/conda-forge/noarch/isort-9.0.1-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/isort-8.0.1-pyhd8ed1ab_0.conda hash: - md5: e8665745d29e065eb0cb912f535fcdb0 - sha256: 4975afff44b4c3b63804010d6998aae26996bbfe987132e24c8953f5d5d6c550 + md5: 98cdd8615792e90da1023bc546f806d9 + sha256: cc5c2b513143ea9675ba5b3570182f7568fd1029b299ee3bc58424dcce8c5539 category: dev optional: true - name: jedi @@ -2559,29 +2559,29 @@ package: category: main optional: false - name: joblib - version: 1.6.0 + version: 1.5.3 manager: conda platform: linux-64 dependencies: - cloudpickle: '>=3.0' - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.6.0-pyhcf101f3_0.conda + python: '>=3.10' + setuptools: '' + url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.5.3-pyhd8ed1ab_0.conda hash: - md5: 4ebc70ef1af2e21cdc8edb1bfa1ec28d - sha256: 96b76ace583404ce4fbc234baa6cdb3de485887913104d4ac51994f9b6656696 + md5: 615de2a4d97af50c350e5cf160149e77 + sha256: 301539229d7be6420c084490b8145583291123f0ce6b92f56be5948a2c83a379 category: main optional: false - name: joblib - version: 1.6.0 + version: 1.5.3 manager: conda platform: win-64 dependencies: - cloudpickle: '>=3.0' - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.6.0-pyhcf101f3_0.conda + python: '>=3.10' + setuptools: '' + url: https://repo.prefix.dev/conda-forge/noarch/joblib-1.5.3-pyhd8ed1ab_0.conda hash: - md5: 4ebc70ef1af2e21cdc8edb1bfa1ec28d - sha256: 96b76ace583404ce4fbc234baa6cdb3de485887913104d4ac51994f9b6656696 + md5: 615de2a4d97af50c350e5cf160149e77 + sha256: 301539229d7be6420c084490b8145583291123f0ce6b92f56be5948a2c83a379 category: main optional: false - name: json5 @@ -2825,7 +2825,7 @@ package: category: dev optional: true - name: jupyter_client - version: 8.10.0 + version: 8.9.1 manager: conda platform: linux-64 dependencies: @@ -2836,14 +2836,14 @@ package: tornado: '>=6.4.1' traitlets: '>=5.3' typing_extensions: '>=4.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.10.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.9.1-pyhcf101f3_0.conda hash: - md5: 85130259a26c023f53108dc9ab1cfb44 - sha256: 94f11bbdbac51a68415fb0a8bb441fb3475c0138e778664a3fb48f5698688ebf + md5: 49440e66df843bee2273937e8032ec43 + sha256: 48b18974cc93b2c0d2681563237034e521f51d1878f0bbc6a5a67ca31b1608a6 category: dev optional: true - name: jupyter_client - version: 8.10.0 + version: 8.9.1 manager: conda platform: win-64 dependencies: @@ -2854,10 +2854,10 @@ package: tornado: '>=6.4.1' traitlets: '>=5.3' typing_extensions: '>=4.13.0' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.10.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_client-8.9.1-pyhcf101f3_0.conda hash: - md5: 85130259a26c023f53108dc9ab1cfb44 - sha256: 94f11bbdbac51a68415fb0a8bb441fb3475c0138e778664a3fb48f5698688ebf + md5: 49440e66df843bee2273937e8032ec43 + sha256: 48b18974cc93b2c0d2681563237034e521f51d1878f0bbc6a5a67ca31b1608a6 category: dev optional: true - name: jupyter_core @@ -2932,7 +2932,7 @@ package: category: dev optional: true - name: jupyter_server - version: 2.21.0 + version: 2.20.0 manager: conda platform: linux-64 dependencies: @@ -2955,14 +2955,14 @@ package: tornado: '>=6.2.0' traitlets: '>=5.6.0' websocket-client: '>=1.7' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.21.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.20.0-pyhcf101f3_0.conda hash: - md5: b6163da641d1f178977dd36aebced0d5 - sha256: fa26acd3777095662c34cbbcfacad163a3a17c90a935f9357fe511c975c8241f + md5: b2ddb0e13b5600070c4019c4db8a78e6 + sha256: 3e8759fdc404f149e7e722e0af472044a0ef9e70d0a3a7690ddcfe1232a0e868 category: dev optional: true - name: jupyter_server - version: 2.21.0 + version: 2.20.0 manager: conda platform: win-64 dependencies: @@ -2985,10 +2985,10 @@ package: tornado: '>=6.2.0' traitlets: '>=5.6.0' websocket-client: '>=1.7' - url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.21.0-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupyter_server-2.20.0-pyhcf101f3_0.conda hash: - md5: b6163da641d1f178977dd36aebced0d5 - sha256: fa26acd3777095662c34cbbcfacad163a3a17c90a935f9357fe511c975c8241f + md5: b2ddb0e13b5600070c4019c4db8a78e6 + sha256: 3e8759fdc404f149e7e722e0af472044a0ef9e70d0a3a7690ddcfe1232a0e868 category: dev optional: true - name: jupyter_server_terminals @@ -3209,23 +3209,23 @@ package: category: main optional: false - name: kiwisolver - version: 1.5.1 + version: 1.5.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - libstdcxx: '>=15' + libgcc: '>=14' + libstdcxx: '>=14' python: '' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.5.1-py313h2551ef2_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/kiwisolver-1.5.0-py313hc8edb43_0.conda hash: - md5: cb89d589c15417938ec7f4fe67bc4088 - sha256: 6fe07fe3915a718a3d144e9104b26575b411de55ddd8baf85c686d7aa52d058c + md5: b81883b9dbf5069821c2fb09a8ba1407 + sha256: 0447d2901639f295989c5ccba7b1c367ed78b216e0d2705327a8c8a87a31177e category: main optional: false - name: kiwisolver - version: 1.5.1 + version: 1.5.0 manager: conda platform: win-64 dependencies: @@ -3234,10 +3234,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.5.1-py313h1a38498_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/kiwisolver-1.5.0-py313h1a38498_0.conda hash: - md5: 0a16cadd2c4bbda268d378634e8eb3a2 - sha256: 62867e422fef865cd58099f64ba2693d7b505863bc851bf9227990f2e3ea405e + md5: 7e40c4c1af80d907eb2973ab73418095 + sha256: 58c7b7d85ea3c0fac593fde238b994ee2d4fa8467decfe369dabfb5516b7ded4 category: main optional: false - name: krb5 @@ -3302,13 +3302,13 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - libjpeg-turbo: '>=3.2.0,<4.0a0' - libtiff: '>=4.7.2,<4.8.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.19.1-h9073bf1_2.conda + libgcc: '>=14' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libtiff: '>=4.7.1,<4.8.0a0' + url: https://repo.prefix.dev/conda-forge/linux-64/lcms2-2.19.1-h0c24ade_1.conda hash: - md5: b68c7304d2edb0f1a5bdfb875094d603 - sha256: 8cdec1ff3f276cd2069dca0dae4f45f3dc5c224e2d72daef78227832938467a6 + md5: 8b3ce45e929cd8e8e5f4d18586b56d8b + sha256: 112b5b9462572d970f4abd2912f76a25ee7db158b1e7260163d91dd8a630db84 category: main optional: false - name: lcms2 @@ -3316,15 +3316,15 @@ package: manager: conda platform: win-64 dependencies: - libjpeg-turbo: '>=3.2.0,<4.0a0' - libtiff: '>=4.7.2,<4.8.0a0' + libjpeg-turbo: '>=3.1.4.1,<4.0a0' + libtiff: '>=4.7.1,<4.8.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.19.1-hf2c6c5f_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/lcms2-2.19.1-hf2c6c5f_1.conda hash: - md5: 2bd9052d2e496ea54f47d9db8ae4f881 - sha256: df1c1a4dd44c54f238dc0a230d31eab9e73ada472dc4fa357552333b35641804 + md5: 1df4012c8a2478699d07bc26af66d41e + sha256: 5ed63a32639a130564a870becb679fd52dfb816666a61ed3c023917389010480 category: main optional: false - name: ld_impl_linux-64 @@ -4330,10 +4330,10 @@ package: pthread-stubs: '' xorg-libxau: '>=1.0.12,<2.0a0' xorg-libxdmcp: '>=1.1.5,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/libxcb-1.17.0-hb83e432_2.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libxcb-1.17.0-hb83e432_1.conda hash: - md5: 61f0ffba9161cbb3a77722869b21e4bb - sha256: 7b49e6fd2a584b7f072943e6adf4149677af5121246975278804782d37752837 + md5: 64e856c420205b009da26471d3ac161d + sha256: ce25a1efa85a78a3ce3b16721d9c36153814adbf2fb004a15f72ec69894b4cb1 category: main optional: false - name: libxcb @@ -4347,10 +4347,10 @@ package: ucrt: '>=10.0.20348.0' xorg-libxau: '>=1.0.12,<2.0a0' xorg-libxdmcp: '>=1.1.5,<2.0a0' - url: https://repo.prefix.dev/conda-forge/win-64/libxcb-1.17.0-h874e120_2.conda + url: https://repo.prefix.dev/conda-forge/win-64/libxcb-1.17.0-h874e120_1.conda hash: - md5: 3658b0201b32da9607ea5e3c1c463c1f - sha256: f5932cbcadb67bef9374ee864fed72411af29e88690435c6c7fc5633c89dabee + md5: 98046512ad7f2c44e48ff77bce854052 + sha256: a99f266ade1140c3106cca0f71ae2b5627ff77e1e791db3837129d28d596800e category: main optional: false - name: libxml2 @@ -4793,23 +4793,23 @@ package: category: main optional: false - name: msgpack-python - version: 1.2.2 + version: 1.2.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - libstdcxx: '>=15' + libgcc: '>=14' + libstdcxx: '>=14' python: '' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/msgpack-python-1.2.2-py313h2551ef2_1.conda + url: https://repo.prefix.dev/conda-forge/linux-64/msgpack-python-1.2.1-py313hc8edb43_1.conda hash: - md5: 24a1a51e4af587338f42ecc74c9c9e85 - sha256: 8e05c6e9fd8d35896f109d1605a0335a1bd48580d0fe9d2e1a6c51ab8b9df6ed + md5: edd7c461f72756bd3829f836e107c488 + sha256: 6bc2690c67ba7354affa0498a68998fad8f66759c287706e7ff42c2242e14ccb category: main optional: false - name: msgpack-python - version: 1.2.2 + version: 1.2.1 manager: conda platform: win-64 dependencies: @@ -4818,10 +4818,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/msgpack-python-1.2.2-py313h1a38498_1.conda + url: https://repo.prefix.dev/conda-forge/win-64/msgpack-python-1.2.1-py313h1a38498_1.conda hash: - md5: e02b77e0ac13f93fce70ee7ae64a3db7 - sha256: a440f39a645e0dff53dda50b4d625448ae528124a129634b1cc25ce6625ad18c + md5: 26faa18b0b9a5466f65d0f309424babf + sha256: e077fab86cde8d9f1f52adaddd80beb3bc3636bb3234c8523c95a087d340c5cb category: main optional: false - name: mumps-include @@ -4897,30 +4897,6 @@ package: sha256: d09c47c2cf456de5c09fa66d2c3c5035aa1fa228a1983a433c47b876aa16ce90 category: main optional: false -- name: mypy_extensions - version: 1.1.0 - manager: conda - platform: linux-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/mypy_extensions-1.1.0-pyha770c72_0.conda - hash: - md5: e9c622e0d00fa24a6292279af3ab6d06 - sha256: 6ed158e4e5dd8f6a10ad9e525631e35cee8557718f83de7a4e3966b1f772c4b1 - category: dev - optional: true -- name: mypy_extensions - version: 1.1.0 - manager: conda - platform: win-64 - dependencies: - python: '>=3.9' - url: https://repo.prefix.dev/conda-forge/noarch/mypy_extensions-1.1.0-pyha770c72_0.conda - hash: - md5: e9c622e0d00fa24a6292279af3ab6d06 - sha256: 6ed158e4e5dd8f6a10ad9e525631e35cee8557718f83de7a4e3966b1f772c4b1 - category: dev - optional: true - name: nbclient version: 0.11.0 manager: conda @@ -5506,25 +5482,25 @@ package: category: main optional: false - name: pandoc - version: '3.11' + version: 3.10.2 manager: conda platform: linux-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.11-ha770c72_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/pandoc-3.10.2-ha770c72_0.conda hash: - md5: 2c71f77db75fa5e9dd64abb706c66788 - sha256: cb14839e33fbbb2163f259476091dd99f9e83fbb1690b789cd1e6e6a05d17db7 + md5: 80b992667dc547968afb633772891f71 + sha256: 509d03571e126232f9eb38f1988ac9116f8c51df4a151071c4c6f3761d3fcb44 category: dev optional: true - name: pandoc - version: '3.11' + version: 3.10.2 manager: conda platform: win-64 dependencies: {} - url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.11-h57928b3_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/pandoc-3.10.2-h57928b3_0.conda hash: - md5: 4587e6544ff96ef0ee50b042f9d3719d - sha256: 03b03e1c841f25e738bafe60e20cae65a98951683f14e72aae6a8ac359e0501c + md5: 7643f65d7e954c60f69b353ae536730a + sha256: afcb977d62149f0e0c7f946e50f29a0b7ac24ef04c6d11b29478ea11dd63d825 category: dev optional: true - name: pandocfilters @@ -5692,27 +5668,27 @@ package: category: main optional: false - name: platformdirs - version: 4.11.5 + version: 4.11.4 manager: conda platform: linux-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 152ec36401f710145a7db03475594410 - sha256: 4496a7e0b584a388b3580ab594a4f384696ab7d702282588fd33a7ee38af983c + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: platformdirs - version: 4.11.5 + version: 4.11.4 manager: conda platform: win-64 dependencies: python: '' - url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.5-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/platformdirs-4.11.4-pyhcf101f3_0.conda hash: - md5: 152ec36401f710145a7db03475594410 - sha256: 4496a7e0b584a388b3580ab594a4f384696ab7d702282588fd33a7ee38af983c + md5: 840f27e0254bcdc8382ac2ca32782a22 + sha256: 36596d60d6bc49c4c27f009ab3128c63ea50ac5d67dffc44df05ab3d78bc4669 category: dev optional: true - name: pluggy @@ -6036,43 +6012,43 @@ package: category: dev optional: true - name: pylint - version: 4.0.8 + version: 4.0.7 manager: conda platform: linux-64 dependencies: astroid: '>=4.0.2,<=4.1.dev0' colorama: '>=0.4.5' dill: '>=0.3.7' - isort: '>=5,!=5.13,<10' + isort: '>=5,!=5.13,<9' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2' python: '' tomli: '>=1.1' tomlkit: '>=0.10.1' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.8-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.7-pyhcf101f3_0.conda hash: - md5: 80d0380362bf3d3c0b4ed5c103d253b5 - sha256: 9e037b4f94e5f7f8accd214d6611970b9949ae4eb8f8da9f0b2044dda1848d20 + md5: 7aaab460cb599b2370a782b4eff8127d + sha256: 9c9ba2e6f17193ede911f8c095232a8c5a1edb3cc6cc49d07cfdde0b86e7c97f category: dev optional: true - name: pylint - version: 4.0.8 + version: 4.0.7 manager: conda platform: win-64 dependencies: astroid: '>=4.0.2,<=4.1.dev0' colorama: '>=0.4.5' dill: '>=0.3.7' - isort: '>=5,!=5.13,<10' + isort: '>=5,!=5.13,<9' mccabe: '>=0.6,<0.8' platformdirs: '>=2.2' python: '' tomli: '>=1.1' tomlkit: '>=0.10.1' - url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.8-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/pylint-4.0.7-pyhcf101f3_0.conda hash: - md5: 80d0380362bf3d3c0b4ed5c103d253b5 - sha256: 9e037b4f94e5f7f8accd214d6611970b9949ae4eb8f8da9f0b2044dda1848d20 + md5: 7aaab460cb599b2370a782b4eff8127d + sha256: 9c9ba2e6f17193ede911f8c095232a8c5a1edb3cc6cc49d07cfdde0b86e7c97f category: dev optional: true - name: pymatsolver @@ -6983,6 +6959,30 @@ package: sha256: 305446a0b018f285351300463653d3d3457687270e20eda37417b12ee386ef76 category: dev optional: true +- name: setuptools + version: 84.0.0 + manager: conda + platform: linux-64 + dependencies: + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-84.0.0-pyh332efcf_0.conda + hash: + md5: 62ac906f1cd582c6c264c95625cb9d6f + sha256: 9e200ee5f9ff19a4d94e4b51c4856d53dec849f91032f345cf0c6bc3d51a7183 + category: main + optional: false +- name: setuptools + version: 84.0.0 + manager: conda + platform: win-64 + dependencies: + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-84.0.0-pyh332efcf_0.conda + hash: + md5: 62ac906f1cd582c6c264c95625cb9d6f + sha256: 9e200ee5f9ff19a4d94e4b51c4856d53dec849f91032f345cf0c6bc3d51a7183 + category: main + optional: false - name: six version: 1.17.0 manager: conda @@ -7912,27 +7912,27 @@ package: category: main optional: false - name: wcwidth - version: 0.8.3 + version: 0.8.2 manager: conda platform: linux-64 dependencies: - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.3-pyhcf101f3_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.2-pyhd8ed1ab_0.conda hash: - md5: f62991f907a9830ab003b12d07dd3478 - sha256: 3b0599d59d70bbe792702d1b5404ac501c9c25bd7b2fd9ccbb5da8ad6587a703 + md5: 99f7755ec8648a042b0dbe906234f888 + sha256: 4acf845da404e84cef1acccc66cc0156af1b83a5b5d7077b2ca19b705c561e57 category: dev optional: true - name: wcwidth - version: 0.8.3 + version: 0.8.2 manager: conda platform: win-64 dependencies: - python: '' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.3-pyhcf101f3_0.conda + python: '>=3.10' + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.8.2-pyhd8ed1ab_0.conda hash: - md5: f62991f907a9830ab003b12d07dd3478 - sha256: 3b0599d59d70bbe792702d1b5404ac501c9c25bd7b2fd9ccbb5da8ad6587a703 + md5: 99f7755ec8648a042b0dbe906234f888 + sha256: 4acf845da404e84cef1acccc66cc0156af1b83a5b5d7077b2ca19b705c561e57 category: dev optional: true - name: webcolors @@ -8058,34 +8058,34 @@ package: category: dev optional: true - name: wrapt - version: 2.4.0 + version: 2.3.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=15' - python: '' + libgcc: '>=14' + python: '>=3.13,<3.14.0a0' python_abi: 3.13.* - url: https://repo.prefix.dev/conda-forge/linux-64/wrapt-2.4.0-py313hd42f317_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/wrapt-2.3.0-py313h07c4f96_0.conda hash: - md5: d9086d2cb7ddde5aa0042b037f3fbda9 - sha256: 7a5a9b1f33f429cd6db79c1046a31f4312545ee1c8170024a0986fe55060fff1 + md5: 4499210dbd2e88a83ebfcc09125fe546 + sha256: b132148911e473450a5ccb2a1ad5236f0572247a45a8ec0bdf95d080b35866c9 category: main optional: false - name: wrapt - version: 2.4.0 + version: 2.3.0 manager: conda platform: win-64 dependencies: - python: '' + python: '>=3.13,<3.14.0a0' python_abi: 3.13.* ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/wrapt-2.4.0-py313h5fd188c_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/wrapt-2.3.0-py313h5ea7bf4_0.conda hash: - md5: 6e489dce8b854d016d16fd035192ffc1 - sha256: 1c111a574b5fe2c8c2af54748145218ce463e34c6d157b1d90f4fb7977680e84 + md5: 30b3bf29220f453b5bceab07c10f0dc0 + sha256: 895b23f3ae82c5aab6876c3690ed9e72b5f7b438bd5e4f9fefe89b747113c395 category: main optional: false - name: xorg-libxau diff --git a/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json b/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json index 1a6da245..b190ae8d 100644 --- a/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/apparent_conductivity_forward.ui.json @@ -47,7 +47,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -77,7 +80,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json b/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json index b55117b5..949ae31f 100644 --- a/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/apparent_conductivity_inversion.ui.json @@ -73,7 +73,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -87,7 +90,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -104,7 +110,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -120,7 +129,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -151,7 +163,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -192,7 +207,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -205,7 +223,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -218,7 +239,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -231,14 +255,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -253,7 +283,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -271,7 +304,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -287,7 +323,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -303,7 +342,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index d9a08b45..0d105a4e 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -112,7 +112,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -142,7 +145,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 31362e80..eb418ed5 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -132,7 +132,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -143,7 +146,10 @@ }, "reference_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -157,7 +163,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -170,7 +179,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -201,7 +213,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -242,7 +257,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -255,7 +273,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -269,14 +290,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -291,7 +318,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -309,7 +339,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -326,7 +359,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 7f7b68dc..06ee6718 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -41,7 +41,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -71,7 +74,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index af1723e6..2f6d2b31 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -69,7 +69,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -84,7 +87,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -100,7 +106,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -117,7 +126,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -149,7 +161,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -190,7 +205,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -203,7 +221,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -216,7 +237,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -229,14 +253,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -251,7 +281,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -269,7 +302,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -285,7 +321,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -301,7 +340,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 222436a4..d2fc8bdd 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -104,7 +104,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -134,7 +137,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 6cfa6a2f..25602098 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -154,7 +154,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -168,7 +171,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -185,7 +191,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -201,7 +210,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -232,7 +244,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -256,7 +271,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -269,7 +287,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -283,14 +304,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": "", "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -308,7 +335,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -325,7 +355,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index 005e1d19..e6e706c5 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -86,7 +86,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -116,7 +119,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index c6c5754f..cf113bdb 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -20,7 +20,10 @@ "group": "Survey", "main": true, "association": "Vertex", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Dip direction & dip", "3D vector" @@ -136,7 +139,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -150,7 +156,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -167,7 +176,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -183,7 +195,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -214,7 +229,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -255,7 +273,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -268,7 +289,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -281,7 +305,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -294,14 +321,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -316,7 +349,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -334,7 +370,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -350,7 +389,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -366,7 +408,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index 351c9e0d..ddd3f82a 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -97,7 +97,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -127,7 +130,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index ccc1afd0..2d9c5786 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -337,7 +337,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -352,7 +355,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -368,7 +374,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -384,7 +393,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -415,7 +427,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -456,7 +471,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -469,7 +487,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -482,7 +503,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -495,14 +519,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -517,7 +547,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -535,7 +568,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -551,7 +587,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -567,7 +606,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 35981ed3..b94de38f 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -112,7 +112,10 @@ }, "conductivity_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -124,7 +127,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -154,7 +160,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 1490d9b3..46190dc3 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -131,7 +131,10 @@ }, "conductivity_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -143,7 +146,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -154,7 +160,10 @@ }, "reference_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -168,7 +177,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -181,7 +193,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -212,7 +227,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -253,7 +271,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -266,7 +287,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -280,14 +304,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -302,7 +332,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -320,7 +353,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -337,7 +373,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index bbecb26e..f88a56a9 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -41,7 +41,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -56,7 +59,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -88,7 +94,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index e6a0e841..445dbca4 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -69,7 +69,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -84,7 +87,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -100,7 +106,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -117,7 +126,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -134,7 +146,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -166,7 +181,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -207,7 +225,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -220,7 +241,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -233,7 +257,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -246,14 +273,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -268,7 +301,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -286,7 +322,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -302,7 +341,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -318,7 +360,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index a130bcfd..18ea3cbc 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -126,7 +126,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -166,7 +169,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": false }, @@ -179,7 +185,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -192,7 +201,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -205,14 +217,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -234,7 +252,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -247,7 +268,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -260,7 +284,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -273,7 +300,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, diff --git a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json index 4357f3e7..9612de76 100644 --- a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json @@ -108,7 +108,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -174,7 +177,10 @@ "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": "Dip direction & dip", "label": "Gradient rotation", "optional": true, @@ -192,7 +198,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true, "visible": false @@ -206,7 +215,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -219,7 +231,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -232,7 +247,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 3a72255c..22790db9 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -80,7 +80,10 @@ }, "starting_model": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -94,7 +97,10 @@ "reference_model": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -107,7 +113,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -120,7 +129,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -151,7 +163,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -192,7 +207,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -205,7 +223,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -218,7 +239,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -231,14 +255,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -253,7 +283,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -271,7 +304,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -287,7 +323,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -303,7 +342,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index 80153d3e..b0fc225e 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -58,7 +58,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -178,7 +181,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index cf49684c..80c8a0cc 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -368,7 +368,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -383,7 +386,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -399,7 +405,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -415,7 +424,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -446,7 +458,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -487,7 +502,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -500,7 +518,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -513,7 +534,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -526,14 +550,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -548,7 +578,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -566,7 +599,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -582,7 +618,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -598,7 +637,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 41391fd3..e56abf53 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -60,7 +60,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -179,7 +182,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -193,7 +199,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -209,7 +218,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index baa91f96..0fb5348d 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -368,7 +368,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -383,7 +386,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -399,7 +405,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -414,7 +423,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -430,7 +442,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -446,7 +461,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -462,7 +480,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -494,7 +515,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -535,7 +559,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -548,7 +575,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -561,7 +591,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -574,14 +607,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -596,7 +635,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -614,7 +656,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -630,7 +675,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -646,7 +694,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json index 74b4eb13..d13db3ca 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_pde_forward.ui.json @@ -59,7 +59,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -142,7 +145,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -156,7 +162,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -172,7 +181,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json index aa899198..48d60666 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_pde_inversion.ui.json @@ -188,7 +188,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -202,7 +205,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -218,7 +224,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -235,7 +244,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "optional": true, @@ -251,7 +263,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -282,7 +297,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -323,7 +341,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -336,7 +357,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -349,7 +373,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -362,14 +389,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -384,7 +417,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -402,7 +438,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -418,7 +457,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -434,7 +476,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index d5274193..5cfb612d 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -95,7 +95,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -125,7 +128,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 15d0707b..f32681c1 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -287,7 +287,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -301,7 +304,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -318,7 +324,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -334,7 +343,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -365,7 +377,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -406,7 +421,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -419,7 +437,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -432,7 +453,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -445,14 +469,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -467,7 +497,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -485,7 +518,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -501,7 +537,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -517,7 +556,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index a0a6dde8..f554d20d 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -109,7 +109,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -139,7 +142,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 0e44d3ed..a00eef9b 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -133,7 +133,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -147,7 +150,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -161,7 +167,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -174,7 +183,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -205,7 +217,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -229,7 +244,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -242,7 +260,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -256,14 +277,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": "", "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -281,7 +308,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Lateral-smoothness norm", "isValue": true, @@ -298,7 +328,10 @@ "y_norm": "", "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Vertical-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index 39acca38..0e28aacc 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -105,7 +105,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -135,7 +138,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 1f5e67ed..10ecbd1a 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -21,7 +21,10 @@ "group": "Survey", "main": true, "association": "Vertex", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Dip direction & dip", "3D vector" @@ -177,7 +180,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -191,7 +197,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -205,7 +214,10 @@ "lower_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -218,7 +230,10 @@ "upper_bound": { "association": "Cell", "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -249,7 +264,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -290,7 +308,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -303,7 +324,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -316,7 +340,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -329,14 +356,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -351,7 +384,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -369,7 +405,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -385,7 +424,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -401,7 +443,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index d26a1b91..a55db676 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -71,7 +71,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -101,7 +104,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 142f61aa..759d14b3 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -167,7 +167,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "main": true, "isValue": true, @@ -181,7 +184,10 @@ "Cell", "Vertex" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "main": true, "group": "Mesh and models", "isValue": true, @@ -198,7 +204,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -214,7 +223,10 @@ "Vertex" ], "main": true, - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Mesh and models", "isValue": true, "parent": "mesh", @@ -245,7 +257,10 @@ "Vertex", "Cell" ], - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Topography", "main": true, "optional": true, @@ -286,7 +301,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -299,7 +317,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -312,7 +333,10 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, @@ -325,14 +349,20 @@ "isValue": true, "parent": "mesh", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "property": "", "enabled": true }, "gradient_rotation": { "group": "Regularization", "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "dataGroupType": [ "Strike & dip", "Dip direction & dip", @@ -347,7 +377,10 @@ }, "s_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Smallness norm", "isValue": true, @@ -365,7 +398,10 @@ }, "x_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "X-smoothness norm", "isValue": true, @@ -381,7 +417,10 @@ }, "y_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Y-smoothness norm", "isValue": true, @@ -397,7 +436,10 @@ }, "z_norm": { "association": "Cell", - "dataType": "Float", + "dataType": [ + "Float", + "Integer" + ], "group": "Sparse/blocky model", "label": "Z-smoothness norm", "isValue": true, diff --git a/simpeg_drivers/components/topography.py b/simpeg_drivers/components/topography.py index 0d0bf910..e7509d75 100644 --- a/simpeg_drivers/components/topography.py +++ b/simpeg_drivers/components/topography.py @@ -157,9 +157,7 @@ def get_locations(self, entity: Entity) -> np.ndarray: elif isinstance(self.params.active_cells.topography, int | float): elev = np.ones_like(locs[:, 2]) * self.params.active_cells.topography else: - elev = ( - self.params.active_cells.topography.values - ) # Must be FloatData at this point + elev = (self.params.active_cells.topography.values).astype(float) if not np.all(locs[:, 2] == elev): locs[:, 2] = elev diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py index c72e1b90..e6abc5eb 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py @@ -13,7 +13,7 @@ from geoapps_utils.base import Options from geoh5py.data import FloatData -from geoh5py.groups import SimPEGGroup, UIJsonGroup +from geoh5py.groups import UIJsonGroup from geoh5py.objects import DrapeModel, Octree from pydantic import field_validator diff --git a/simpeg_drivers/electricals/base_2d.py b/simpeg_drivers/electricals/base_2d.py index 7c7be85e..75d4bc05 100644 --- a/simpeg_drivers/electricals/base_2d.py +++ b/simpeg_drivers/electricals/base_2d.py @@ -16,7 +16,7 @@ from typing import Any import numpy as np -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from geoh5py.objects import DrapeModel, Octree, PotentialElectrode from geoh5py.ui_json.ui_json import fetch_active_workspace from pydantic import AliasChoices, Field, field_validator, model_validator @@ -51,7 +51,7 @@ class Conductivity2DModelOptions(ModelOptions): """ model_type: ModelTypeEnum = ModelTypeEnum.conductivity - conductivity_model: float | FloatData | None = Field( + conductivity_model: float | FloatData | IntegerData | None = Field( None, validation_alias=AliasChoices("background_conductivity", "conductivity_model"), ) diff --git a/simpeg_drivers/joint/joint_petrophysics/options.py b/simpeg_drivers/joint/joint_petrophysics/options.py index 2e1a2488..32dba3cb 100644 --- a/simpeg_drivers/joint/joint_petrophysics/options.py +++ b/simpeg_drivers/joint/joint_petrophysics/options.py @@ -14,13 +14,12 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData, ReferencedData +from geoh5py.data import FloatData, IntegerData, ReferencedData from geoh5py.groups import SimPEGGroup from geoh5py.objects import Octree from simpeg_drivers import assets_path from simpeg_drivers.joint.options import BaseJointOptions, JointModelOptions -from simpeg_drivers.options import ModelOptions class JointPetrophysicsModelOptions(JointModelOptions): @@ -30,7 +29,7 @@ class JointPetrophysicsModelOptions(JointModelOptions): :param petrophysical: The reference geology data. """ - alpha_s: float | FloatData = 1.0 + alpha_s: float | FloatData | IntegerData = 1.0 petrophysical_model: ReferencedData diff --git a/simpeg_drivers/joint/joint_surveys/options.py b/simpeg_drivers/joint/joint_surveys/options.py index 0ae5eb04..a3f84166 100644 --- a/simpeg_drivers/joint/joint_surveys/options.py +++ b/simpeg_drivers/joint/joint_surveys/options.py @@ -15,7 +15,7 @@ from typing import ClassVar from geoapps_utils.run import fetch_driver_class_from_string -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from pydantic import model_validator from simpeg_drivers import assets_path @@ -33,8 +33,8 @@ class JointSurveysModelOptions(JointModelOptions): """ model_type: ModelTypeEnum | None = None - starting_model: float | FloatData | None = None - reference_model: float | FloatData | None = None + starting_model: float | FloatData | IntegerData | None = None + reference_model: float | FloatData | IntegerData | None = None class JointSurveysOptions(BaseJointOptions): diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index 0bcac3bb..8a09f04f 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -11,7 +11,7 @@ from __future__ import annotations -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from geoh5py.groups import PropertyGroup, SimPEGGroup from pydantic import BaseModel, ConfigDict @@ -33,21 +33,21 @@ class JointModelOptions(ModelOptions): starting_model: None = None reference_model: None = None - lower_bound: float | FloatData | None = None - upper_bound: float | FloatData | None = None + lower_bound: float | FloatData | IntegerData | None = None + upper_bound: float | FloatData | IntegerData | None = None # Model values for regularization - alpha_s: float | FloatData | None | None = None - length_scale_x: float | FloatData | None = None - length_scale_y: float | FloatData | None = None - length_scale_z: float | FloatData | None = None + alpha_s: float | FloatData | IntegerData | None = None + length_scale_x: float | FloatData | IntegerData | None = None + length_scale_y: float | FloatData | IntegerData | None = None + length_scale_z: float | FloatData | IntegerData | None = None gradient_rotation: PropertyGroup | None = None # Model values for IRLS - s_norm: float | FloatData | None = None - x_norm: float | FloatData | None = None - y_norm: float | FloatData | None = None - z_norm: float | FloatData | None = None + s_norm: float | FloatData | IntegerData | None = None + x_norm: float | FloatData | IntegerData | None = None + y_norm: float | FloatData | IntegerData | None = None + z_norm: float | FloatData | IntegerData | None = None class DirectiveOptions(BaseModel): diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 8e0e8185..45ced345 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -79,7 +79,7 @@ class ActiveCellsOptions(BaseModel): arbitrary_types_allowed=True, ) topography_object: Points | Grid2D | None = None - topography: FloatData | float | None = None + topography: FloatData | IntegerData | float | None = None active_model: BooleanData | IntegerData | None = None @model_validator(mode="before") @@ -261,28 +261,28 @@ class ModelOptions(BaseModel): ) # Model options - starting_model: float | FloatData - reference_model: float | FloatData | None = None - lower_bound: float | FloatData | None = None - upper_bound: float | FloatData | None = None + starting_model: float | FloatData | IntegerData + reference_model: float | FloatData | IntegerData | None = None + lower_bound: float | FloatData | IntegerData | None = None + upper_bound: float | FloatData | IntegerData | None = None # Model values for regularization - alpha_s: float | FloatData | None = 1.0 - length_scale_x: float | FloatData = 1.0 - length_scale_y: float | FloatData | None = 1.0 - length_scale_z: float | FloatData = 1.0 + alpha_s: float | FloatData | IntegerData | None = 1.0 + length_scale_x: float | FloatData | IntegerData = 1.0 + length_scale_y: float | FloatData | IntegerData | None = 1.0 + length_scale_z: float | FloatData | IntegerData = 1.0 gradient_rotation: PropertyGroup | None = None # Model values for IRLS - s_norm: float | FloatData | None = 0.0 - x_norm: float | FloatData = 2.0 - y_norm: float | FloatData | None = 2.0 - z_norm: float | FloatData = 2.0 + s_norm: float | FloatData | IntegerData | None = 0.0 + x_norm: float | FloatData | IntegerData = 2.0 + y_norm: float | FloatData | IntegerData | None = 2.0 + z_norm: float | FloatData | IntegerData = 2.0 - _gradient_orientations: list[FloatData] | None = None + _gradient_orientations: list[FloatData | IntegerData] | None = None @property - def gradient_direction(self) -> FloatData | None: + def gradient_direction(self) -> FloatData | IntegerData | None: if self.gradient_orientations is None: return None return self.gradient_orientations[0] @@ -320,7 +320,7 @@ class ConductivityModelOptions(ModelOptions): """ model_type: ModelTypeEnum = ModelTypeEnum.conductivity - conductivity_model: float | FloatData | None = Field( + conductivity_model: float | FloatData | IntegerData | None = Field( None, validation_alias=AliasChoices("background_conductivity", "conductivity_model"), ) @@ -657,4 +657,4 @@ class IPModelOptions(ConductivityModelOptions): ModelOptions class with defaulted lower bound. """ - lower_bound: float | FloatData | None = 0 + lower_bound: float | FloatData | IntegerData | None = 0 diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index ca37df06..a8489c0a 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -19,7 +19,7 @@ from geoapps_utils.base import Driver, get_logger from geoapps_utils.modelling.plates import Plate from geoapps_utils.utils.transformations import azimuth_to_unit_vector -from geoh5py.data import FloatData, ReferencedData +from geoh5py.data import FloatData, IntegerData, ReferencedData from geoh5py.groups import SimPEGGroup from geoh5py.objects import Octree, Points, Surface from geoh5py.ui_json import UIJson @@ -67,7 +67,7 @@ def __init__( self._plates: list[Plate] | None = None self._survey: Points | None = None self._mesh: Octree | None = None - self._model: FloatData | None = None + self._model: FloatData | IntegerData | None = None self._client: Client | bool = validate_client(client) self._workers: list[tuple[str]] = validate_workers(self._client, workers) self._simulation_driver: InversionDriver | None = None diff --git a/simpeg_drivers/potential_fields/gravity/options.py b/simpeg_drivers/potential_fields/gravity/options.py index a6ccef65..267b5462 100644 --- a/simpeg_drivers/potential_fields/gravity/options.py +++ b/simpeg_drivers/potential_fields/gravity/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -30,7 +30,7 @@ class GravityModelOptions(ModelOptions): ModelOptions class with defaulted reference model. """ - reference_model: float | FloatData | None = None + reference_model: float | FloatData | IntegerData | None = None class GravityForwardOptions(BaseForwardOptions): diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/options.py b/simpeg_drivers/potential_fields/magnetic_scalar/options.py index a229f61d..dfabe518 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/options.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -30,8 +30,8 @@ class MagneticModelOptions(ModelOptions): ModelOptions class with defaulted lower bound. """ - reference_model: float | FloatData | None = None - lower_bound: float | FloatData | None = 0 + reference_model: float | FloatData | IntegerData | None = None + lower_bound: float | FloatData | IntegerData | None = 0 class MagneticForwardOptions(BaseForwardOptions): @@ -71,9 +71,9 @@ class MagneticForwardOptions(BaseForwardOptions): byy_channel_bool: bool = False byz_channel_bool: bool = False bzz_channel_bool: bool = False - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: MagneticModelOptions @@ -138,9 +138,9 @@ class MagneticInversionOptions(BaseInversionOptions): byy_uncertainty: float | FloatData | None = None byz_uncertainty: float | FloatData | None = None bzz_uncertainty: float | FloatData | None = None - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: MagneticModelOptions diff --git a/simpeg_drivers/potential_fields/magnetic_vector/options.py b/simpeg_drivers/potential_fields/magnetic_vector/options.py index f982f772..dff18e82 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/options.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -32,11 +32,11 @@ class VectorModelOptions(ModelOptions): """ lower_bound: Deprecated - reference_model: float | FloatData | None = None - starting_inclination: float | FloatData | None = None - starting_declination: float | FloatData | None = None - reference_inclination: float | FloatData | None = None - reference_declination: float | FloatData | None = None + reference_model: float | FloatData | IntegerData | None = None + starting_inclination: float | FloatData | IntegerData | None = None + starting_declination: float | FloatData | IntegerData | None = None + reference_inclination: float | FloatData | IntegerData | None = None + reference_declination: float | FloatData | IntegerData | None = None class MagneticVectorForwardOptions(BaseForwardOptions): @@ -75,9 +75,9 @@ class MagneticVectorForwardOptions(BaseForwardOptions): byy_channel_bool: bool = False byz_channel_bool: bool = False bzz_channel_bool: bool = False - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: VectorModelOptions diff --git a/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py b/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py index 1c74ca3a..ac22df7d 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py +++ b/simpeg_drivers/potential_fields/magnetic_vector_pde/options.py @@ -14,7 +14,7 @@ from pathlib import Path from typing import ClassVar -from geoh5py.data import FloatData +from geoh5py.data import FloatData, IntegerData from simpeg_drivers import assets_path from simpeg_drivers.options import ( @@ -32,9 +32,9 @@ class VectorModelPDEOptions(ModelOptions): """ lower_bound: Deprecated - reference_model: float | FloatData | None = None - starting_inclination: float | FloatData | None = None - starting_declination: float | FloatData | None = None + reference_model: float | FloatData | IntegerData | None = None + starting_inclination: float | FloatData | IntegerData | None = None + starting_declination: float | FloatData | IntegerData | None = None class MagneticVectorPDEForwardOptions(BaseForwardOptions): @@ -61,9 +61,9 @@ class MagneticVectorPDEForwardOptions(BaseForwardOptions): by_channel_bool: bool = False bz_channel_bool: bool = False - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: VectorModelPDEOptions @@ -103,9 +103,9 @@ class MagneticVectorPDEInversionOptions(BaseInversionOptions): by_uncertainty: float | FloatData | None = None bz_uncertainty: float | FloatData | None = None - inducing_field_strength: float | FloatData - inducing_field_inclination: float | FloatData - inducing_field_declination: float | FloatData + inducing_field_strength: float + inducing_field_inclination: float + inducing_field_declination: float models: VectorModelPDEOptions directives: DirectiveOptions = DirectiveOptions(sens_wts_threshold=1e-3) diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index 41918d48..0e6a6b43 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -109,10 +109,15 @@ def test_gravity_run( inds = (components.mesh.centroids[:, 0] > -35) & ( components.mesh.centroids[:, 0] < 35 ) - norms = np.ones(components.mesh.n_cells) * 2 + norms = np.full(components.mesh.n_cells, 2, dtype=int) norms[inds] = 0 gradient_norms = components.mesh.add_data({"norms": {"values": norms}}) - + length_scales = components.mesh.add_data( + {"lengths": {"values": np.ones(components.mesh.n_cells, dtype=int)}} + ) + reference = components.mesh.add_data( + {"reference": {"values": np.zeros(components.mesh.n_cells, dtype=int)}} + ) # Test mesh UBC ordered ind = np.argsort(components.mesh.octree_cells, order=["K", "J", "I"]) components.mesh.octree_cells = components.mesh.octree_cells[ind] @@ -133,6 +138,9 @@ def test_gravity_run( x_norm=gradient_norms, y_norm=gradient_norms, z_norm=gradient_norms, + length_scale_x=length_scales, + length_scale_y=length_scales, + length_scale_z=length_scales, gz_channel=gz, gz_uncertainty=2e-3, lower_bound=0.0, @@ -141,7 +149,7 @@ def test_gravity_run( percentile=100, starting_model=1e-4, topography_object=components.topography, - reference_model=0.0, + reference_model=reference, sens_wts_threshold=1.0, save_sensitivities=True, ) diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index ca15138f..487eb95e 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -12,6 +12,7 @@ from pathlib import Path +import numpy as np from geoh5py.workspace import Workspace from simpeg_drivers.electricals.induced_polarization.three_dimensions.forward import ( @@ -92,13 +93,18 @@ def test_ip_3d_run( mesh = geoh5.get_entity("mesh")[0] topography = geoh5.get_entity("topography")[0] + # Test conductivity model as IntegerData + conductivity_model = mesh.add_data( + {"conductivity": {"values": np.full(mesh.n_cells, 1e2, dtype=int)}} + ) + # Run the inverse params = IP3DInversionOptions.build( geoh5=geoh5, mesh=mesh, topography_object=topography, data_object=potential.parent, - conductivity_model=1e2, + conductivity_model=conductivity_model, model_type="Resistivity (Ohm-m)", reference_model=1e-6, starting_model=1e-6, diff --git a/tests/run_tests/driver_rotated_gradients_test.py b/tests/run_tests/driver_rotated_gradients_test.py index c8752ef2..7ad932cc 100644 --- a/tests/run_tests/driver_rotated_gradients_test.py +++ b/tests/run_tests/driver_rotated_gradients_test.py @@ -121,8 +121,8 @@ def test_rotated_grad_run( topography = components.topography # Create property group with orientation - dip = np.ones(mesh.n_cells) * 70 - azimuth = np.ones(mesh.n_cells) * 60 + dip = np.full(mesh.n_cells, 70, dtype=int) + azimuth = np.full(mesh.n_cells, 60, dtype=int) data_list = mesh.add_data( {