Skip to content

Commit db99214

Browse files
committed
Merge branch 'develop' into GEOPY-2741
# Conflicts: # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.13-linux-64-dev.conda.lock.yml # environments/py-3.13-win-64-dev.conda.lock.yml # environments/py-3.14-linux-64-dev.conda.lock.yml # environments/py-3.14-win-64-dev.conda.lock.yml # py-3.12.conda-lock.yml # py-3.13.conda-lock.yml # py-3.14.conda-lock.yml
2 parents 75dd780 + 2070126 commit db99214

198 files changed

Lines changed: 3798 additions & 6459 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
name: Add JIRA issue summary
1+
name: JIRA actions
22

33
on:
44
pull_request:
5-
types: [opened]
6-
7-
permissions: {}
5+
types: [opened, synchronize, reopened, ready_for_review]
86

97
jobs:
10-
call-workflow-add-jira-issue-summary:
11-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-pr_add_jira_summary.yml@v2
8+
call-workflow-pr_jira_actions:
9+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-pr_actions.yml@v3
1210
permissions:
1311
contents: read
1412
pull-requests: write
1513
secrets:
16-
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
17-
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
1814
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
15+
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
16+
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}

environments/py-3.12-linux-64-dev.conda.lock.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ dependencies:
1010
- _python_abi3_support=1.0=hd8ed1ab_2
1111
- alabaster=0.7.16=pyhd8ed1ab_0
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
13-
- anyio=4.12.1=pyhcf101f3_0
13+
- anyio=4.13.0=pyhcf101f3_0
1414
- argon2-cffi=25.1.0=pyhd8ed1ab_0
1515
- argon2-cffi-bindings=25.1.0=py312h4c3975b_2
1616
- arrow=1.4.0=pyhcf101f3_0
1717
- asciitree=0.3.3=py_2
1818
- astroid=4.0.4=py312h7900ff3_0
1919
- asttokens=3.0.1=pyhd8ed1ab_0
20-
- async-lru=2.2.0=pyhcf101f3_0
21-
- attrs=25.4.0=pyhcf101f3_1
20+
- async-lru=2.3.0=pyhcf101f3_0
21+
- attrs=26.1.0=pyhcf101f3_0
2222
- babel=2.18.0=pyhcf101f3_1
2323
- backports.zstd=1.3.0=py312h90b7ffd_0
2424
- beautifulsoup4=4.14.3=pyha770c72_0
@@ -41,7 +41,7 @@ dependencies:
4141
- colorama=0.4.6=pyhd8ed1ab_1
4242
- comm=0.2.3=pyhe01879c_0
4343
- contourpy=1.3.3=py312h0a2e395_4
44-
- coverage=7.13.4=py312h8a5da7c_0
44+
- coverage=7.13.5=py312h8a5da7c_0
4545
- cpython=3.12.13=py312hd8ed1ab_0
4646
- cycler=0.12.1=pyhcf101f3_2
4747
- cytoolz=1.1.0=py312h4c3975b_2
@@ -60,21 +60,21 @@ dependencies:
6060
- fasteners=0.19=pyhd8ed1ab_1
6161
- fonttools=4.62.0=py312h8a5da7c_0
6262
- fqdn=1.5.1=pyhd8ed1ab_1
63-
- freetype=2.14.2=ha770c72_0
63+
- freetype=2.14.3=ha770c72_0
6464
- fsspec=2026.2.0=pyhd8ed1ab_0
6565
- geoana=0.8.1=np2py312h2a48985_0
6666
- h11=0.16.0=pyhcf101f3_1
6767
- h2=4.3.0=pyhcf101f3_0
68-
- h5py=3.15.1=nompi_py312ha4f8f14_101
69-
- hdf5=1.14.6=nompi_h19486de_106
68+
- h5py=3.16.0=nompi_py312ha4f8f14_100
69+
- hdf5=1.14.6=nompi_h19486de_108
7070
- hpack=4.1.0=pyhd8ed1ab_0
7171
- httpcore=1.0.9=pyh29332c3_0
7272
- httpx=0.28.1=pyhd8ed1ab_0
7373
- hyperframe=6.1.0=pyhd8ed1ab_0
7474
- icu=75.1=he02047a_0
7575
- idna=3.11=pyhd8ed1ab_0
76-
- imagesize=1.4.1=pyhd8ed1ab_1
77-
- importlib-metadata=8.7.0=pyhe01879c_1
76+
- imagesize=2.0.0=pyhd8ed1ab_0
77+
- importlib-metadata=8.8.0=pyhcf101f3_0
7878
- importlib_resources=6.5.2=pyhd8ed1ab_0
7979
- iniconfig=2.3.0=pyhd8ed1ab_0
8080
- ipykernel=7.2.0=pyha191276_1
@@ -88,7 +88,7 @@ dependencies:
8888
- jinja2=3.1.6=pyhcf101f3_1
8989
- joblib=1.5.3=pyhd8ed1ab_0
9090
- json5=0.13.0=pyhd8ed1ab_0
91-
- jsonpointer=3.0.0=pyhcf101f3_3
91+
- jsonpointer=3.1.1=pyhcf101f3_0
9292
- jsonschema=4.26.0=pyhcf101f3_0
9393
- jsonschema-specifications=2025.9.1=pyhcf101f3_0
9494
- jsonschema-with-format-nongpl=4.26.0=hcf101f3_0
@@ -109,35 +109,35 @@ dependencies:
109109
- krb5=1.22.2=ha1258a1_0
110110
- lark=1.3.1=pyhd8ed1ab_0
111111
- lcms2=2.18=h0c24ade_0
112-
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
112+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
113113
- lerc=4.1.0=hdb68285_0
114114
- libaec=1.1.5=h088129d_0
115-
- libblas=3.11.0=5_h5875eb1_mkl
115+
- libblas=3.11.0=6_h5875eb1_mkl
116116
- libbrotlicommon=1.2.0=hb03c661_1
117117
- libbrotlidec=1.2.0=hb03c661_1
118118
- libbrotlienc=1.2.0=hb03c661_1
119-
- libcblas=3.11.0=5_hfef963f_mkl
119+
- libcblas=3.11.0=6_hfef963f_mkl
120120
- libcurl=8.19.0=hcf29cc6_0
121121
- libdeflate=1.25=h17f619e_0
122122
- libdlf=0.3.0=pyhd8ed1ab_1
123123
- libedit=3.1.20250104=pl5321h7949ede_0
124124
- libev=4.33=hd590300_2
125125
- libexpat=2.7.4=hecca717_0
126126
- libffi=3.5.2=h3435931_0
127-
- libfreetype=2.14.2=ha770c72_0
128-
- libfreetype6=2.14.2=h73754d4_0
127+
- libfreetype=2.14.3=ha770c72_0
128+
- libfreetype6=2.14.3=h73754d4_0
129129
- libgcc=15.2.0=he0feb66_18
130130
- libgcc-ng=15.2.0=h69a702a_18
131131
- libgfortran=15.2.0=h69a702a_18
132132
- libgfortran5=15.2.0=h68bc16d_18
133133
- libhwloc=2.12.2=default_hafda6a7_1000
134134
- libiconv=1.18=h3b78370_2
135135
- libjpeg-turbo=3.1.2=hb03c661_0
136-
- liblapack=3.11.0=5_h5e43f62_mkl
136+
- liblapack=3.11.0=6_h5e43f62_mkl
137137
- liblzma=5.8.2=hb03c661_0
138-
- libnghttp2=1.67.0=had1ee68_0
138+
- libnghttp2=1.68.1=h877daf1_0
139139
- libnsl=2.0.1=hb9d3cd8_1
140-
- libpng=1.6.55=h421ea60_0
140+
- libpng=1.6.56=h421ea60_0
141141
- libscotch=7.0.11=int64_hfcc3fd4_2
142142
- libsodium=1.0.21=h280c20c_3
143143
- libspatialindex=2.1.0=he57a185_0
@@ -153,8 +153,8 @@ dependencies:
153153
- libxcrypt=4.4.36=hd590300_1
154154
- libxml2=2.15.1=h26afc86_0
155155
- libxml2-16=2.15.1=ha9997c6_0
156-
- libzlib=1.3.1=hb9d3cd8_2
157-
- llvm-openmp=22.1.0=h4922eb0_0
156+
- libzlib=1.3.2=h25fd6f3_2
157+
- llvm-openmp=22.1.1=h4922eb0_0
158158
- locket=1.0.0=pyhd8ed1ab_0
159159
- markdown-it-py=4.0.0=pyhd8ed1ab_0
160160
- markupsafe=3.0.3=py312h8a5da7c_1
@@ -165,7 +165,7 @@ dependencies:
165165
- mdurl=0.1.2=pyhd8ed1ab_1
166166
- metis=5.1.0=hd0bcaf9_1007
167167
- mistune=3.2.0=pyhcf101f3_0
168-
- mkl=2025.3.0=h0e700b2_463
168+
- mkl=2025.3.1=h0e700b2_10
169169
- msgpack-python=1.1.2=py312hd9148b4_1
170170
- mumps-include=5.8.2=h5a610fb_2
171171
- mumps-seq=5.8.2=hc1b3267_2
@@ -181,14 +181,14 @@ dependencies:
181181
- notebook=7.5.5=pyhcf101f3_0
182182
- notebook-shim=0.2.4=pyhd8ed1ab_1
183183
- numcodecs=0.15.1=py312hf79963d_1
184-
- numpy=2.4.2=py312h33ff503_1
184+
- numpy=2.4.3=py312h33ff503_0
185185
- openjpeg=2.5.4=h55fea9a_0
186186
- openpyxl=3.1.5=py312h7f6eeab_3
187187
- openssl=3.6.1=h35e630c_1
188188
- overrides=7.7.0=pyhd8ed1ab_1
189189
- packaging=26.0=pyhcf101f3_0
190190
- pandas=3.0.1=py312h8ecdadd_0
191-
- pandoc=3.9=ha770c72_0
191+
- pandoc=3.9.0.2=ha770c72_0
192192
- pandocfilters=1.5.0=pyhd8ed1ab_0
193193
- parso=0.8.6=pyhcf101f3_0
194194
- partd=1.4.2=pyhd8ed1ab_0
@@ -213,7 +213,7 @@ dependencies:
213213
- pyparsing=3.3.2=pyhcf101f3_0
214214
- pysocks=1.7.1=pyha55dd90_7
215215
- pytest=9.0.2=pyhcf101f3_0
216-
- pytest-cov=7.0.0=pyhcf101f3_1
216+
- pytest-cov=7.1.0=pyhcf101f3_0
217217
- python=3.12.13=hd63d673_0_cpython
218218
- python-dateutil=2.9.0.post0=pyhe01879c_2
219219
- python-fastjsonschema=2.21.2=pyhe01879c_0
@@ -228,7 +228,7 @@ dependencies:
228228
- readline=8.3=h853b02a_0
229229
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
230230
- referencing=0.37.0=pyhcf101f3_0
231-
- requests=2.32.5=pyhcf101f3_1
231+
- requests=2.33.0=pyhcf101f3_0
232232
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
233233
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
234234
- rfc3987-syntax=1.1.0=pyhe01879c_1
@@ -257,10 +257,10 @@ dependencies:
257257
- threadpoolctl=3.6.0=pyhecae5ae_0
258258
- tinycss2=1.4.0=pyhd8ed1ab_0
259259
- tk=8.6.13=noxft_h366c992_103
260-
- tomli=2.4.0=pyhcf101f3_0
260+
- tomli=2.4.1=pyhcf101f3_0
261261
- tomlkit=0.14.0=pyha770c72_0
262262
- toolz=1.1.0=pyhd8ed1ab_1
263-
- tornado=6.5.3=py312h4c3975b_0
263+
- tornado=6.5.5=py312h4c3975b_0
264264
- tqdm=4.67.3=pyh8f84b5b_0
265265
- traitlets=5.14.3=pyhd8ed1ab_1
266266
- trimesh=4.1.8=pyhd8ed1ab_0
@@ -287,14 +287,14 @@ dependencies:
287287
- zeromq=4.3.5=h41580af_10
288288
- zict=3.0.0=pyhd8ed1ab_1
289289
- zipp=3.23.0=pyhcf101f3_1
290-
- zlib=1.3.1=hb9d3cd8_2
290+
- zlib=1.3.2=h25fd6f3_2
291291
- zlib-ng=2.3.3=hceb46e0_1
292292
- zstd=1.5.7=hb78ec9c_6
293293
- pip:
294-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb86adf72fb82ea23c8904a39585982ca8793c52
295-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@7e3b1de8e0eab8b7b7199487bab23d8bbf18ce26
296-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ad1de3ed43ac802bf71eef3fc5ba75d5be525efe
297-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8a9cf452335379363e15ac7a3cd9bf689d8e2841
294+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@eb0474175000819e93d8dc701ed0fd6101c44451
295+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a4d826715e5f529242e2c7eac2805e05e1ec3027
296+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@0e66e6b7a44ede34563da6a77ccd87a4cc7b5185
297+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f7dd0d37aac285dd9ece26396ee39ae72bd6d18d
298298

