Skip to content

Commit 4b488cc

Browse files
committed
[GEOPY-2029] fixup dependencies
- support for Python 3.12 - scikit-learn is a direct dependency - update commented version for pypi repo upcoming versions - no more empymod - do not restrict ffspec nor mkl - remove mention of panda from conda env, as no pip package is using it: it comes a an indirect dependency through other conda packages - remove mention of tbb and python-tzdata: not needed anymore to solve conflicts between python-tzdata
1 parent 82f9801 commit 4b488cc

16 files changed

Lines changed: 2385 additions & 2947 deletions

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 70ca38b7c7dbf2affc8b75ba0f1e07e95ff3ab4813a8da5c00eabec011825ad8
3+
# input_hash: 55ee19ff2c90ececdd9e48fb426c55b650d231137ad79c0457c83073863be3dc
44

55
channels:
66
- conda-forge
@@ -46,21 +46,20 @@ dependencies:
4646
- cytoolz=1.0.1=py310ha75aee5_0
4747
- dask-core=2024.6.2=pyhd8ed1ab_0
4848
- dataclasses=0.8=pyhc8e2a94_3
49-
- debugpy=1.8.12=py310hf71b8c6_0
49+
- debugpy=1.8.13=py310hf71b8c6_0
5050
- decorator=5.2.1=pyhd8ed1ab_0
5151
- defusedxml=0.7.1=pyhd8ed1ab_0
5252
- dill=0.3.9=pyhd8ed1ab_1
5353
- discretize=0.11.2=py310ha2bacc8_1
5454
- distributed=2024.6.2=pyhd8ed1ab_0
5555
- docutils=0.19=py310hff52083_1
56-
- empymod=2.2.2=pyhd8ed1ab_0
5756
- exceptiongroup=1.2.2=pyhd8ed1ab_1
5857
- executing=2.1.0=pyhd8ed1ab_1
5958
- fasteners=0.19=pyhd8ed1ab_1
6059
- fonttools=4.56.0=py310h89163eb_0
6160
- fqdn=1.5.1=pyhd8ed1ab_1
6261
- freetype=2.12.1=h267a509_2
63-
- fsspec=2022.11.0=pyhd8ed1ab_0
62+
- fsspec=2025.2.0=pyhd8ed1ab_0
6463
- geoana=0.7.2=py310ha2bacc8_0
6564
- greenlet=3.1.1=py310hf71b8c6_1
6665
- h11=0.14.0=pyhd8ed1ab_1
@@ -128,11 +127,10 @@ dependencies:
128127
- libgcc-ng=14.2.0=h69a702a_2
129128
- libgfortran=14.2.0=h69a702a_2
130129
- libgfortran5=14.2.0=hf1ad2bd_2
131-
- libhwloc=2.11.1=default_hecaa2ac_1000
130+
- libhwloc=2.11.2=default_h0d58e46_1001
132131
- libiconv=1.18=h4ce23a2_1
133132
- libjpeg-turbo=3.0.0=hd590300_1
134133
- liblapack=3.9.0=31_hc41d3b0_mkl
135-
- libllvm15=15.0.7=ha7bfdaf_5
136134
- liblzma=5.6.4=hb9d3cd8_0
137135
- libnghttp2=1.64.0=h161d5f1_0
138136
- libnsl=2.0.1=hd590300_0
@@ -152,7 +150,6 @@ dependencies:
152150
- libzlib=1.3.1=hb9d3cd8_2
153151
- linkify-it-py=2.0.3=pyhd8ed1ab_1
154152
- llvm-openmp=19.1.7=h024ca30_0
155-
- llvmlite=0.44.0=py310h1a6248f_0
156153
- locket=1.0.0=pyhd8ed1ab_0
157154
- markdown-it-py=2.2.0=pyhd8ed1ab_0
158155
- markupsafe=3.0.2=py310h89163eb_1
@@ -179,7 +176,6 @@ dependencies:
179176
- nest-asyncio=1.6.0=pyhd8ed1ab_1
180177
- notebook=7.3.2=pyhd8ed1ab_0
181178
- notebook-shim=0.2.4=pyhd8ed1ab_1
182-
- numba=0.61.0=py310h699fe88_1
183179
- numcodecs=0.13.1=py310h5eaa309_0
184180
- numpy=1.26.4=py310hb13e2d6_0
185181
- openjpeg=2.5.3=h5fbd93e_0
@@ -223,7 +219,7 @@ dependencies:
223219
- python-fastjsonschema=2.21.1=pyhd8ed1ab_0
224220
- python-json-logger=2.0.7=pyhd8ed1ab_0
225221
- python-mumps=0.0.3=py310h6410a28_0
226-
- python-tzdata=2023.4=pyhd8ed1ab_0
222+
- python-tzdata=2025.1=pyhd8ed1ab_0
227223
- python_abi=3.10=5_cp310
228224
- pytz=2024.1=pyhd8ed1ab_0
229225
- pyyaml=6.0.2=py310h89163eb_2
@@ -264,7 +260,7 @@ dependencies:
264260
- sqlalchemy=2.0.38=py310ha75aee5_0
265261
- stack_data=0.6.3=pyhd8ed1ab_1
266262
- tabulate=0.9.0=pyhd8ed1ab_2
267-
- tbb=2021.12.0=h84d6215_4
263+
- tbb=2021.13.0=hceb3a55_1
268264
- tblib=3.0.0=pyhd8ed1ab_1
269265
- terminado=0.18.1=pyh0d859eb_0
270266
- threadpoolctl=3.5.0=pyhc1e730c_0
@@ -304,7 +300,7 @@ dependencies:
304300
- zstd=1.5.7=hb8e6e7a_1
305301
- pip:
306302
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
307-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1
303+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f
308304
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
309305
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
310306
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 70ca38b7c7dbf2affc8b75ba0f1e07e95ff3ab4813a8da5c00eabec011825ad8
3+
# input_hash: 55ee19ff2c90ececdd9e48fb426c55b650d231137ad79c0457c83073863be3dc
44

