Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5961372
Start deprecating InputFile
domfournier Mar 23, 2026
694b5b1
Merge branch 'develop' into GEOPY-2739
domfournier Mar 31, 2026
434493a
Start removing InputFile from mechanics
domfournier Mar 31, 2026
d05d6ce
Re-trigger
domfournier Mar 31, 2026
bebadf2
Update run functions
domfournier Apr 2, 2026
39f3306
Potential fix for pull request finding 'Unused import'
domfournier Apr 2, 2026
4276096
Remove test for drepcated Params class
domfournier Apr 2, 2026
e60ff45
Merge branch 'GEOPY-2739' of https://github.com/MiraGeoscience/geoapp…
domfournier Apr 2, 2026
30ba1c3
Remove more ref to TestParams
domfournier Apr 2, 2026
a5a0192
Re-lock on geoh5py branch
domfournier Apr 2, 2026
e60c41f
Apply suggestion from @Copilot
domfournier Apr 2, 2026
b11b6ed
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 2, 2026
efdf62a
Fixes from copilot
domfournier Apr 2, 2026
b192fab
Update geoapps_utils/base.py
domfournier Apr 2, 2026
bab0d64
Simplify conversion InputFile -> UIjson
domfournier Apr 2, 2026
11b1282
Merge branch 'GEOPY-2739' of https://github.com/MiraGeoscience/geoapp…
domfournier Apr 2, 2026
a9e7bec
do all the operations under the same context
Apr 3, 2026
92c740b
Merge pull request #191 from MiraGeoscience/GEOPY-2739-Mat
domfournier Apr 3, 2026
0e069e6
Merge branch 'develop' into GEOPY-2739
domfournier Apr 7, 2026
c6305f2
Move create_uijson in conftest. re-use in tests
domfournier Apr 8, 2026
ccd9d5a
Remove Params completely from tests
domfournier Apr 8, 2026
e160c56
INcrease coverage
domfournier Apr 8, 2026
1ad02a4
Removal of InputFile from sweep
domfournier Apr 8, 2026
2fcb67f
Small increase to coverage
domfournier Apr 8, 2026
1589cd5
Enforce input for build
domfournier Apr 8, 2026
aeece5e
Fix test
domfournier Apr 8, 2026
0503172
pylint fix
domfournier Apr 8, 2026
51c1155
Re-lock
domfournier Apr 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 56 additions & 46 deletions environments/py-3.12-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: a88138472d5cf703033124b201e9efe5ddfd314346943b826d2af3fe2a691cdf
# input_hash: c982be9f74d2279ae1a59209179f62946fcde9b6890aa1eaf6645898d3b782cc

