Merge pull request #564 from MiraGeoscience/GEOPY-74

GEOPY-74
MiraGeoscience · Jun 7, 2023 · 96575c4 · 96575c4
2 parents 6241ab6 + 684f035
commit 96575c4
Show file tree

Hide file tree

Showing 60 changed files with 770 additions and 870 deletions.
diff --git a/conda-py-3.10-lock.yml b/conda-py-3.10-lock.yml
diff --git a/conda-py-3.9-lock.yml b/conda-py-3.9-lock.yml
diff --git a/environments/conda-py-3.10-linux-64-dev.lock.yml b/environments/conda-py-3.10-linux-64-dev.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 954354e18d30299c48fe07db5a5acd0f439be1c8b6c8f3de89f2d8d93908c8c2
+# input_hash: 85b9a66f4fc3d283e9655bf8f2fa0d528fe5f80131489fa30bf22dfbe72ba759
 
 channels:
   - conda-forge
@@ -58,7 +58,7 @@ dependencies:
   - libzopfli=1.0.3=h9c3ff4c_0
   - lz4-c=1.9.4=hcb278e6_0
   - mpg123=1.31.3=hcb278e6_0
-  - ncurses=6.3=h27087fc_1
+  - ncurses=6.4=hcb278e6_0
   - nspr=4.35=h27087fc_0
   - openssl=3.1.1=hd590300_1
   - pixman=0.40.0=h36c2ea0_0
@@ -163,7 +163,6 @@ dependencies:
   - flit-core=3.9.0=pyhd8ed1ab_0
   - fontconfig=2.14.2=h14ed4e7_0
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - future=0.18.3=pyhd8ed1ab_0
   - glib-tools=2.76.3=hfc55251_0
   - idna=3.4=pyhd8ed1ab_0
   - iniconfig=2.0.0=pyhd8ed1ab_0
@@ -286,7 +285,7 @@ dependencies:
   - tinycss2=1.2.1=pyhd8ed1ab_0
   - tqdm=4.65.0=pyhd8ed1ab_1
   - typing-extensions=4.6.3=hd8ed1ab_0
-  - urllib3=2.0.2=pyhd8ed1ab_0
+  - urllib3=2.0.3=pyhd8ed1ab_0
   - werkzeug=2.3.4=pyhd8ed1ab_0
   - xerces-c=3.2.4=h8d71039_2
   - xorg-libxcomposite=0.4.6=h0b41bf4_1
@@ -349,19 +348,18 @@ dependencies:
   - scipy=1.10.1=py310ha4c1d20_3
   - shapely=2.0.1=py310h056c13c_1
   - vectormath=0.2.2=py_0
-  - discretize=0.7.4=py310hc4a4660_0
+  - discretize=0.8.3=py310h5a539fb_0
   - empymod=2.2.2=pyhd8ed1ab_0
   - fiona=1.9.3=py310ha325b7b_0
   - ipykernel=6.23.1=pyh210e3f2_0
   - matplotlib-base=3.7.1=py310he60537e_0
   - nbconvert-core=7.4.0=pyhd8ed1ab_0
-  - properties=0.6.1=py_0
   - pydiso=0.0.3=py310h1dd1467_4
   - pyqtwebengine=5.15.7=py310h1165ae2_3
   - scikit-learn=1.2.2=py310hf7d194e_2
   - tifffile=2023.4.12=pyhd8ed1ab_0
   - zarr=2.14.2=pyhd8ed1ab_0
-  - geoana=0.0.6=py_1
+  - geoana=0.4.0=py310hbf28c38_1
   - jupyter-dash=0.4.2=pyhd8ed1ab_1
   - jupyter_server=1.23.6=pyhd8ed1ab_0
   - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0
@@ -376,10 +374,11 @@ dependencies:
   - ipyfilechooser=0.6.0=pyhd8ed1ab_0
   - pip:
     - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
-    - simpeg-archive === 0.9.1.dev5
+    - properties === 0.6.1
     - mira-omf === 3.0.0
-    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip
+    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip
     - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
+    - simpeg-archive === 0.9.1.dev5
 
 variables:
   KMP_WARNINGS: 0