55
channels:
66
- conda-forge
@@ -30,11 +30,10 @@ dependencies:
3030
- dask-core=2024.6.2=pyhd8ed1ab_0
3131
- discretize=0.11.2=py310ha2bacc8_1
3232
- distributed=2024.6.2=pyhd8ed1ab_0
33-
- empymod=2.2.2=pyhd8ed1ab_0
3433
- fasteners=0.19=pyhd8ed1ab_1
3534
- fonttools=4.56.0=py310h89163eb_0
3635
- freetype=2.12.1=h267a509_2
37-
- fsspec=2022.11.0=pyhd8ed1ab_0
36+
- fsspec=2025.2.0=pyhd8ed1ab_0
3837
- geoana=0.7.2=py310ha2bacc8_0
3938
- h2=4.2.0=pyhd8ed1ab_0
4039
- h5py=3.13.0=nompi_py310h60e0fe6_100
@@ -68,11 +67,10 @@ dependencies:
6867
- libgcc-ng=14.2.0=h69a702a_2
6968
- libgfortran=14.2.0=h69a702a_2
7069
- libgfortran5=14.2.0=hf1ad2bd_2
71-
- libhwloc=2.11.1=default_hecaa2ac_1000
70+
- libhwloc=2.11.2=default_h0d58e46_1001
7271
- libiconv=1.18=h4ce23a2_1
7372
- libjpeg-turbo=3.0.0=hd590300_1
7473
- liblapack=3.9.0=31_hc41d3b0_mkl
75-
- libllvm15=15.0.7=ha7bfdaf_5
7674
- liblzma=5.6.4=hb9d3cd8_0
7775
- libnghttp2=1.64.0=h161d5f1_0
7876
- libnsl=2.0.1=hd590300_0
@@ -90,7 +88,6 @@ dependencies:
9088
- libxml2=2.13.6=h8d12d68_0
9189
- libzlib=1.3.1=hb9d3cd8_2
9290
- llvm-openmp=19.1.7=h024ca30_0
93-
- llvmlite=0.44.0=py310h1a6248f_0
9491
- locket=1.0.0=pyhd8ed1ab_0
9592
- markupsafe=3.0.2=py310h89163eb_1
9693
- matplotlib-base=3.8.4=py310hef631a5_2
@@ -101,7 +98,6 @@ dependencies:
10198
- mumps-seq=5.7.3=h2064c95_7
10299
- munkres=1.1.4=pyh9f0ad1d_0
103100
- ncurses=6.5=h2d0b736_3
104-
- numba=0.61.0=py310h699fe88_1
105101
- numcodecs=0.13.1=py310h5eaa309_0
106102
- numpy=1.26.4=py310hb13e2d6_0
107103
- openjpeg=2.5.3=h5fbd93e_0
@@ -123,7 +119,7 @@ dependencies:
123119
- python=3.10.16=he725a3c_1_cpython
124120
- python-dateutil=2.9.0.post0=pyhff2d567_1
125121
- python-mumps=0.0.3=py310h6410a28_0
126-
- python-tzdata=2023.4=pyhd8ed1ab_0
122+
- python-tzdata=2025.1=pyhd8ed1ab_0
127123
- python_abi=3.10=5_cp310
128124
- pytz=2024.1=pyhd8ed1ab_0
129125
- pyyaml=6.0.2=py310h89163eb_2
@@ -133,7 +129,7 @@ dependencies:
133129
- setuptools=75.8.2=pyhff2d567_0
134130
- six=1.17.0=pyhd8ed1ab_0
135131
- sortedcontainers=2.4.0=pyhd8ed1ab_1
136-
- tbb=2021.12.0=h84d6215_4
132+
- tbb=2021.13.0=hceb3a55_1
137133
- tblib=3.0.0=pyhd8ed1ab_1
138134
- threadpoolctl=3.5.0=pyhc1e730c_0
139135
- tk=8.6.13=noxft_h4845f30_101
@@ -157,7 +153,7 @@ dependencies:
157153
- zstd=1.5.7=hb8e6e7a_1
158154
- pip:
159155
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
160-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1
156+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f
161157
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
162158
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
163159
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4

