Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/python_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
- hotfix/**

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
group: ${{ github.workflow }}-${{ github.repository_id }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
Expand All @@ -31,11 +31,11 @@ jobs:
python-version: '3.10'
call-workflow-pytest:
name: Pytest
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@GEOPY-2029
with:
package-manager: 'conda'
python-versions: '["3.10", "3.11"]'
os: '["ubuntu-latest", "windows-latest"]'
python-versions: '["3.10", "3.11", "3.12"]'
os: '["ubuntu-latest", "windows-2019", "windows-2025"]'
cache-number: 1
codecov-reference-python-version: '3.10'
codecov-reference-os: '["windows-latest"]'
Expand Down
1 change: 1 addition & 0 deletions deps-lock-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ include_dev: True
py_versions:
- "3.10"
- "3.11"
- "3.12"
3 changes: 3 additions & 0 deletions environments/env-python-3.12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependencies:
- python=3.12.*
- pip
36 changes: 16 additions & 20 deletions environments/py-3.10-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: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104
# input_hash: 1ce214c3e53d3cff5034336fc0e1d0ca6c8d6f263e67b25ed623f1df00e365a0

channels:
- conda-forge
Expand Down Expand Up @@ -53,15 +53,14 @@ dependencies:
- discretize=0.11.2=py310ha2bacc8_1
- distributed=2024.6.2=pyhd8ed1ab_0
- docutils=0.19=py310hff52083_1
- empymod=2.2.2=pyhd8ed1ab_0
- exceptiongroup=1.2.2=pyhd8ed1ab_1
- executing=2.1.0=pyhd8ed1ab_1
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.56.0=py310h89163eb_0
- fqdn=1.5.1=pyhd8ed1ab_1
- freetype=2.12.1=h267a509_2
- fsspec=2022.11.0=pyhd8ed1ab_0
- geoana=0.5.0=py310hcb52e73_4
- fsspec=2025.2.0=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- greenlet=3.1.1=py310hf71b8c6_1
- h11=0.14.0=pyhd8ed1ab_1
- h2=4.2.0=pyhd8ed1ab_0
Expand All @@ -83,7 +82,7 @@ dependencies:
- ipython_genutils=0.2.0=pyhd8ed1ab_2
- ipywidgets=7.8.5=pyhd8ed1ab_0
- isoduration=20.11.0=pyhd8ed1ab_1
- isort=6.0.0=pyhd8ed1ab_0
- isort=6.0.1=pyhd8ed1ab_0
- jedi=0.19.2=pyhd8ed1ab_1
- jinja2=3.1.5=pyhd8ed1ab_0
- joblib=1.4.2=pyhd8ed1ab_1
Expand Down Expand Up @@ -113,11 +112,11 @@ dependencies:
- ld_impl_linux-64=2.43=h712a8e2_4
- lerc=4.0.0=h27087fc_0
- libaec=1.1.3=h59595ed_0
- libblas=3.9.0=20_linux64_mkl
- libblas=3.9.0=31_hfdb39a5_mkl
- libbrotlicommon=1.1.0=hb9d3cd8_2
- libbrotlidec=1.1.0=hb9d3cd8_2
- libbrotlienc=1.1.0=hb9d3cd8_2
- libcblas=3.9.0=20_linux64_mkl
- libcblas=3.9.0=31_h372d94f_mkl
- libcurl=8.12.1=h332b0f4_0
- libdeflate=1.23=h4ddbbb0_0
- libdlf=0.3.0=pyhd8ed1ab_1
Expand All @@ -128,11 +127,10 @@ dependencies:
- libgcc-ng=14.2.0=h69a702a_2
- libgfortran=14.2.0=h69a702a_2
- libgfortran5=14.2.0=hf1ad2bd_2
- libhwloc=2.11.1=default_hecaa2ac_1000
- libhwloc=2.11.2=default_h0d58e46_1001
- libiconv=1.18=h4ce23a2_1
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=20_linux64_mkl
- libllvm15=15.0.7=ha7bfdaf_5
- liblapack=3.9.0=31_hc41d3b0_mkl
- liblzma=5.6.4=hb9d3cd8_0
- libnghttp2=1.64.0=h161d5f1_0
- libnsl=2.0.1=hd590300_0
Expand All @@ -152,7 +150,6 @@ dependencies:
- libzlib=1.3.1=hb9d3cd8_2
- linkify-it-py=2.0.3=pyhd8ed1ab_1
- llvm-openmp=19.1.7=h024ca30_0
- llvmlite=0.44.0=py310h1a6248f_0
- locket=1.0.0=pyhd8ed1ab_0
- markdown-it-py=2.2.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
Expand All @@ -163,7 +160,7 @@ dependencies:
- mdurl=0.1.2=pyhd8ed1ab_1
- metis=5.1.0=hd0bcaf9_1007
- mistune=3.1.2=pyhd8ed1ab_0
- mkl=2023.2.0=h84fe81f_50496
- mkl=2024.2.2=ha957f24_16
- msgpack-python=1.1.0=py310h3788b33_0
- mumps-include=5.7.3=ha770c72_7
- mumps-seq=5.7.3=h2064c95_7
Expand All @@ -179,7 +176,6 @@ dependencies:
- nest-asyncio=1.6.0=pyhd8ed1ab_1
- notebook=7.3.2=pyhd8ed1ab_0
- notebook-shim=0.2.4=pyhd8ed1ab_1
- numba=0.61.0=py310h699fe88_1
- numcodecs=0.13.1=py310h5eaa309_0
- numpy=1.26.4=py310hb13e2d6_0
- openjpeg=2.5.3=h5fbd93e_0
Expand All @@ -200,7 +196,7 @@ dependencies:
- pluggy=1.5.0=pyhd8ed1ab_1
- prometheus_client=0.21.1=pyhd8ed1ab_0
- prompt-toolkit=3.0.50=pyha770c72_0
- psutil=6.1.1=py310ha75aee5_0
- psutil=7.0.0=py310ha75aee5_0
- pthread-stubs=0.4=hb9d3cd8_1002
- ptyprocess=0.7.0=pyhd8ed1ab_1
- pure_eval=0.2.3=pyhd8ed1ab_1
Expand All @@ -210,7 +206,7 @@ dependencies:
- pydantic=2.10.6=pyh3cfb1c2_0
- pydantic-core=2.27.2=py310h505e2c1_0
- pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0
- pydiso=0.1.2=py310h7b68af5_0
- pydiso=0.1.2=py310h69a6472_0
- pygments=2.19.1=pyhd8ed1ab_0
- pylint=3.3.4=pyh29332c3_0
- pymatsolver=0.3.1=pyh48887ae_201
Expand All @@ -223,7 +219,7 @@ dependencies:
- python-fastjsonschema=2.21.1=pyhd8ed1ab_0
- python-json-logger=2.0.7=pyhd8ed1ab_0
- python-mumps=0.0.3=py310h6410a28_0
- python-tzdata=2023.4=pyhd8ed1ab_0
- python-tzdata=2025.1=pyhd8ed1ab_0
- python_abi=3.10=5_cp310
- pytz=2024.1=pyhd8ed1ab_0
- pyyaml=6.0.2=py310h89163eb_2
Expand All @@ -238,7 +234,7 @@ dependencies:
- scikit-learn=1.4.2=py310h981052a_1
- scipy=1.14.1=py310hfcf56fc_2
- send2trash=1.8.3=pyh0d859eb_1
- setuptools=75.8.0=pyhff2d567_0
- setuptools=75.8.2=pyhff2d567_0
- six=1.17.0=pyhd8ed1ab_0
- sniffio=1.3.1=pyhd8ed1ab_1
- snowballstemmer=2.2.0=pyhd8ed1ab_0
Expand All @@ -264,7 +260,7 @@ dependencies:
- sqlalchemy=2.0.38=py310ha75aee5_0
- stack_data=0.6.3=pyhd8ed1ab_1
- tabulate=0.9.0=pyhd8ed1ab_2
- tbb=2021.12.0=h84d6215_4
- tbb=2021.13.0=hceb3a55_1
- tblib=3.0.0=pyhd8ed1ab_1
- terminado=0.18.1=pyh0d859eb_0
- threadpoolctl=3.5.0=pyhc1e730c_0
Expand Down Expand Up @@ -303,9 +299,9 @@ dependencies:
- zstandard=0.19.0=py310h5764c6d_0
- zstd=1.5.7=hb8e6e7a_1
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4

Expand Down
34 changes: 15 additions & 19 deletions environments/py-3.10-linux-64.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: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104
# input_hash: 1ce214c3e53d3cff5034336fc0e1d0ca6c8d6f263e67b25ed623f1df00e365a0

channels:
- conda-forge
Expand Down Expand Up @@ -30,12 +30,11 @@ dependencies:
- dask-core=2024.6.2=pyhd8ed1ab_0
- discretize=0.11.2=py310ha2bacc8_1
- distributed=2024.6.2=pyhd8ed1ab_0
- empymod=2.2.2=pyhd8ed1ab_0
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.56.0=py310h89163eb_0
- freetype=2.12.1=h267a509_2
- fsspec=2022.11.0=pyhd8ed1ab_0
- geoana=0.5.0=py310hcb52e73_4
- fsspec=2025.2.0=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- h2=4.2.0=pyhd8ed1ab_0
- h5py=3.13.0=nompi_py310h60e0fe6_100
- hdf5=1.14.3=nompi_h2d575fe_109
Expand All @@ -53,11 +52,11 @@ dependencies:
- ld_impl_linux-64=2.43=h712a8e2_4
- lerc=4.0.0=h27087fc_0
- libaec=1.1.3=h59595ed_0
- libblas=3.9.0=20_linux64_mkl
- libblas=3.9.0=31_hfdb39a5_mkl
- libbrotlicommon=1.1.0=hb9d3cd8_2
- libbrotlidec=1.1.0=hb9d3cd8_2
- libbrotlienc=1.1.0=hb9d3cd8_2
- libcblas=3.9.0=20_linux64_mkl
- libcblas=3.9.0=31_h372d94f_mkl
- libcurl=8.12.1=h332b0f4_0
- libdeflate=1.23=h4ddbbb0_0
- libdlf=0.3.0=pyhd8ed1ab_1
Expand All @@ -68,11 +67,10 @@ dependencies:
- libgcc-ng=14.2.0=h69a702a_2
- libgfortran=14.2.0=h69a702a_2
- libgfortran5=14.2.0=hf1ad2bd_2
- libhwloc=2.11.1=default_hecaa2ac_1000
- libhwloc=2.11.2=default_h0d58e46_1001
- libiconv=1.18=h4ce23a2_1
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=20_linux64_mkl
- libllvm15=15.0.7=ha7bfdaf_5
- liblapack=3.9.0=31_hc41d3b0_mkl
- liblzma=5.6.4=hb9d3cd8_0
- libnghttp2=1.64.0=h161d5f1_0
- libnsl=2.0.1=hd590300_0
Expand All @@ -90,18 +88,16 @@ dependencies:
- libxml2=2.13.6=h8d12d68_0
- libzlib=1.3.1=hb9d3cd8_2
- llvm-openmp=19.1.7=h024ca30_0
- llvmlite=0.44.0=py310h1a6248f_0
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
- matplotlib-base=3.8.4=py310hef631a5_2
- metis=5.1.0=hd0bcaf9_1007
- mkl=2023.2.0=h84fe81f_50496
- mkl=2024.2.2=ha957f24_16
- msgpack-python=1.1.0=py310h3788b33_0
- mumps-include=5.7.3=ha770c72_7
- mumps-seq=5.7.3=h2064c95_7
- munkres=1.1.4=pyh9f0ad1d_0
- ncurses=6.5=h2d0b736_3
- numba=0.61.0=py310h699fe88_1
- numcodecs=0.13.1=py310h5eaa309_0
- numpy=1.26.4=py310hb13e2d6_0
- openjpeg=2.5.3=h5fbd93e_0
Expand All @@ -111,29 +107,29 @@ dependencies:
- partd=1.4.2=pyhd8ed1ab_0
- pillow=10.3.0=py310hebfe307_1
- pip=25.0.1=pyh8b19718_0
- psutil=6.1.1=py310ha75aee5_0
- psutil=7.0.0=py310ha75aee5_0
- pthread-stubs=0.4=hb9d3cd8_1002
- pycparser=2.22=pyh29332c3_1
- pydantic=2.10.6=pyh3cfb1c2_0
- pydantic-core=2.27.2=py310h505e2c1_0
- pydiso=0.1.2=py310h7b68af5_0
- pydiso=0.1.2=py310h69a6472_0
- pymatsolver=0.3.1=pyh48887ae_201
- pyparsing=3.2.1=pyhd8ed1ab_0
- pysocks=1.7.1=pyha55dd90_7
- python=3.10.16=he725a3c_1_cpython
- python-dateutil=2.9.0.post0=pyhff2d567_1
- python-mumps=0.0.3=py310h6410a28_0
- python-tzdata=2023.4=pyhd8ed1ab_0
- python-tzdata=2025.1=pyhd8ed1ab_0
- python_abi=3.10=5_cp310
- pytz=2024.1=pyhd8ed1ab_0
- pyyaml=6.0.2=py310h89163eb_2
- readline=8.2=h8c095d6_2
- scikit-learn=1.4.2=py310h981052a_1
- scipy=1.14.1=py310hfcf56fc_2
- setuptools=75.8.0=pyhff2d567_0
- setuptools=75.8.2=pyhff2d567_0
- six=1.17.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_1
- tbb=2021.12.0=h84d6215_4
- tbb=2021.13.0=hceb3a55_1
- tblib=3.0.0=pyhd8ed1ab_1
- threadpoolctl=3.5.0=pyhc1e730c_0
- tk=8.6.13=noxft_h4845f30_101
Expand All @@ -156,9 +152,9 @@ dependencies:
- zstandard=0.19.0=py310h5764c6d_0
- zstd=1.5.7=hb8e6e7a_1
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4

Expand Down
Loading
Loading