channels:
- conda-forge
Expand All @@ -9,100 +9,110 @@ dependencies:
- _openmp_mutex=4.5=20_gnu
- annotated-types=0.7.0=pyhd8ed1ab_1
- astroid=4.0.4=py312h7900ff3_0
- aws-c-auth=0.10.1=h2d2dd48_2
- aws-c-cal=0.9.13=h2c9d079_1
- aws-c-common=0.12.6=hb03c661_0
- aws-c-compression=0.3.2=h8b1a151_0
- aws-c-http=0.10.12=h4bacb7b_1
- aws-c-io=0.26.3=hc87160b_0
- aws-c-s3=0.11.5=h6d69fc9_5
- aws-c-sdkutils=0.2.4=h8b1a151_4
- aws-checksums=0.2.10=h8b1a151_0
- brotli=1.2.0=hed03a55_1
- brotli-bin=1.2.0=hb03c661_1
- bzip2=1.0.8=hda65f42_9
- c-ares=1.34.6=hb03c661_0
- ca-certificates=2026.1.4=hbd8a1cb_0
- ca-certificates=2026.2.25=hbd8a1cb_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- colorama=0.4.6=pyhd8ed1ab_1
- contourpy=1.3.3=py312h0a2e395_4
- coverage=7.13.4=py312h8a5da7c_0
- coverage=7.13.5=py312h8a5da7c_0
- cycler=0.12.1=pyhcf101f3_2
- dill=0.4.1=pyhcf101f3_0
- exceptiongroup=1.3.1=pyhd8ed1ab_0
- fonttools=4.61.1=py312h8a5da7c_0
- freetype=2.14.1=ha770c72_0
- h5py=3.15.1=nompi_py312ha4f8f14_101
- hdf5=1.14.6=nompi_h19486de_106
- icu=78.2=h33c6efd_0
- importlib-metadata=8.7.0=pyhe01879c_1
- fonttools=4.62.0=py312h8a5da7c_0
- freetype=2.14.3=ha770c72_0
- h5py=3.16.0=nompi_py312ha829cd9_102
- hdf5=2.1.0=nompi_hd4fcb43_104
- icu=78.3=h33c6efd_0
- importlib-metadata=8.8.0=pyhcf101f3_0
- iniconfig=2.3.0=pyhd8ed1ab_0
- isort=7.0.0=pyhd8ed1ab_0
- isort=8.0.1=pyhd8ed1ab_0
- keyutils=1.6.3=hb9d3cd8_0
- kiwisolver=1.4.9=py312h0a2e395_2
- kiwisolver=1.5.0=py312h0a2e395_0
- krb5=1.22.2=ha1258a1_0
- lcms2=2.18=h0c24ade_0
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
- lerc=4.0.0=h0aef613_1
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
- lerc=4.1.0=hdb68285_0
- libaec=1.1.5=h088129d_0
- libblas=3.11.0=5_h4a7cf45_openblas
- libblas=3.11.0=6_h4a7cf45_openblas
- libbrotlicommon=1.2.0=hb03c661_1
- libbrotlidec=1.2.0=hb03c661_1
- libbrotlienc=1.2.0=hb03c661_1
- libcblas=3.11.0=5_h0358290_openblas
- libcurl=8.18.0=hcf29cc6_1
- libcblas=3.11.0=6_h0358290_openblas
- libcurl=8.19.0=hcf29cc6_0
- libdeflate=1.25=h17f619e_0
- libedit=3.1.20250104=pl5321h7949ede_0
- libev=4.33=hd590300_2
- libexpat=2.7.4=hecca717_0
- libexpat=2.7.5=hecca717_0
- libffi=3.5.2=h3435931_0
- libfreetype=2.14.1=ha770c72_0
- libfreetype6=2.14.1=h73754d4_0
- libgcc=15.2.0=he0feb66_17
- libgcc-ng=15.2.0=h69a702a_17
- libgfortran=15.2.0=h69a702a_17
- libgfortran5=15.2.0=h68bc16d_17
- libgomp=15.2.0=he0feb66_17
- libfreetype=2.14.3=ha770c72_0
- libfreetype6=2.14.3=h73754d4_0
- libgcc=15.2.0=he0feb66_18
- libgcc-ng=15.2.0=h69a702a_18
- libgfortran=15.2.0=h69a702a_18
- libgfortran5=15.2.0=h68bc16d_18
- libgomp=15.2.0=he0feb66_18
- libjpeg-turbo=3.1.2=hb03c661_0
- liblapack=3.11.0=5_h47877c9_openblas
- liblapack=3.11.0=6_h47877c9_openblas
- liblzma=5.8.2=hb03c661_0
- libnghttp2=1.67.0=had1ee68_0
- libnghttp2=1.68.1=h877daf1_0
- libnsl=2.0.1=hb9d3cd8_1
- libopenblas=0.3.30=pthreads_h94d23a6_4
- libpng=1.6.55=h421ea60_0
- libsqlite=3.51.2=hf4e2dac_0
- libopenblas=0.3.32=pthreads_h94d23a6_0
- libpng=1.6.57=h421ea60_0
- libsqlite=3.52.0=hf4e2dac_0
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.2.0=h934c35e_17
- libstdcxx-ng=15.2.0=hdf11a46_17
- libstdcxx=15.2.0=h934c35e_18
- libstdcxx-ng=15.2.0=hdf11a46_18
- libtiff=4.7.1=h9d88235_1
- libuuid=2.41.3=h5347b49_0
- libuuid=2.42=h5347b49_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
- libxcrypt=4.4.36=hd590300_1
- libzlib=1.3.1=hb9d3cd8_2
- libzlib=1.3.2=h25fd6f3_2
- matplotlib-base=3.10.8=py312he3d6523_0
- mccabe=0.7.0=pyhd8ed1ab_1
- munkres=1.1.4=pyhd8ed1ab_1
- ncurses=6.5=h2d0b736_3
- numpy=2.4.2=py312h33ff503_1
- numpy=2.4.3=py312h33ff503_0
- openjpeg=2.5.4=h55fea9a_0
- openssl=3.6.1=h35e630c_1
- openssl=3.6.2=h35e630c_0
- packaging=26.0=pyhcf101f3_0
- pillow=12.1.1=py312h50c33e8_0
- pillow=12.2.0=py312h50c33e8_0
- pip=26.0.1=pyh8b19718_0
- platformdirs=4.9.2=pyhcf101f3_0
- platformdirs=4.9.6=pyhcf101f3_0
- pluggy=1.6.0=pyhf9edf01_1
- pthread-stubs=0.4=hb9d3cd8_1002
- pydantic=2.12.5=pyhcf101f3_1
- pydantic-core=2.41.5=py312h868fb18_1
- pygments=2.19.2=pyhd8ed1ab_0
- pylint=4.0.4=pyhcf101f3_0
- pygments=2.20.0=pyhd8ed1ab_0
- pylint=4.0.5=pyhcf101f3_0
- pyparsing=3.3.2=pyhcf101f3_0
- pytest=9.0.2=pyhcf101f3_0
- pytest-cov=7.0.0=pyhcf101f3_1
- python=3.12.12=hd63d673_2_cpython
- pytest=9.0.3=pyhc364b38_1
- pytest-cov=7.1.0=pyhcf101f3_0
- python=3.12.13=hd63d673_0_cpython
- python-dateutil=2.9.0.post0=pyhe01879c_2
- python_abi=3.12=8_cp312
- pyyaml=6.0.3=py312h8a5da7c_1
- qhull=2020.2=h434a139_5
- readline=8.3=h853b02a_0
- scipy=1.17.0=py312h54fa4ab_1
- setuptools=82.0.0=pyh332efcf_0
- s2n=1.7.1=h1cbb8d7_1
- scipy=1.17.1=py312h54fa4ab_0
- setuptools=82.0.1=pyh332efcf_0
- six=1.17.0=pyhe01879c_1
- tk=8.6.13=noxft_h366c992_103
- tomli=2.4.0=pyhcf101f3_0
- tomli=2.4.1=pyhcf101f3_0
- tomlkit=0.14.0=pyha770c72_0
- typing-extensions=4.15.0=h396c80c_0
- typing-inspection=0.4.2=pyhd8ed1ab_1
Expand All @@ -117,7 +127,7 @@ dependencies:
- zlib-ng=2.3.3=hceb46e0_1
- zstd=1.5.7=hb78ec9c_6
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3310d7a4521879f99a0a56ce613f265423e73a8f
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c45a3ee74a6818f129a72c680dd8ef3614cc4781