diff --git a/environments/conda-py-3.10-linux-64.lock.yml b/environments/conda-py-3.10-linux-64.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 954354e18d30299c48fe07db5a5acd0f439be1c8b6c8f3de89f2d8d93908c8c2
+# input_hash: 85b9a66f4fc3d283e9655bf8f2fa0d528fe5f80131489fa30bf22dfbe72ba759
 
 channels:
   - conda-forge
@@ -58,7 +58,7 @@ dependencies:
   - libzopfli=1.0.3=h9c3ff4c_0
   - lz4-c=1.9.4=hcb278e6_0
   - mpg123=1.31.3=hcb278e6_0
-  - ncurses=6.3=h27087fc_1
+  - ncurses=6.4=hcb278e6_0
   - nspr=4.35=h27087fc_0
   - openssl=3.1.1=hd590300_1
   - pixman=0.40.0=h36c2ea0_0
@@ -160,7 +160,6 @@ dependencies:
   - flit-core=3.9.0=pyhd8ed1ab_0
   - fontconfig=2.14.2=h14ed4e7_0
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - future=0.18.3=pyhd8ed1ab_0
   - glib-tools=2.76.3=hfc55251_0
   - idna=3.4=pyhd8ed1ab_0
   - ipython_genutils=0.2.0=py_1
@@ -271,7 +270,7 @@ dependencies:
   - tinycss2=1.2.1=pyhd8ed1ab_0
   - tqdm=4.65.0=pyhd8ed1ab_1
   - typing-extensions=4.6.3=hd8ed1ab_0
-  - urllib3=2.0.2=pyhd8ed1ab_0
+  - urllib3=2.0.3=pyhd8ed1ab_0
   - werkzeug=2.3.4=pyhd8ed1ab_0
   - xerces-c=3.2.4=h8d71039_2
   - xorg-libxcomposite=0.4.6=h0b41bf4_1
@@ -330,19 +329,18 @@ dependencies:
   - scipy=1.10.1=py310ha4c1d20_3
   - shapely=2.0.1=py310h056c13c_1
   - vectormath=0.2.2=py_0
-  - discretize=0.7.4=py310hc4a4660_0
+  - discretize=0.8.3=py310h5a539fb_0
   - empymod=2.2.2=pyhd8ed1ab_0
   - fiona=1.9.3=py310ha325b7b_0
   - ipykernel=6.23.1=pyh210e3f2_0
   - matplotlib-base=3.7.1=py310he60537e_0
   - nbconvert-core=7.4.0=pyhd8ed1ab_0
-  - properties=0.6.1=py_0
   - pydiso=0.0.3=py310h1dd1467_4
   - pyqtwebengine=5.15.7=py310h1165ae2_3
   - scikit-learn=1.2.2=py310hf7d194e_2
   - tifffile=2023.4.12=pyhd8ed1ab_0
   - zarr=2.14.2=pyhd8ed1ab_0
-  - geoana=0.0.6=py_1
+  - geoana=0.4.0=py310hbf28c38_1
   - jupyter-dash=0.4.2=pyhd8ed1ab_1
   - jupyter_server=1.23.6=pyhd8ed1ab_0
   - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0
@@ -357,10 +355,11 @@ dependencies:
   - ipyfilechooser=0.6.0=pyhd8ed1ab_0
   - pip:
     - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
-    - simpeg-archive === 0.9.1.dev5
+    - properties === 0.6.1
     - mira-omf === 3.0.0
-    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip
+    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip
     - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
+    - simpeg-archive === 0.9.1.dev5
 
 variables:
   KMP_WARNINGS: 0
diff --git a/environments/conda-py-3.10-osx-64-dev.lock.yml b/environments/conda-py-3.10-osx-64-dev.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: osx-64
-# input_hash: 5177cd22bcb65742670525ad36335f58c72d94b987b5db6286506b03d8b6e090
+# input_hash: 3364486d7540ca0316edd6efc9ddb459e5cfd2a032b798621f2869c6f4db1f93
 
 channels:
   - conda-forge
@@ -32,7 +32,7 @@ dependencies:
   - libwebp-base=1.3.0=hb7f2c08_0
   - libzlib=1.2.13=hfd90126_4
   - llvm-openmp=16.0.5=hff08bdf_0
