Merge pull request #49 from MiraGeoscience/GEOPY-1543

GEOPY-1543: Switch over Octree Params to BaseData type
MiraGeoscience · Dec 4, 2024 · 67dd65b · 67dd65b
2 parents 25575db + 69ea6d0
commit 67dd65b
Show file tree

Hide file tree

Showing 14 changed files with 1,311 additions and 1,252 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -7,8 +7,9 @@
 #  (see LICENSE file at the root of this source code package).                         '
 # ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
-from importlib.metadata import version
 from datetime import datetime
+from importlib.metadata import version
+
 
 # Configuration file for the Sphinx documentation builder.
 #
@@ -51,13 +52,15 @@
 
 html_theme = "alabaster"
 html_theme_options = {
-    'description': f"version {release}",
+    "description": f"version {release}",
 }
 html_static_path = ["_static"]
 
+
 def get_copyright_notice():
     return f"Copyright {datetime.now().strftime(project_copyright)}"
 
+
 rst_epilog = f"""
 .. |copyright_notice| replace:: {get_copyright_notice()}.
 """
diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 32ac065911804b11183e060d3276cb377ea6083aeb2d681b605e95e5b4ad9269
+# input_hash: 6ba9d660099d0b4fdfd62bb5d1f1f4b5bba42a3f4ffbc2872e5f2881a076da0c
 
 channels:
   - conda-forge
@@ -9,52 +9,52 @@ dependencies:
   - _libgcc_mutex=0.1=conda_forge
   - _openmp_mutex=4.5=2_kmp_llvm
   - alabaster=0.7.16=pyhd8ed1ab_0
-  - annotated-types=0.7.0=pyhd8ed1ab_0
+  - annotated-types=0.7.0=pyhd8ed1ab_1
   - asciitree=0.3.3=py_2
   - astroid=3.3.5=py310hff52083_0
-  - babel=2.16.0=pyhd8ed1ab_0
+  - babel=2.16.0=pyhd8ed1ab_1
   - brotli=1.1.0=hb9d3cd8_2
   - brotli-bin=1.1.0=hb9d3cd8_2
   - brotli-python=1.1.0=py310hf71b8c6_2
   - bzip2=1.0.8=h4bc722e_7
-  - c-ares=1.32.3=h4bc722e_0
+  - c-ares=1.34.3=hb9d3cd8_1
   - ca-certificates=2024.8.30=hbcca054_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
   - certifi=2024.8.30=pyhd8ed1ab_0
   - cffi=1.17.1=py310h8deb56e_0
-  - charset-normalizer=3.4.0=pyhd8ed1ab_0
-  - click=8.1.7=unix_pyh707e725_0
+  - charset-normalizer=3.4.0=pyhd8ed1ab_1
+  - click=8.1.7=unix_pyh707e725_1
   - cloudpickle=3.1.0=pyhd8ed1ab_1
-  - colorama=0.4.6=pyhd8ed1ab_0
+  - colorama=0.4.6=pyhd8ed1ab_1
   - contourpy=1.3.1=py310h3788b33_0
-  - coverage=7.6.7=py310h89163eb_0
+  - coverage=7.6.8=py310h89163eb_0
   - cycler=0.12.1=pyhd8ed1ab_0
   - cytoolz=1.0.0=py310ha75aee5_1
   - dask-core=2024.6.2=pyhd8ed1ab_0
-  - dill=0.3.9=pyhd8ed1ab_0
+  - dill=0.3.9=pyhd8ed1ab_1
   - discretize=0.10.0=py310hcb52e73_1
   - distributed=2024.6.2=pyhd8ed1ab_0
   - docutils=0.19=py310hff52083_1
   - empymod=2.2.2=pyhd8ed1ab_0
-  - exceptiongroup=1.2.2=pyhd8ed1ab_0
+  - exceptiongroup=1.2.2=pyhd8ed1ab_1
   - fasteners=0.17.3=pyhd8ed1ab_0
-  - fonttools=4.55.0=py310h89163eb_0
+  - fonttools=4.55.1=py310h89163eb_0
   - freetype=2.12.1=h267a509_2
   - fsspec=2022.11.0=pyhd8ed1ab_0
   - geoana=0.5.0=py310hcb52e73_4
   - h2=4.1.0=pyhd8ed1ab_0
   - h5py=3.12.1=nompi_py310h60e0fe6_102
-  - hdf5=1.14.3=nompi_hdf9ad27_105
+  - hdf5=1.14.3=nompi_h2d575fe_107
   - hpack=4.0.0=pyh9f0ad1d_0
   - hyperframe=6.0.1=pyhd8ed1ab_0
-  - idna=3.10=pyhd8ed1ab_0
+  - idna=3.10=pyhd8ed1ab_1
   - imagesize=1.4.1=pyhd8ed1ab_0