variables:
KMP_WARNINGS: 0
84 changes: 47 additions & 37 deletions environments/py-3.12-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,89 +1,99 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: a88138472d5cf703033124b201e9efe5ddfd314346943b826d2af3fe2a691cdf
# input_hash: c982be9f74d2279ae1a59209179f62946fcde9b6890aa1eaf6645898d3b782cc

channels:
- conda-forge
- nodefaults
dependencies:
- _openmp_mutex=4.5=20_gnu
- annotated-types=0.7.0=pyhd8ed1ab_1
- aws-c-auth=0.10.1=h2d2dd48_2
- aws-c-cal=0.9.13=h2c9d079_1
- aws-c-common=0.12.6=hb03c661_0
- aws-c-compression=0.3.2=h8b1a151_0
- aws-c-http=0.10.12=h4bacb7b_1
- aws-c-io=0.26.3=hc87160b_0
- aws-c-s3=0.11.5=h6d69fc9_5
- aws-c-sdkutils=0.2.4=h8b1a151_4
- aws-checksums=0.2.10=h8b1a151_0
- brotli=1.2.0=hed03a55_1
- brotli-bin=1.2.0=hb03c661_1
- bzip2=1.0.8=hda65f42_9
- c-ares=1.34.6=hb03c661_0
- ca-certificates=2026.1.4=hbd8a1cb_0
- ca-certificates=2026.2.25=hbd8a1cb_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- contourpy=1.3.3=py312h0a2e395_4
- cycler=0.12.1=pyhcf101f3_2
- fonttools=4.61.1=py312h8a5da7c_0
- freetype=2.14.1=ha770c72_0
- h5py=3.15.1=nompi_py312ha4f8f14_101
- hdf5=1.14.6=nompi_h19486de_106
- icu=78.2=h33c6efd_0
- fonttools=4.62.0=py312h8a5da7c_0
- freetype=2.14.3=ha770c72_0
- h5py=3.16.0=nompi_py312ha829cd9_102
- hdf5=2.1.0=nompi_hd4fcb43_104
- icu=78.3=h33c6efd_0
- keyutils=1.6.3=hb9d3cd8_0
- kiwisolver=1.4.9=py312h0a2e395_2
- kiwisolver=1.5.0=py312h0a2e395_0
- krb5=1.22.2=ha1258a1_0
- lcms2=2.18=h0c24ade_0
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
- lerc=4.0.0=h0aef613_1
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
- lerc=4.1.0=hdb68285_0
- libaec=1.1.5=h088129d_0
- libblas=3.11.0=5_h4a7cf45_openblas
- libblas=3.11.0=6_h4a7cf45_openblas
- libbrotlicommon=1.2.0=hb03c661_1
- libbrotlidec=1.2.0=hb03c661_1
- libbrotlienc=1.2.0=hb03c661_1
- libcblas=3.11.0=5_h0358290_openblas
- libcurl=8.18.0=hcf29cc6_1
- libcblas=3.11.0=6_h0358290_openblas
- libcurl=8.19.0=hcf29cc6_0
- libdeflate=1.25=h17f619e_0
- libedit=3.1.20250104=pl5321h7949ede_0
- libev=4.33=hd590300_2
- libexpat=2.7.4=hecca717_0
- libexpat=2.7.5=hecca717_0
- libffi=3.5.2=h3435931_0
- libfreetype=2.14.1=ha770c72_0
- libfreetype6=2.14.1=h73754d4_0
- libgcc=15.2.0=he0feb66_17
- libgcc-ng=15.2.0=h69a702a_17
- libgfortran=15.2.0=h69a702a_17
- libgfortran5=15.2.0=h68bc16d_17
- libgomp=15.2.0=he0feb66_17
- libfreetype=2.14.3=ha770c72_0
- libfreetype6=2.14.3=h73754d4_0
- libgcc=15.2.0=he0feb66_18
- libgcc-ng=15.2.0=h69a702a_18
- libgfortran=15.2.0=h69a702a_18
- libgfortran5=15.2.0=h68bc16d_18
- libgomp=15.2.0=he0feb66_18
- libjpeg-turbo=3.1.2=hb03c661_0
- liblapack=3.11.0=5_h47877c9_openblas
- liblapack=3.11.0=6_h47877c9_openblas
- liblzma=5.8.2=hb03c661_0
- libnghttp2=1.67.0=had1ee68_0
- libnghttp2=1.68.1=h877daf1_0
- libnsl=2.0.1=hb9d3cd8_1
- libopenblas=0.3.30=pthreads_h94d23a6_4
- libpng=1.6.55=h421ea60_0
- libsqlite=3.51.2=hf4e2dac_0
- libopenblas=0.3.32=pthreads_h94d23a6_0
- libpng=1.6.57=h421ea60_0
- libsqlite=3.52.0=hf4e2dac_0
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.2.0=h934c35e_17
- libstdcxx-ng=15.2.0=hdf11a46_17
- libstdcxx=15.2.0=h934c35e_18
- libstdcxx-ng=15.2.0=hdf11a46_18
- libtiff=4.7.1=h9d88235_1
- libuuid=2.41.3=h5347b49_0
- libuuid=2.42=h5347b49_0
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
- libxcrypt=4.4.36=hd590300_1
- libzlib=1.3.1=hb9d3cd8_2
- libzlib=1.3.2=h25fd6f3_2
- matplotlib-base=3.10.8=py312he3d6523_0
- munkres=1.1.4=pyhd8ed1ab_1
- ncurses=6.5=h2d0b736_3
- numpy=2.4.2=py312h33ff503_1
- numpy=2.4.3=py312h33ff503_0
- openjpeg=2.5.4=h55fea9a_0
- openssl=3.6.1=h35e630c_1
- openssl=3.6.2=h35e630c_0
- packaging=26.0=pyhcf101f3_0
- pillow=12.1.1=py312h50c33e8_0
- pillow=12.2.0=py312h50c33e8_0
- pip=26.0.1=pyh8b19718_0
- pthread-stubs=0.4=hb9d3cd8_1002
- pydantic=2.12.5=pyhcf101f3_1
- pydantic-core=2.41.5=py312h868fb18_1
- pyparsing=3.3.2=pyhcf101f3_0
- python=3.12.12=hd63d673_2_cpython
- python=3.12.13=hd63d673_0_cpython
- python-dateutil=2.9.0.post0=pyhe01879c_2
- python_abi=3.12=8_cp312
- qhull=2020.2=h434a139_5
- readline=8.3=h853b02a_0
- scipy=1.17.0=py312h54fa4ab_1
- setuptools=82.0.0=pyh332efcf_0
- s2n=1.7.1=h1cbb8d7_1
- scipy=1.17.1=py312h54fa4ab_0
- setuptools=82.0.1=pyh332efcf_0
- six=1.17.0=pyhe01879c_1
- tk=8.6.13=noxft_h366c992_103
- typing-extensions=4.15.0=h396c80c_0
Expand All @@ -97,7 +107,7 @@ dependencies:
- zlib-ng=2.3.3=hceb46e0_1
- zstd=1.5.7=hb78ec9c_6
- pip:
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3310d7a4521879f99a0a56ce613f265423e73a8f
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c45a3ee74a6818f129a72c680dd8ef3614cc4781

variables:
KMP_WARNINGS: 0
Loading
Loading