-  - ncurses=6.3=h96cf925_1
+  - ncurses=6.4=hf0c8a7f_0
   - pandoc=2.19.2=h694c41f_2
   - pixman=0.40.0=hbcb3906_0
   - poppler-data=0.4.12=hd8ed1ab_0
@@ -125,7 +125,6 @@ dependencies:
   - flit-core=3.9.0=pyhd8ed1ab_0
   - fontconfig=2.14.2=h5bb23bf_0
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - future=0.18.3=pyhd8ed1ab_0
   - glib-tools=2.76.3=h7d26f99_0
   - idna=3.4=pyhd8ed1ab_0
   - iniconfig=2.0.0=pyhd8ed1ab_0
@@ -235,15 +234,15 @@ dependencies:
   - plotly=5.13.1=pyhd8ed1ab_0
   - postgresql=15.3=hb6430be_0
   - proj=9.2.0=hf909084_0
-  - pyobjc-core=9.1.1=py310h4f19300_0
+  - pyobjc-core=9.2=py310hef2d279_0
   - python-dateutil=2.8.2=pyhd8ed1ab_0
   - retrying=1.3.3=py_2
   - sip=6.7.9=py310h9e9d8ca_0
   - terminado=0.17.1=pyhd1c38e8_0
   - tinycss2=1.2.1=pyhd8ed1ab_0
   - tqdm=4.65.0=pyhd8ed1ab_1
   - typing-extensions=4.6.3=hd8ed1ab_0
-  - urllib3=2.0.2=pyhd8ed1ab_0
+  - urllib3=2.0.3=pyhd8ed1ab_0
   - werkzeug=2.3.4=pyhd8ed1ab_0
   - xerces-c=3.2.4=h90c7484_2
   - argon2-cffi-bindings=21.2.0=py310h90acd4f_3
@@ -259,7 +258,7 @@ dependencies:
   - numpy=1.23.5=py310h1b7c290_0
   - platformdirs=3.5.1=pyhd8ed1ab_0
   - poppler=23.05.0=he041c3a_1
-  - pyobjc-framework-cocoa=9.1.1=py310h4f19300_0
+  - pyobjc-framework-cocoa=9.2=py310hef2d279_0
   - pyqt5-sip=12.11.0=py310h415000c_3
   - pytest=7.3.1=pyhd8ed1ab_0
   - requests=2.31.0=pyhd8ed1ab_0
@@ -293,15 +292,13 @@ dependencies:
   - matplotlib-base=3.7.1=py310he725631_0
   - nbformat=5.9.0=pyhd8ed1ab_0
   - prompt_toolkit=3.0.38=hd8ed1ab_0
-  - properties=0.6.1=py_0
   - qt-main=5.15.8=h23c57ac_13
   - scipy=1.10.1=py310h3900cf1_3
   - tifffile=2023.4.12=pyhd8ed1ab_0
   - zarr=2.14.2=pyhd8ed1ab_0
-  - discretize=0.7.4=py310h84c6d00_0
+  - discretize=0.8.3=py310h3e792ce_0
   - empymod=2.2.2=pyhd8ed1ab_0
   - fiona=1.9.3=py310h3963e5c_0
-  - geoana=0.0.6=py_1
   - ipython=8.14.0=pyhd1c38e8_0
   - nbclient=0.8.0=pyhd8ed1ab_0
   - pydiso=0.0.3=py310he105d0e_4
@@ -310,6 +307,7 @@ dependencies:
   - qt-webengine=5.15.8=h66b1b81_1
   - scikit-image=0.19.3=py310hecf8f37_2
   - scikit-learn=1.2.2=py310hd2c063c_2
+  - geoana=0.4.0=py310ha23aa8a_1
   - ipykernel=6.23.1=pyh736e0ef_0
   - nbconvert-core=7.4.0=pyhd8ed1ab_0
   - pymatsolver=0.2.0=pyhd8ed1ab_0
@@ -326,10 +324,11 @@ dependencies:
   - ipyfilechooser=0.6.0=pyhd8ed1ab_0
   - pip:
     - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