-  - importlib-metadata=8.5.0=pyha770c72_0
-  - importlib_metadata=8.5.0=hd8ed1ab_0
-  - iniconfig=2.0.0=pyhd8ed1ab_0
-  - isort=5.13.2=pyhd8ed1ab_0
-  - jinja2=3.1.4=pyhd8ed1ab_0
+  - importlib-metadata=8.5.0=pyha770c72_1
+  - importlib_metadata=8.5.0=hd8ed1ab_1
+  - iniconfig=2.0.0=pyhd8ed1ab_1
+  - isort=5.13.2=pyhd8ed1ab_1
+  - jinja2=3.1.4=pyhd8ed1ab_1
   - joblib=1.4.2=pyhd8ed1ab_0
   - keyutils=1.6.1=h166bdaf_0
   - kiwisolver=1.4.7=py310h3788b33_0
@@ -77,7 +77,6 @@ dependencies:
   - libgcc=14.2.0=h77fa898_1
   - libgcc-ng=14.2.0=h69a702a_1
   - libgfortran=14.2.0=h69a702a_1
-  - libgfortran-ng=14.2.0=h69a702a_1
   - libgfortran5=14.2.0=hd5240d6_1
   - libhwloc=2.11.1=default_hecaa2ac_1000
   - libiconv=1.17=hd590300_2
@@ -89,7 +88,7 @@ dependencies:
   - libpng=1.6.44=hadc24fc_0
   - libspatialindex=2.0.0=he02047a_0
   - libsqlite=3.47.0=hadc24fc_1
-  - libssh2=1.11.0=h0841786_0
+  - libssh2=1.11.1=hf672d98_0
   - libstdcxx=14.2.0=hc0a3c3a_1
   - libstdcxx-ng=14.2.0=h4852527_1
   - libtiff=4.7.0=he137b08_1
@@ -102,9 +101,9 @@ dependencies:
   - llvm-openmp=19.1.4=h024ca30_0
   - llvmlite=0.43.0=py310h1a6248f_1
   - locket=1.0.0=pyhd8ed1ab_0
-  - markupsafe=3.0.2=py310h89163eb_0
+  - markupsafe=3.0.2=py310h89163eb_1
   - matplotlib-base=3.8.4=py310hef631a5_2
-  - mccabe=0.7.0=pyhd8ed1ab_0
+  - mccabe=0.7.0=pyhd8ed1ab_1
   - mkl=2023.2.0=h84fe81f_50496
   - msgpack-python=1.1.0=py310h3788b33_0
   - munkres=1.1.4=pyh9f0ad1d_0
@@ -114,41 +113,41 @@ dependencies:
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.2=h488ebb8_0
   - openssl=3.4.0=hb9d3cd8_0
-  - packaging=24.2=pyhff2d567_1
+  - packaging=24.2=pyhd8ed1ab_2
   - pandas=2.2.3=py310h5eaa309_1
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
   - pip=24.3.1=pyh8b19718_0
-  - platformdirs=4.3.6=pyhd8ed1ab_0
-  - pluggy=1.5.0=pyhd8ed1ab_0
+  - platformdirs=4.3.6=pyhd8ed1ab_1
+  - pluggy=1.5.0=pyhd8ed1ab_1
   - psutil=6.1.0=py310ha75aee5_0
   - pthread-stubs=0.4=hb9d3cd8_1002
-  - pycparser=2.22=pyhd8ed1ab_0
+  - pycparser=2.22=pyh29332c3_1
   - pydantic=2.5.3=pyhd8ed1ab_0
   - pydantic-core=2.14.6=py310hcb5633a_1
   - pydiso=0.1.2=py310h7b68af5_0
-  - pygments=2.18.0=pyhd8ed1ab_0
-  - pylint=3.3.1=pyhd8ed1ab_0
+  - pygments=2.18.0=pyhd8ed1ab_1
+  - pylint=3.3.2=pyhd8ed1ab_1
   - pymatsolver=0.2.0=ha770c72_3
   - pymatsolver-base=0.2.0=pyh44b312d_3
-  - pyparsing=3.2.0=pyhd8ed1ab_1
-  - pysocks=1.7.1=pyha2e5f31_6
-  - pytest=8.3.3=pyhd8ed1ab_0
-  - pytest-cov=6.0.0=pyhd8ed1ab_0
+  - pyparsing=3.2.0=pyhd8ed1ab_2
+  - pysocks=1.7.1=pyha55dd90_7
+  - pytest=8.3.4=pyhd8ed1ab_1
+  - pytest-cov=6.0.0=pyhd8ed1ab_1
   - python=3.10.15=h4a871b0_2_cpython