environments/py-3.10-win-64-dev.conda.lock.yml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# Generated by conda-lock.
22
# platform: win-64
3-
# input_hash: 5b9b1265a46aad912e182524b6691d66e40b55b45e60a5abd2383bdab29f00b2
3+
# input_hash: 3794c887194656c944ad346c0ddbbb865b087a56239234bdbfbdad43ef25d0ad
44

55
channels:
66
- conda-forge
77
- nodefaults
88
dependencies:
9+
- _openmp_mutex=4.5=2_gnu
910
- accessible-pygments=0.0.5=pyhd8ed1ab_1
1011
- alabaster=0.7.16=pyhd8ed1ab_0
1112
- annotated-types=0.7.0=pyhd8ed1ab_1
@@ -44,21 +45,20 @@ dependencies:
4445
- cytoolz=1.0.1=py310ha8f682b_0
4546
- dask-core=2024.6.2=pyhd8ed1ab_0
4647
- dataclasses=0.8=pyhc8e2a94_3
47-
- debugpy=1.8.12=py310h9e98ed7_0
48+
- debugpy=1.8.13=py310h9e98ed7_0
4849
- decorator=5.2.1=pyhd8ed1ab_0
4950
- defusedxml=0.7.1=pyhd8ed1ab_0
5051
- dill=0.3.9=pyhd8ed1ab_1
5152
- discretize=0.11.2=py310h3e8ed56_1
5253
- distributed=2024.6.2=pyhd8ed1ab_0
5354
- docutils=0.19=py310h5588dad_1
54-
- empymod=2.2.2=pyhd8ed1ab_0
5555
- exceptiongroup=1.2.2=pyhd8ed1ab_1
5656
- executing=2.1.0=pyhd8ed1ab_1
5757
- fasteners=0.19=pyhd8ed1ab_1
5858
- fonttools=4.56.0=py310h38315fa_0
5959
- fqdn=1.5.1=pyhd8ed1ab_1
6060
- freetype=2.12.1=hdaf720e_2
61-
- fsspec=2022.11.0=pyhd8ed1ab_0
61+
- fsspec=2025.2.0=pyhd8ed1ab_0
6262
- geoana=0.7.2=py310h3e8ed56_0
6363
- greenlet=3.1.1=py310h9e98ed7_1
6464
- h11=0.14.0=pyhd8ed1ab_1
@@ -118,7 +118,9 @@ dependencies:
118118
- libdeflate=1.23=h9062f6e_0
119119
- libdlf=0.3.0=pyhd8ed1ab_1
120120
- libffi=3.4.6=h537db12_0
121-
- libhwloc=2.11.1=default_h8125262_1000
121+
- libgcc=14.2.0=h1383e82_2
122+
- libgomp=14.2.0=h1383e82_2
123+
- libhwloc=2.11.2=default_ha69328c_1001
122124
- libiconv=1.18=h135ad9c_1
123125
- libjpeg-turbo=3.0.0=hcfcfb64_1
124126
- liblapack=3.9.0=31_h1aa476e_mkl
@@ -129,18 +131,13 @@ dependencies:
129131
- libssh2=1.11.1=he619c9f_0
130132
- libtiff=4.7.0=h797046b_3
131133
- libwebp-base=1.5.0=h3b0e114_0
132-
- libxcb=1.16=h013a479_1
134+
- libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9
135+
- libxcb=1.17.0=h0e4246c_0
133136
- libxml2=2.13.6=he286e8c_0
134137
- libzlib=1.3.1=h2466b09_2
135138
- linkify-it-py=2.0.3=pyhd8ed1ab_1
136139
- llvm-openmp=19.1.7=h30eaf37_0
137-
- llvmlite=0.44.0=py310h0288bfe_0
138140
- locket=1.0.0=pyhd8ed1ab_0
139-
- m2w64-gcc-libgfortran=5.3.0=6
140-
- m2w64-gcc-libs=5.3.0=7
141-
- m2w64-gcc-libs-core=5.3.0=7
142-
- m2w64-gmp=6.1.0=2
143-
- m2w64-libwinpthread-git=5.0.0.4634.697f757=2
144141
- markdown-it-py=2.2.0=pyhd8ed1ab_0
145142
- markupsafe=3.0.2=py310h38315fa_1
146143
- matplotlib-base=3.8.4=py310hadb10a8_2
@@ -151,7 +148,6 @@ dependencies:
151148
- mistune=3.1.2=pyhd8ed1ab_0
152149
- mkl=2024.2.2=h66d3029_15
153150
- msgpack-python=1.1.0=py310hc19bc0b_0
154-
- msys2-conda-epoch=20160418=1
155151
- mumps-seq=5.7.3=h9576071_7
156152
- munkres=1.1.4=pyh9f0ad1d_0
157153
- myst-nb=1.2.0=pyh29332c3_0
@@ -164,7 +160,6 @@ dependencies:
164160
- nest-asyncio=1.6.0=pyhd8ed1ab_1
165161
- notebook=7.3.2=pyhd8ed1ab_0
166162
- notebook-shim=0.2.4=pyhd8ed1ab_1
167-
- numba=0.61.0=py310h7793332_1
168163
- numcodecs=0.13.1=py310hb4db72f_0
169164
- numpy=1.26.4=py310hf667824_0
170165
- openjpeg=2.5.3=h4d64b90_0
@@ -185,8 +180,7 @@ dependencies:
185180
- prometheus_client=0.21.1=pyhd8ed1ab_0
186181
- prompt-toolkit=3.0.50=pyha770c72_0
187182
- psutil=7.0.0=py310ha8f682b_0
188-
- pthread-stubs=0.4=hcd874cb_1001
189-
- pthreads-win32=2.9.1=h2466b09_4
183+
- pthread-stubs=0.4=h0e40799_1002
190184
- pure_eval=0.2.3=pyhd8ed1ab_1
191185
- pybtex=0.24.0=pyhd8ed1ab_3
192186
- pybtex-docutils=1.0.3=py310h5588dad_2
@@ -207,7 +201,7 @@ dependencies:
207201
- python-fastjsonschema=2.21.1=pyhd8ed1ab_0
208202
- python-json-logger=2.0.7=pyhd8ed1ab_0
209203
- python-mumps=0.0.3=py310hb64895d_0
210-
- python-tzdata=2023.4=pyhd8ed1ab_0
204+
- python-tzdata=2025.1=pyhd8ed1ab_0
211205
- python_abi=3.10=5_cp310
212206
- pytz=2024.1=pyhd8ed1ab_0
213207
- pywin32=307=py310h9e98ed7_3
@@ -249,7 +243,7 @@ dependencies:
249243
- sqlalchemy=2.0.38=py310ha8f682b_0
250244
- stack_data=0.6.3=pyhd8ed1ab_1
251245
- tabulate=0.9.0=pyhd8ed1ab_2
252-
- tbb=2021.12.0=hc790b64_4
246+
- tbb=2021.13.0=h62715c5_1
253247
- tblib=3.0.0=pyhd8ed1ab_1
254248
- terminado=0.18.1=pyh5737063_0
255249
- threadpoolctl=3.5.0=pyhc1e730c_0
@@ -272,9 +266,9 @@ dependencies:
272266
- unicodedata2=16.0.0=py310ha8f682b_0
273267
- uri-template=1.3.0=pyhd8ed1ab_1
274268
- urllib3=2.3.0=pyhd8ed1ab_0
275-
- vc=14.3=h5fd82a7_24
276-
- vc14_runtime=14.42.34433=h6356254_24
277-
- vs2015_runtime=14.42.34433=hfef2bbc_24
269+
- vc=14.3=hbf610ac_24
270+
- vc14_runtime=14.42.34438=hfd919c2_24
271+
- vs2015_runtime=14.42.34438=h7142326_24
278272
- wcwidth=0.2.13=pyhd8ed1ab_1
279273
- webcolors=24.11.1=pyhd8ed1ab_0
280274
- webencodings=0.5.1=pyhd8ed1ab_3
@@ -283,8 +277,8 @@ dependencies:
283277
- widgetsnbextension=3.6.10=pyhd8ed1ab_0
284278
- win_inet_pton=1.1.0=pyh7428d3b_8
285279
- winpty=0.4.3=4
286-
- xorg-libxau=1.0.11=hcd874cb_0
287-
- xorg-libxdmcp=1.1.3=hcd874cb_0
280+
- xorg-libxau=1.0.12=h0e40799_0
281+
- xorg-libxdmcp=1.1.5=h0e40799_0
288282
- xyzservices=2025.1.0=pyhd8ed1ab_0
289283
- yaml=0.2.5=h8ffe710_2
290284
- zarr=2.14.2=pyhd8ed1ab_0
@@ -295,7 +289,7 @@ dependencies:
295289
- zstd=1.5.7=hbeecb71_1
296290
- pip:
297291
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
298-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1
292+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@57e666e69f78e2961fdb54c715bce14b8d25ce4f
299293
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
300294
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
301295
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4

0 commit comments

Comments
 (0)