-    - simpeg-archive === 0.9.1.dev5
+    - properties === 0.6.1
     - mira-omf === 3.0.0
-    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip
+    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip
     - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
+    - simpeg-archive === 0.9.1.dev5
 
 variables:
   KMP_WARNINGS: 0
diff --git a/environments/conda-py-3.10-osx-64.lock.yml b/environments/conda-py-3.10-osx-64.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: osx-64
-# input_hash: 5177cd22bcb65742670525ad36335f58c72d94b987b5db6286506b03d8b6e090
+# input_hash: 3364486d7540ca0316edd6efc9ddb459e5cfd2a032b798621f2869c6f4db1f93
 
 channels:
   - conda-forge
@@ -32,7 +32,7 @@ dependencies:
   - libwebp-base=1.3.0=hb7f2c08_0
   - libzlib=1.2.13=hfd90126_4
   - llvm-openmp=16.0.5=hff08bdf_0
-  - ncurses=6.3=h96cf925_1
+  - ncurses=6.4=hf0c8a7f_0
   - pandoc=2.19.2=h694c41f_2
   - pixman=0.40.0=hbcb3906_0
   - poppler-data=0.4.12=hd8ed1ab_0
@@ -122,7 +122,6 @@ dependencies:
   - flit-core=3.9.0=pyhd8ed1ab_0
   - fontconfig=2.14.2=h5bb23bf_0
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - future=0.18.3=pyhd8ed1ab_0
   - glib-tools=2.76.3=h7d26f99_0
   - idna=3.4=pyhd8ed1ab_0
   - ipython_genutils=0.2.0=py_1
@@ -220,15 +219,15 @@ dependencies:
   - plotly=5.13.1=pyhd8ed1ab_0
   - postgresql=15.3=hb6430be_0
   - proj=9.2.0=hf909084_0
-  - pyobjc-core=9.1.1=py310h4f19300_0
+  - pyobjc-core=9.2=py310hef2d279_0
   - python-dateutil=2.8.2=pyhd8ed1ab_0
   - retrying=1.3.3=py_2
   - sip=6.7.9=py310h9e9d8ca_0
   - terminado=0.17.1=pyhd1c38e8_0
   - tinycss2=1.2.1=pyhd8ed1ab_0
   - tqdm=4.65.0=pyhd8ed1ab_1
   - typing-extensions=4.6.3=hd8ed1ab_0
-  - urllib3=2.0.2=pyhd8ed1ab_0
+  - urllib3=2.0.3=pyhd8ed1ab_0
   - werkzeug=2.3.4=pyhd8ed1ab_0
   - xerces-c=3.2.4=h90c7484_2
   - argon2-cffi-bindings=21.2.0=py310h90acd4f_3
@@ -243,7 +242,7 @@ dependencies:
   - numpy=1.23.5=py310h1b7c290_0
   - platformdirs=3.5.1=pyhd8ed1ab_0
   - poppler=23.05.0=he041c3a_1
-  - pyobjc-framework-cocoa=9.1.1=py310h4f19300_0
+  - pyobjc-framework-cocoa=9.2=py310hef2d279_0
   - pyqt5-sip=12.11.0=py310h415000c_3
   - requests=2.31.0=pyhd8ed1ab_0
   - stack_data=0.6.2=pyhd8ed1ab_0
@@ -274,15 +273,13 @@ dependencies:
   - matplotlib-base=3.7.1=py310he725631_0
   - nbformat=5.9.0=pyhd8ed1ab_0
   - prompt_toolkit=3.0.38=hd8ed1ab_0
-  - properties=0.6.1=py_0
   - qt-main=5.15.8=h23c57ac_13
   - scipy=1.10.1=py310h3900cf1_3
   - tifffile=2023.4.12=pyhd8ed1ab_0
   - zarr=2.14.2=pyhd8ed1ab_0
-  - discretize=0.7.4=py310h84c6d00_0
+  - discretize=0.8.3=py310h3e792ce_0
   - empymod=2.2.2=pyhd8ed1ab_0
   - fiona=1.9.3=py310h3963e5c_0
-  - geoana=0.0.6=py_1
   - ipython=8.14.0=pyhd1c38e8_0
   - nbclient=0.8.0=pyhd8ed1ab_0
   - pydiso=0.0.3=py310he105d0e_4