-  - python-dateutil=2.9.0.post0=pyhff2d567_0
+  - python-dateutil=2.9.0.post0=pyhff2d567_1
   - python-tzdata=2023.4=pyhd8ed1ab_0
   - python_abi=3.10=5_cp310
   - pytz=2024.1=pyhd8ed1ab_0
   - pyyaml=6.0.2=py310ha75aee5_1
   - readline=8.2=h8228510_1
   - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_0
-  - requests=2.32.3=pyhd8ed1ab_0
+  - requests=2.32.3=pyhd8ed1ab_1
   - rtree=1.2.0=py310haf1e407_1
   - scikit-learn=1.4.2=py310h981052a_1
   - scipy=1.14.1=py310hfcf56fc_1
-  - setuptools=75.5.0=pyhff2d567_0
-  - six=1.16.0=pyh6c4a22f_0
+  - setuptools=75.6.0=pyhff2d567_1
+  - six=1.16.0=pyhd8ed1ab_1
   - snowballstemmer=2.2.0=pyhd8ed1ab_0
   - sortedcontainers=2.4.0=pyhd8ed1ab_0
   - sphinx=5.3.0=pyhd8ed1ab_0
@@ -163,34 +162,34 @@ dependencies:
   - threadpoolctl=3.3.0=pyhc1e730c_0
   - tk=8.6.13=noxft_h4845f30_101
   - toml=0.10.2=pyhd8ed1ab_0
-  - tomli=2.1.0=pyhff2d567_0
-  - tomlkit=0.13.2=pyha770c72_0
+  - tomli=2.2.1=pyhd8ed1ab_1
+  - tomlkit=0.13.2=pyha770c72_1
   - toolz=1.0.0=pyhd8ed1ab_0
-  - tornado=6.4.1=py310ha75aee5_1
-  - tqdm=4.67.0=pyhd8ed1ab_0
+  - tornado=6.4.2=py310ha75aee5_0
+  - tqdm=4.67.1=pyhd8ed1ab_0
   - trimesh=4.1.8=pyhd8ed1ab_0
-  - typing-extensions=4.12.2=hd8ed1ab_0
-  - typing_extensions=4.12.2=pyha770c72_0
+  - typing-extensions=4.12.2=hd8ed1ab_1
+  - typing_extensions=4.12.2=pyha770c72_1
   - tzdata=2024b=hc8b5060_0
   - unicodedata2=15.1.0=py310ha75aee5_1
-  - urllib3=2.2.3=pyhd8ed1ab_0
-  - wheel=0.45.0=pyhd8ed1ab_0
+  - urllib3=2.2.3=pyhd8ed1ab_1
+  - wheel=0.45.1=pyhd8ed1ab_1
   - xorg-libxau=1.0.11=hb9d3cd8_1
   - xorg-libxdmcp=1.1.5=hb9d3cd8_0
   - xz=5.2.6=h166bdaf_0
   - yaml=0.2.5=h7f98852_2
   - zarr=2.14.2=pyhd8ed1ab_0
-  - zict=3.0.0=pyhd8ed1ab_0
-  - zipp=3.21.0=pyhd8ed1ab_0
+  - zict=3.0.0=pyhd8ed1ab_1
+  - zipp=3.21.0=pyhd8ed1ab_1
   - zstandard=0.23.0=py310ha39cb0e_1
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
-      - geoapps-utils == 0.4.0b1 --hash=sha256:9d5fa21872653c287e71e9b9f01beda9a2b85e5f9d974c1b04433a8081d0e6c2
-      - geoh5py == 0.10.0b2 --hash=sha256:7983aa0105523e2ad206d04680259acb2af8e20d985e1f0c2abafb91caee2251
-      - mira-simpeg == 0.21.2.1b2 --hash=sha256:c708a0140738a701df67c2ca540f0aaacf9b034a376d7d2d689f588ab6d6e45a
-      - octree-creation-app == 0.2.0b1 --hash=sha256:76075c147122cd2c7f282c799ea456f161d72253d8e6ffdc528fbb4cc28088a3
-      - param-sweeps == 0.2.0b1 --hash=sha256:a6a7448f67b5c20f93f97f32e4599afe7ab6d874bed01e909665e9dd2190a946
-      - simpeg-drivers == 0.2.0b2 --hash=sha256:13c13c98dbd3e01352d71c7f4e94504bd6528b47581401a7c2450de07ec56005
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@dfadf196e7d21ad42bbdb5786c0a52696a467a9c
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@58c8d832c1a5afcb083cb36b9de9d3a985fd3d81
+      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@59133afc4586f2924236098f5f001d402f162667
+      - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@2bf58535d1033dec73fdbe3d807343e44723cd25
+      - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@644febfba1e81b1777a8ebf86744541c8e1fce09
+      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@8f78925217ff9b03b6fcf6b51f699689ad326c0e
 
 variables:
   KMP_WARNINGS: 0