299299
variables:
300300
KMP_WARNINGS: 0

environments/py-3.12-linux-64.conda.lock.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,51 +31,51 @@ dependencies:
3131
- et_xmlfile=2.0.0=pyhd8ed1ab_1
3232
- fasteners=0.19=pyhd8ed1ab_1
3333
- fonttools=4.62.0=py312h8a5da7c_0
34-
- freetype=2.14.2=ha770c72_0
34+
- freetype=2.14.3=ha770c72_0
3535
- fsspec=2026.2.0=pyhd8ed1ab_0
3636
- geoana=0.8.1=np2py312h2a48985_0
3737
- h2=4.3.0=pyhcf101f3_0
38-
- h5py=3.15.1=nompi_py312ha4f8f14_101
39-
- hdf5=1.14.6=nompi_h19486de_106
38+
- h5py=3.16.0=nompi_py312ha4f8f14_100
39+
- hdf5=1.14.6=nompi_h19486de_108
4040
- hpack=4.1.0=pyhd8ed1ab_0
4141
- hyperframe=6.1.0=pyhd8ed1ab_0
4242
- icu=75.1=he02047a_0
43-
- importlib-metadata=8.7.0=pyhe01879c_1
43+
- importlib-metadata=8.8.0=pyhcf101f3_0
4444
- jinja2=3.1.6=pyhcf101f3_1
4545
- joblib=1.5.3=pyhd8ed1ab_0
4646
- keyutils=1.6.3=hb9d3cd8_0
4747
- kiwisolver=1.5.0=py312h0a2e395_0
4848
- krb5=1.22.2=ha1258a1_0
4949
- lcms2=2.18=h0c24ade_0
50-
- ld_impl_linux-64=2.45.1=default_hbd61a6d_101
50+
- ld_impl_linux-64=2.45.1=default_hbd61a6d_102
5151
- lerc=4.1.0=hdb68285_0
5252
- libaec=1.1.5=h088129d_0
53-
- libblas=3.11.0=5_h5875eb1_mkl
53+
- libblas=3.11.0=6_h5875eb1_mkl
5454
- libbrotlicommon=1.2.0=hb03c661_1
5555
- libbrotlidec=1.2.0=hb03c661_1
5656
- libbrotlienc=1.2.0=hb03c661_1
57-
- libcblas=3.11.0=5_hfef963f_mkl
57+
- libcblas=3.11.0=6_hfef963f_mkl
5858
- libcurl=8.19.0=hcf29cc6_0
5959
- libdeflate=1.25=h17f619e_0
6060
- libdlf=0.3.0=pyhd8ed1ab_1
6161
- libedit=3.1.20250104=pl5321h7949ede_0
6262
- libev=4.33=hd590300_2
6363
- libexpat=2.7.4=hecca717_0
6464
- libffi=3.5.2=h3435931_0
65-
- libfreetype=2.14.2=ha770c72_0
66-
- libfreetype6=2.14.2=h73754d4_0
65+
- libfreetype=2.14.3=ha770c72_0
66+
- libfreetype6=2.14.3=h73754d4_0
6767
- libgcc=15.2.0=he0feb66_18
6868
- libgcc-ng=15.2.0=h69a702a_18
6969
- libgfortran=15.2.0=h69a702a_18
7070
- libgfortran5=15.2.0=h68bc16d_18
7171
- libhwloc=2.12.2=default_hafda6a7_1000
7272
- libiconv=1.18=h3b78370_2
7373
- libjpeg-turbo=3.1.2=hb03c661_0
74-
- liblapack=3.11.0=5_h5e43f62_mkl
74+
- liblapack=3.11.0=6_h5e43f62_mkl
7575
- liblzma=5.8.2=hb03c661_0
76-
- libnghttp2=1.67.0=had1ee68_0
76+
- libnghttp2=1.68.1=h877daf1_0
7777
- libnsl=2.0.1=hb9d3cd8_1
78-
- libpng=1.6.55=h421ea60_0
78+
- libpng=1.6.56=h421ea60_0
7979
- libscotch=7.0.11=int64_hfcc3fd4_2
8080
- libspatialindex=2.1.0=he57a185_0
8181
- libsqlite=3.52.0=h0c1763c_0
@@ -89,20 +89,20 @@ dependencies:
8989
- libxcrypt=4.4.36=hd590300_1
9090
- libxml2=2.15.1=h26afc86_0
9191
- libxml2-16=2.15.1=ha9997c6_0
92-
- libzlib=1.3.1=hb9d3cd8_2
93-
- llvm-openmp=22.1.0=h4922eb0_0
92+
- libzlib=1.3.2=h25fd6f3_2
93+
- llvm-openmp=22.1.1=h4922eb0_0
9494
- locket=1.0.0=pyhd8ed1ab_0
9595
- markupsafe=3.0.3=py312h8a5da7c_1
9696
- matplotlib-base=3.10.8=py312he3d6523_0
9797
- metis=5.1.0=hd0bcaf9_1007
98-
- mkl=2025.3.0=h0e700b2_463
98+
- mkl=2025.3.1=h0e700b2_10
9999
- msgpack-python=1.1.2=py312hd9148b4_1
100100
- mumps-include=5.8.2=h5a610fb_2
101101
- mumps-seq=5.8.2=hc1b3267_2
102102
- munkres=1.1.4=pyhd8ed1ab_1
103103
- ncurses=6.5=h2d0b736_3
104104
- numcodecs=0.15.1=py312hf79963d_1
105-
- numpy=2.4.2=py312h33ff503_1
105+
- numpy=2.4.3=py312h33ff503_0
106106
- openjpeg=2.5.4=h55fea9a_0
107107
- openpyxl=3.1.5=py312h7f6eeab_3
108108
- openssl=3.6.1=h35e630c_1
@@ -138,7 +138,7 @@ dependencies:
138138
- threadpoolctl=3.6.0=pyhecae5ae_0
139139
- tk=8.6.13=noxft_h366c992_103
140140
- toolz=1.1.0=pyhd8ed1ab_1
141-
- tornado=6.5.3=py312h4c3975b_0
141+
- tornado=6.5.5=py312h4c3975b_0
142142
- tqdm=4.67.3=pyh8f84b5b_0
143143
- trimesh=4.1.8=pyhd8ed1ab_0
144144
- typing-extensions=4.15.0=h396c80c_0
@@ -159,10 +159,10 @@ dependencies:
159159
- zlib-ng=2.3.3=hceb46e0_1
160160
- zstd=1.5.7=hb78ec9c_6
161161
- pip:
162-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb86adf72fb82ea23c8904a39585982ca8793c52
163-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@7e3b1de8e0eab8b7b7199487bab23d8bbf18ce26
164-
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ad1de3ed43ac802bf71eef3fc5ba75d5be525efe
165-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@8a9cf452335379363e15ac7a3cd9bf689d8e2841
162+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@eb0474175000819e93d8dc701ed0fd6101c44451
163+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a4d826715e5f529242e2c7eac2805e05e1ec3027
164+
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@0e66e6b7a44ede34563da6a77ccd87a4cc7b5185
165+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@f7dd0d37aac285dd9ece26396ee39ae72bd6d18d
166166

167167
variables:
168168
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)