@@ -291,6 +288,7 @@ dependencies:
   - qt-webengine=5.15.8=h66b1b81_1
   - scikit-image=0.19.3=py310hecf8f37_2
   - scikit-learn=1.2.2=py310hd2c063c_2
+  - geoana=0.4.0=py310ha23aa8a_1
   - ipykernel=6.23.1=pyh736e0ef_0
   - nbconvert-core=7.4.0=pyhd8ed1ab_0
   - pymatsolver=0.2.0=pyhd8ed1ab_0
@@ -307,10 +305,11 @@ dependencies:
   - ipyfilechooser=0.6.0=pyhd8ed1ab_0
   - pip:
     - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
-    - simpeg-archive === 0.9.1.dev5
+    - properties === 0.6.1
     - mira-omf === 3.0.0
-    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip
+    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip
     - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
+    - simpeg-archive === 0.9.1.dev5
 
 variables:
   KMP_WARNINGS: 0
diff --git a/environments/conda-py-3.10-win-64-dev.lock.yml b/environments/conda-py-3.10-win-64-dev.lock.yml
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: ef7deb91a223dce68810bded237458971c4f040f3dba90c49f43ddcf543f9c00
+# input_hash: 69bd12ceccb15cadcc8eb502aed53328f8120bb7af72994ff1cde771e7e81436
 
 channels:
   - conda-forge
@@ -109,7 +109,6 @@ dependencies:
   - flit-core=3.9.0=pyhd8ed1ab_0
   - freetype=2.12.1=h546665d_1
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - future=0.18.3=pyhd8ed1ab_0
   - idna=3.4=pyhd8ed1ab_0
   - iniconfig=2.0.0=pyhd8ed1ab_0
   - ipython_genutils=0.2.0=py_1
@@ -249,7 +248,7 @@ dependencies:
   - pytest=7.3.1=pyhd8ed1ab_0
   - stack_data=0.6.2=pyhd8ed1ab_0
   - tiledb=2.13.2=h3132609_0
-  - urllib3=2.0.2=pyhd8ed1ab_0
+  - urllib3=2.0.3=pyhd8ed1ab_0
   - wcwidth=0.2.6=pyhd8ed1ab_0
   - argon2-cffi=21.3.0=pyhd8ed1ab_0
   - dash=2.10.2=pyhd8ed1ab_0
@@ -292,20 +291,19 @@ dependencies:
   - scipy=1.10.1=py310h578b7cb_3
   - shapely=2.0.1=py310h91617ff_1
   - vectormath=0.2.2=py_0
-  - discretize=0.7.4=py310hc781a3c_0
+  - discretize=0.8.3=py310h220cb41_0
   - empymod=2.2.2=pyhd8ed1ab_0
   - fiona=1.9.3=py310h4a685fe_0
   - jupyter-dash=0.4.2=pyhd8ed1ab_1
   - jupyter_server=1.23.6=pyhd8ed1ab_0
   - matplotlib-base=3.7.1=py310h51140c5_0
   - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0
-  - properties=0.6.1=py_0
   - pydiso=0.0.3=py310h847dae0_4
   - pyqtwebengine=5.15.7=py310he49db7d_3
   - scikit-learn=1.2.2=py310hd266714_2
   - tifffile=2023.4.12=pyhd8ed1ab_0
   - zarr=2.14.2=pyhd8ed1ab_0
-  - geoana=0.0.6=py_1
+  - geoana=0.4.0=py310h232114e_1
   - nbconvert=7.4.0=pyhd8ed1ab_0
   - notebook-shim=0.2.3=pyhd8ed1ab_0
   - pymatsolver=0.2.0=pyhd8ed1ab_0
@@ -317,10 +315,11 @@ dependencies:
   - ipyfilechooser=0.6.0=pyhd8ed1ab_0
   - pip:
     - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
-    - simpeg-archive === 0.9.1.dev5
+    - properties === 0.6.1
     - mira-omf === 3.0.0
-    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip
+    - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip
     - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
+    - simpeg-archive === 0.9.1.dev5
 
 variables:
   KMP_WARNINGS: 0