Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GEOPY-1569: Investigate conda_environment saved on geoapps run of curve_apps #703

Merged
merged 12 commits into from
Jul 10, 2024
190 changes: 110 additions & 80 deletions environments/py-3.10-linux-64-dev.conda.lock.yml

Large diffs are not rendered by default.

184 changes: 108 additions & 76 deletions environments/py-3.10-linux-64.conda.lock.yml

Large diffs are not rendered by default.

164 changes: 97 additions & 67 deletions environments/py-3.10-win-64-dev.conda.lock.yml

Large diffs are not rendered by default.

158 changes: 95 additions & 63 deletions environments/py-3.10-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 5e905a0b8d525d25f1f21e5c672dacd8356250f18211cdb352d277543a21f9de
# input_hash: 9a736a3c4ac16ad1a0e9ac44cd1058ad98cefa9840c93991b95e51b1dcb2c369

channels:
- conda-forge
dependencies:
- annotated-types=0.7.0=pyhd8ed1ab_0
- ansi2html=1.9.1=py310h5588dad_0
- ansi2html=1.9.2=py310h5588dad_0
- anyio=4.4.0=pyhd8ed1ab_0
- aom=3.7.1=h63175ca_0
- argon2-cffi=23.1.0=pyhd8ed1ab_0
- argon2-cffi-bindings=21.2.0=py310h8d17308_4
- asciitree=0.3.3=py_2
- arrow=1.3.0=pyhd8ed1ab_0
- asttokens=2.4.1=pyhd8ed1ab_0
- async-lru=2.0.4=pyhd8ed1ab_0
- attrs=23.2.0=pyh71513ae_0
- babel=2.14.0=pyhd8ed1ab_0
- beautifulsoup4=4.12.3=pyha770c72_0
- bleach=6.1.0=pyhd8ed1ab_0
- blinker=1.8.2=pyhd8ed1ab_0
Expand All @@ -23,11 +26,11 @@ dependencies:
- bzip2=1.0.8=hcfcfb64_5
- c-ares=1.28.1=hcfcfb64_0
- c-blosc2=2.14.3=h183a6f4_0
- ca-certificates=2024.6.2=h56e8100_0
- ca-certificates=2024.7.4=h56e8100_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- cairo=1.18.0=h1fef639_0
- certifi=2024.6.2=pyhd8ed1ab_0
- certifi=2024.7.4=pyhd8ed1ab_0
- cffi=1.16.0=py310h8d17308_0
- cfitsio=4.2.0=h9ebe7e4_0
- charls=2.4.2=h1537add_0
Expand All @@ -43,19 +46,17 @@ dependencies:
- cytoolz=0.12.3=py310h8d17308_0
- dash=2.12.1=pyhd8ed1ab_0
- dash-daq=0.5.0=pyh9f0ad1d_1
- dask-core=2022.10.2=pyhd8ed1ab_0
- dask-core=2024.6.2=pyhd8ed1ab_0
- dav1d=1.2.1=hcfcfb64_0
- debugpy=1.8.1=py310h00ffb61_0
- debugpy=1.8.2=py310h9e98ed7_0
- decorator=5.1.1=pyhd8ed1ab_0
- defusedxml=0.7.1=pyhd8ed1ab_0
- discretize=0.10.0=py310h4856b71_1
- distributed=2022.10.2=pyhd8ed1ab_0
- empymod=2.2.2=pyhd8ed1ab_0
- distributed=2024.6.2=pyhd8ed1ab_0
- entrypoints=0.4=pyhd8ed1ab_0
- exceptiongroup=1.2.0=pyhd8ed1ab_2
- executing=2.0.1=pyhd8ed1ab_0
- expat=2.6.2=h63175ca_0
- fasteners=0.17.3=pyhd8ed1ab_0
- fiona=1.9.3=py310h4a685fe_0
- flask=3.0.3=pyhd8ed1ab_0
- font-ttf-dejavu-sans-mono=2.37=hab24e00_0
Expand All @@ -65,12 +66,13 @@ dependencies:
- fontconfig=2.14.2=hbde0cde_0
- fonts-conda-ecosystem=1=0
- fonts-conda-forge=1=0
- fonttools=4.53.0=py310ha8f682b_0
- fonttools=4.53.1=py310ha8f682b_0
- fqdn=1.5.1=pyhd8ed1ab_0
- freetype=2.12.1=hdaf720e_2
- freexl=2.0.0=h8276f4a_0
- fsspec=2022.11.0=pyhd8ed1ab_0
- gdal=3.6.4=py310haa9213b_22
- geoana=0.4.0=py310h232114e_1
- geoana=0.5.0=py310h4856b71_4
- geos=3.12.0=h1537add_0
- geotiff=1.7.1=hcf4a93f_14
- gettext=0.22.5=h5728263_2
Expand All @@ -80,35 +82,52 @@ dependencies:
- glib-tools=2.78.1=h12be248_0
- gst-plugins-base=1.22.7=h001b923_0
- gstreamer=1.22.7=hb4038d2_0
- h11=0.14.0=pyhd8ed1ab_0
- h2=4.1.0=pyhd8ed1ab_0
- h5py=3.11.0=nompi_py310h2b0be38_102
- hdf4=4.2.15=h5557f11_7
- hdf5=1.14.3=nompi_h2b43c12_105
- hpack=4.0.0=pyh9f0ad1d_0
- httpcore=1.0.5=pyhd8ed1ab_0
- httpx=0.27.0=pyhd8ed1ab_0
- hyperframe=6.0.1=pyhd8ed1ab_0
- icu=73.2=h63175ca_0
- idna=3.7=pyhd8ed1ab_0
- imagecodecs=2024.1.1=py310h32f22c9_2
- imageio=2.34.1=pyh4b66e23_0
- importlib-metadata=7.2.0=pyha770c72_0
- imageio=2.34.2=pyh12aca89_0
- importlib-metadata=8.0.0=pyha770c72_0
- importlib_metadata=8.0.0=hd8ed1ab_0
- importlib_resources=6.4.0=pyhd8ed1ab_0
- intel-openmp=2023.2.0=h57928b3_50497
- ipyfilechooser=0.6.0=pyhd8ed1ab_0
- ipykernel=6.29.4=pyh4bbf305_0
- ipython=8.21.0=pyh7428d3b_0
- ipykernel=6.29.5=pyh4bbf305_0
- ipython=8.26.0=pyh7428d3b_0
- ipython_genutils=0.2.0=pyhd8ed1ab_1
- ipywidgets=7.8.0=pyhd8ed1ab_0
- ipywidgets=7.8.2=pyhd8ed1ab_0
- isoduration=20.11.0=pyhd8ed1ab_0
- itsdangerous=2.2.0=pyhd8ed1ab_0
- jedi=0.19.1=pyhd8ed1ab_0
- jinja2=3.1.4=pyhd8ed1ab_0
- joblib=1.4.2=pyhd8ed1ab_0
- jsonschema=4.22.0=pyhd8ed1ab_0
- json5=0.9.25=pyhd8ed1ab_0
- jsonpointer=3.0.0=py310h5588dad_0
- jsonschema=4.23.0=pyhd8ed1ab_0
- jsonschema-specifications=2023.12.1=pyhd8ed1ab_0
- jupyter_client=7.3.4=pyhd8ed1ab_0
- jsonschema-with-format-nongpl=4.23.0=hd8ed1ab_0
- jupyter-lsp=2.2.5=pyhd8ed1ab_0
- jupyter_client=8.6.2=pyhd8ed1ab_0
- jupyter_core=5.7.2=py310h5588dad_0
- jupyter_events=0.10.0=pyhd8ed1ab_0
- jupyter_server=2.14.1=pyhd8ed1ab_1
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_0
- jupyterlab=4.2.3=pyhd8ed1ab_0
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_1
- jupyterlab_widgets=1.1.7=pyhd8ed1ab_0
- jupyterlab_server=2.27.2=pyhd8ed1ab_0
- jupyterlab_widgets=1.1.8=pyhd8ed1ab_0
- jxrlib=1.1=hcfcfb64_3
- kealib=1.5.3=h6c43f9b_1
- kiwisolver=1.4.5=py310h232114e_1
- krb5=1.21.2=heb0366b_0
- krb5=1.21.3=hdf4eb48_0
- lazy_loader=0.4=pyhd8ed1ab_0
- lcms2=2.16=h67d730c_0
- lerc=4.0.0=h63175ca_0
Expand All @@ -118,16 +137,17 @@ dependencies:
- libasprintf-devel=0.22.5=h5728263_2
- libavif=1.0.1=h7a9aacb_3
- libblas=3.9.0=20_win64_mkl
- libboost-headers=1.85.0=h57928b3_1
- libboost-headers=1.85.0=h57928b3_2
- libbrotlicommon=1.1.0=hcfcfb64_1
- libbrotlidec=1.1.0=hcfcfb64_1
- libbrotlienc=1.1.0=hcfcfb64_1
- libcblas=3.9.0=20_win64_mkl
- libclang=15.0.7=default_h3a3e6c3_5
- libclang13=15.0.7=default_hf64faad_5
- libcrc32c=1.1.2=h0e60522_0
- libcurl=8.8.0=hd5e4a3a_0
- libcurl=8.8.0=hd5e4a3a_1
- libdeflate=1.19=hcfcfb64_0
- libdlf=0.2.0=pyhd8ed1ab_0
- libexpat=2.6.2=h63175ca_0
- libffi=3.4.2=h8ffe710_5
- libgdal=3.6.4=h8c6448d_22
Expand All @@ -136,15 +156,15 @@ dependencies:
- libglib=2.78.1=he8f3873_0
- libgoogle-cloud=2.12.0=hc7cbac0_5
- libgrpc=1.60.1=h0bf0bfa_0
- libhwloc=2.10.0=default_h8125262_1001
- libhwloc=2.11.0=default_h8125262_1000
- libiconv=1.17=hcfcfb64_2
- libintl=0.22.5=h5728263_2
- libintl-devel=0.22.5=h5728263_2
- libjpeg-turbo=3.0.0=hcfcfb64_1
- libkml=1.3.0=haf3e7a6_1018
- liblapack=3.9.0=20_win64_mkl
- libnetcdf=4.9.2=nompi_h92078aa_114
- libogg=1.3.4=h8ffe710_1
- libogg=1.3.5=h2466b09_0
- libpng=1.6.43=h19919ed_0
- libpq=16.3=hab9416b_0
- libprotobuf=4.25.1=hb8276f3_2
Expand All @@ -164,7 +184,6 @@ dependencies:
- libzip=1.10.1=h1d365fa_3
- libzlib=1.3.1=h2466b09_1
- libzopfli=1.0.3=h0e60522_0
- llvmlite=0.43.0=py310h0288bfe_0
- locket=1.0.0=pyhd8ed1ab_0
- lz4-c=1.9.4=hcfcfb64_0
- m2w64-gcc-libgfortran=5.3.0=6
Expand All @@ -173,7 +192,7 @@ dependencies:
- m2w64-gmp=6.1.0=2
- m2w64-libwinpthread-git=5.0.0.4634.697f757=2
- markupsafe=2.1.5=py310h8d17308_0
- matplotlib-base=3.8.4=py310hadb10a8_2
- matplotlib-base=3.7.3=py310hc9baf74_0
- matplotlib-inline=0.1.7=pyhd8ed1ab_0
- minizip=4.0.6=hb638d1e_0
- mistune=3.0.2=pyhd8ed1ab_0
Expand All @@ -183,21 +202,18 @@ dependencies:
- munch=4.0.0=pyhd8ed1ab_0
- munkres=1.1.4=pyh9f0ad1d_0
- nbclient=0.7.4=pyhd8ed1ab_0
- nbconvert=7.16.4=hd8ed1ab_1
- nbconvert-core=7.16.4=pyhd8ed1ab_1
- nbconvert-pandoc=7.16.4=hd8ed1ab_1
- nbformat=5.10.4=pyhd8ed1ab_0
- nest-asyncio=1.6.0=pyhd8ed1ab_0
- networkx=3.3=pyhd8ed1ab_1
- notebook=6.4.12=pyha770c72_0
- numba=0.60.0=py310h7793332_0
- numcodecs=0.12.1=py310h9e98ed7_1
- numpy=1.23.5=py310h4a8f9c9_0
- notebook=7.2.1=pyhd8ed1ab_0
- notebook-shim=0.2.4=pyhd8ed1ab_0
- numpy=1.26.4=py310hf667824_0
- openjpeg=2.5.2=h3d672ee_0
- openssl=3.3.1=h2466b09_0
- openssl=3.3.1=h2466b09_1
- overrides=7.7.0=pyhd8ed1ab_0
- packaging=24.1=pyhd8ed1ab_0
- pandas=2.2.2=py310hb4db72f_1
- pandoc=3.2=h57928b3_0
- pandocfilters=1.5.0=pyhd8ed1ab_0
- parso=0.8.4=pyhd8ed1ab_0
- partd=1.4.2=pyhd8ed1ab_0
Expand All @@ -216,14 +232,13 @@ dependencies:
- proj=9.3.0=he13c7e8_2
- prometheus_client=0.20.0=pyhd8ed1ab_0
- prompt-toolkit=3.0.47=pyha770c72_0
- properties=0.6.1=py_0
- psutil=5.9.8=py310h8d17308_0
- psutil=6.0.0=py310ha8f682b_0
- pthread-stubs=0.4=hcd874cb_1001
- pthreads-win32=2.9.1=hfa6e2cd_3
- pure_eval=0.2.2=pyhd8ed1ab_0
- pycparser=2.22=pyhd8ed1ab_0
- pydantic=2.5.3=pyhd8ed1ab_0
- pydantic-core=2.14.6=py310h87d50f1_1
- pydantic=2.8.2=pyhd8ed1ab_0
- pydantic-core=2.20.1=py310hc226416_0
- pydiso=0.0.5=py310hafb2880_1
- pymatsolver=0.2.0=ha770c72_3
- pymatsolver-base=0.2.0=pyh44b312d_3
Expand All @@ -236,10 +251,11 @@ dependencies:
- python=3.10.14=h4de0772_0_cpython
- python-dateutil=2.9.0=pyhd8ed1ab_0
- python-fastjsonschema=2.20.0=pyhd8ed1ab_0
- python-json-logger=2.0.7=pyhd8ed1ab_0
- python-tzdata=2023.4=pyhd8ed1ab_0
- python_abi=3.10=4_cp310
- pytz=2024.1=pyhd8ed1ab_0
- pywavelets=1.4.1=py310h3e78b6c_1
- pywavelets=1.6.0=py310hb0944cc_0
- pywin32=306=py310h00ffb61_2
- pywinpty=2.0.13=py310h00ffb61_0
- pyyaml=6.0.1=py310h8d17308_1
Expand All @@ -251,78 +267,94 @@ dependencies:
- referencing=0.35.1=pyhd8ed1ab_0
- requests=2.32.3=pyhd8ed1ab_0
- retrying=1.3.3=py_2
- rpds-py=0.18.1=py310hc226416_0
- rfc3339-validator=0.1.4=pyhd8ed1ab_0
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
- rpds-py=0.19.0=py310hc226416_0
- scikit-image=0.20.0=py310h1c4a608_1
- scikit-learn=1.4.2=py310hf2a6c47_1
- scipy=1.13.1=py310h46043a1_0
- scipy=1.14.0=py310h46043a1_1
- send2trash=1.8.3=pyh5737063_0
- setuptools=70.1.0=pyhd8ed1ab_0
- setuptools=70.1.1=pyhd8ed1ab_0
- shapely=2.0.2=py310h839b4a8_0
- sip=6.7.12=py310h00ffb61_0
- six=1.16.0=pyh6c4a22f_0
- snappy=1.1.10=hfb803bf_1
- sniffio=1.3.1=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_0
- soupsieve=2.5=pyhd8ed1ab_1
- sqlite=3.46.0=h2466b09_0
- stack_data=0.6.2=pyhd8ed1ab_0
- svt-av1=1.7.0=h63175ca_0
- tbb=2021.12.0=hc790b64_1
- tbb=2021.12.0=hc790b64_2
- tblib=3.0.0=pyhd8ed1ab_0
- tenacity=8.4.1=pyhd8ed1ab_0
- tenacity=8.5.0=pyhd8ed1ab_0
- terminado=0.18.1=pyh5737063_0
- threadpoolctl=3.5.0=pyhc1e730c_0
- tifffile=2024.6.18=pyhd8ed1ab_0
- tifffile=2024.7.2=pyhd8ed1ab_0
- tiledb=2.16.3=hbf04793_3
- tinycss2=1.3.0=pyhd8ed1ab_0
- tk=8.6.13=h5226925_1
- toml=0.10.2=pyhd8ed1ab_0
- toolz=0.12.1=pyhd8ed1ab_0
- tornado=6.1=py310he2412df_3
- tornado=6.4.1=py310ha8f682b_0
- tqdm=4.66.4=pyhd8ed1ab_0
- traitlets=5.9.0=pyhd8ed1ab_0
- traitlets=5.14.3=pyhd8ed1ab_0
- types-python-dateutil=2.9.0.20240316=pyhd8ed1ab_0
- typing-extensions=4.12.2=hd8ed1ab_0
- typing_extensions=4.12.2=pyha770c72_0
- typing_utils=0.1.0=pyhd8ed1ab_0
- tzdata=2024a=h0c530f3_0
- ucrt=10.0.22621.0=h57928b3_0
- unicodedata2=15.1.0=py310h8d17308_0
- uri-template=1.3.0=pyhd8ed1ab_0
- uriparser=0.9.8=h5a68840_0
- urllib3=2.2.2=pyhd8ed1ab_0
- utm=0.7.0=pyhd8ed1ab_0
- urllib3=2.2.2=pyhd8ed1ab_1
- vc=14.3=h8a93ad2_20
- vc14_runtime=14.40.33810=ha82c5b3_20
- vectormath=0.2.2=py_0
- vs2015_runtime=14.40.33810=h3bf8584_20
- wcwidth=0.2.13=pyhd8ed1ab_0
- webcolors=24.6.0=pyhd8ed1ab_0
- webencodings=0.5.1=pyhd8ed1ab_2
- websocket-client=1.8.0=pyhd8ed1ab_0
- werkzeug=3.0.3=pyhd8ed1ab_0
- wheel=0.43.0=pyhd8ed1ab_1
- widgetsnbextension=3.6.6=pyhd8ed1ab_0
- widgetsnbextension=3.6.7=pyhd8ed1ab_0
- win_inet_pton=1.1.0=pyhd8ed1ab_6
- winpty=0.4.3=4
- xerces-c=3.2.5=h63175ca_0
- xorg-libxau=1.0.11=hcd874cb_0
- xorg-libxdmcp=1.1.3=hcd874cb_0
- xz=5.2.6=h8d14728_0
- yaml=0.2.5=h8ffe710_2
- zarr=2.14.2=pyhd8ed1ab_0
- zeromq=4.3.5=he1f189c_4
- zfp=1.0.1=h63175ca_0
- zfp=1.0.1=he0c23c2_1
- zict=3.0.0=pyhd8ed1ab_0
- zipp=3.19.2=pyhd8ed1ab_0
- zlib=1.3.1=h2466b09_1
- zlib-ng=2.0.7=hcfcfb64_0
- zstandard=0.22.0=py310he5e10e1_1
- zstd=1.5.6=h0ea2cb4_0
- pip:
- curve-apps @ https://github.com/MiraGeoscience/curve-apps/archive/refs/heads/develop.zip
- geoapps-utils @ https://github.com/MiraGeoscience/geoapps-utils/archive/refs/heads/develop.zip
- geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
- matplotlib === 3.7.5
- mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/develop.zip
- octree-creation-app @ https://github.com/MiraGeoscience/octree-creation-app/archive/refs/heads/develop.zip
- param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
- asciitree === 0.3.3
- curve-apps @ git+https://github.com/MiraGeoscience/curve-apps@ad6bbbc62ebace5510bcb3626decb7a396968765
- empymod === 2.3.1
- fasteners === 0.19
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@03aa505b3957dd543be737d637760dc77a79bec7
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@21ce81d279c206ce0a279377168ce50e0a35d3d2
- llvmlite === 0.43.0
- matplotlib === 3.8.4
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg@b643f1cb9a9fee76b5e4bd7ed4f1b7a65d1646ec
- numba === 0.60.0
- numcodecs === 0.12.1
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@8b0749e6797c393aaa0d79e34ee199708f448175
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@13c05a3d90fcf2bc37f4d752affbda277c61b8b0
- properties === 0.6.1
- scooby === 0.10.0
- simpeg-archive @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/feature/simpeg_archive.zip
- simpeg-drivers @ https://github.com/MiraGeoscience/simpeg-drivers/archive/refs/heads/develop.zip
- surface-apps @ https://github.com/MiraGeoscience/surface-apps/archive/refs/heads/release/0.1.0.zip
- simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers@f538e125f504032b37650f2345bd165a565fbaae
- surface-apps @ git+https://github.com/MiraGeoscience/surface-apps@4dac9d9d9b234b0397a1f2e9ad194d4a19caa0a2
- vectormath === 0.2.2
- zarr === 2.14.2

variables:
KMP_WARNINGS: 0
4 changes: 2 additions & 2 deletions geoapps/clustering/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ def make_scatter_plot(
if indices is not None:
indices = np.array(indices)

if color_maps == "kmeans" and kmeans is not None and kmeans != []:
if color_maps == "kmeans" and kmeans is not None:
# Update color_maps
color_maps = Clustering.update_colormap(n_clusters, color_pickers)
if color_maps is None:
Expand All @@ -848,7 +848,7 @@ def make_scatter_plot(
axes = [x, y, z, color, size]

for i in range(len(axes)):
if axes[i] == "kmeans" and kmeans is not None and kmeans != []:
if axes[i] == "kmeans" and kmeans is not None:
axis_values[i] = PlotData(axes[i], kmeans[indices].astype(float))
elif axes[i] is not None:
axis_name = Clustering.get_name(axes[i], channel_options)
Expand Down
1 change: 1 addition & 0 deletions geoapps/contours/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ def trigger_click(self, _):
)

param_dict["geoh5"] = new_workspace
param_dict["conda_environment"] = "geoapps"

if self.live_link.value:
param_dict["monitoring_directory"] = self.monitoring_directory
Expand Down
Loading
Loading