Skip to content

Commit b63b0b6

Browse files
deltares-service-accountTeamcityJoerivanEngelen
authored
[TEAMCITY] Update project dependencies (#1504)
Teamcity automatically updated the dependencies defined the pixi.toml file. Please verify that all tests succeed before merging # Dependencies <details> <summary>Explicit dependencies</summary> |Dependency[^1]|Before|After|Change|Environments| |-|-|-|-|-| |[**hypothesis**](https://prefix.dev/channels/conda-forge/packages/hypothesis)|6.130.4|6.131.0|Minor Upgrade|{default, interactive} on *all platforms*| |[**ipython**](https://prefix.dev/channels/conda-forge/packages/ipython)|9.0.2|9.1.0|Minor Upgrade|interactive on *all platforms*| |[**numpy**](https://prefix.dev/channels/conda-forge/packages/numpy)|2.1.3|2.2.4|Minor Upgrade|{default, interactive} on *all platforms*| |[**numba**](https://prefix.dev/channels/conda-forge/packages/numba)|0.61.0|0.61.2|Patch Upgrade|{default, interactive} on *all platforms*| |[**pydantic**](https://prefix.dev/channels/conda-forge/packages/pydantic)|2.11.2|2.11.3|Patch Upgrade|{default, interactive} on *all platforms*| |[**python**](https://prefix.dev/channels/conda-forge/packages/python)|3.13.2|3.13.3|Patch Upgrade|{py310, py313} on *all platforms*| |[**python**](https://prefix.dev/channels/conda-forge/packages/python)|3.12.9|3.12.10|Patch Upgrade|py312 on *all platforms*| |[**python**](https://prefix.dev/channels/conda-forge/packages/python)|3.11.11|3.11.12|Patch Upgrade|{default, interactive, py311} on *all platforms*| |[**ruff**](https://prefix.dev/channels/conda-forge/packages/ruff)|0.11.4|0.11.5|Patch Upgrade|{default, interactive} on *all platforms*| |[**pandas**](https://prefix.dev/channels/conda-forge/packages/pandas)|py311hcf9f919_1|py311hcf9f919_3|Only build string|{default, interactive} on win-64| |[**pandas**](https://prefix.dev/channels/conda-forge/packages/pandas)|py311haeb46be_1|py311hcf53e2f_3|Only build string|{default, interactive} on osx-64| |[**pandas**](https://prefix.dev/channels/conda-forge/packages/pandas)|py311h9cb3ce9_1|py311hca32420_3|Only build string|{default, interactive} on osx-arm64| |[**pandas**](https://prefix.dev/channels/conda-forge/packages/pandas)|py311h7db5c69_1|py311h7db5c69_3|Only build string|{default, interactive} on linux-64| </details> <details> <summary>Implicit dependencies</summary> |Dependency[^1]|Before|After|Change|Environments| |-|-|-|-|-| |[pytz](https://prefix.dev/channels/conda-forge/packages/pytz)|2024.1|2025.2|Major Upgrade|{default, interactive} on *all platforms*| |[jupyterlab](https://prefix.dev/channels/conda-forge/packages/jupyterlab)|4.3.6|4.4.0|Minor Upgrade|interactive on *all platforms*| |[libgpg-error](https://prefix.dev/channels/conda-forge/packages/libgpg-error)|1.51|1.53|Minor Upgrade|{default, interactive} on linux-64| |[libopentelemetry-cpp](https://prefix.dev/channels/conda-forge/packages/libopentelemetry-cpp)|1.19.0|1.20.0|Minor Upgrade|{default, interactive} on {linux-64, osx-64, osx-arm64}| |[libopentelemetry-cpp-headers](https://prefix.dev/channels/conda-forge/packages/libopentelemetry-cpp-headers)|1.19.0|1.20.0|Minor Upgrade|{default, interactive} on {linux-64, osx-64, osx-arm64}| |[libopus](https://prefix.dev/channels/conda-forge/packages/libopus)|1.3.1|1.5.2|Minor Upgrade|{default, interactive} on *all platforms*| |[mysql-common](https://prefix.dev/channels/conda-forge/packages/mysql-common)|9.0.1|9.2.0|Minor Upgrade|{default, interactive} on {linux-64, osx-64, osx-arm64}| |[mysql-libs](https://prefix.dev/channels/conda-forge/packages/mysql-libs)|9.0.1|9.2.0|Minor Upgrade|{default, interactive} on {linux-64, osx-64, osx-arm64}| |[narwhals](https://prefix.dev/channels/conda-forge/packages/narwhals)|1.33.0|1.34.1|Minor Upgrade|{default, interactive} on *all platforms*| |[nlohmann_json](https://prefix.dev/channels/conda-forge/packages/nlohmann_json)|3.11.3|3.12.0|Minor Upgrade|{default, interactive} on *all platforms*| |[notebook](https://prefix.dev/channels/conda-forge/packages/notebook)|7.3.3|7.4.0|Minor Upgrade|interactive on *all platforms*| |[openssl](https://prefix.dev/channels/conda-forge/packages/openssl)|3.4.1|3.5.0|Minor Upgrade|*all*| |[propcache](https://prefix.dev/channels/conda-forge/packages/propcache)|0.2.1|0.3.1|Minor Upgrade|{default, interactive} on *all platforms*| |[trove-classifiers](https://prefix.dev/channels/conda-forge/packages/trove-classifiers)|2025.3.19.19|2025.4.11.15|Minor Upgrade|{default, interactive} on *all platforms*| |[urllib3](https://prefix.dev/channels/conda-forge/packages/urllib3)|2.3.0|2.4.0|Minor Upgrade|{default, interactive} on *all platforms*| |[wayland-protocols](https://prefix.dev/channels/conda-forge/packages/wayland-protocols)|1.42|1.43|Minor Upgrade|{default, interactive} on linux-64| |[c-ares](https://prefix.dev/channels/conda-forge/packages/c-ares)|1.34.4|1.34.5|Patch Upgrade|{default, interactive} on *all platforms*| |[cpython](https://prefix.dev/channels/conda-forge/packages/cpython)|3.13.2|3.13.3|Patch Upgrade|pixi-update on {osx-arm64, win-64}| |[cpython](https://prefix.dev/channels/conda-forge/packages/cpython)|3.11.11|3.11.12|Patch Upgrade|{default, interactive} on *all platforms*| |[debugpy](https://prefix.dev/channels/conda-forge/packages/debugpy)|1.8.13|1.8.14|Patch Upgrade|interactive on *all platforms*| |[harfbuzz](https://prefix.dev/channels/conda-forge/packages/harfbuzz)|11.0.0|11.0.1|Patch Upgrade|{default, interactive} on *all platforms*| |[ipywidgets](https://prefix.dev/channels/conda-forge/packages/ipywidgets)|8.1.5|8.1.6|Patch Upgrade|interactive on *all platforms*| |[jupyterlab_widgets](https://prefix.dev/channels/conda-forge/packages/jupyterlab_widgets)|3.0.13|3.0.14|Patch Upgrade|interactive on *all platforms*| |[level-zero](https://prefix.dev/channels/conda-forge/packages/level-zero)|1.21.8|1.21.9|Patch Upgrade|{default, interactive} on linux-64| |[minizip](https://prefix.dev/channels/conda-forge/packages/minizip)|4.0.7|4.0.9|Patch Upgrade|{default, interactive} on *all platforms*| |[pydantic](https://prefix.dev/channels/conda-forge/packages/pydantic)|2.11.2|2.11.3|Patch Upgrade|pixi-update on *all platforms*| |[python](https://prefix.dev/channels/conda-forge/packages/python)|3.13.2|3.13.3|Patch Upgrade|pixi-update on {osx-arm64, win-64}| |[python](https://prefix.dev/channels/conda-forge/packages/python)|3.12.9|3.12.10|Patch Upgrade|pixi-update on {linux-64, osx-64}| |[python-gil](https://prefix.dev/channels/conda-forge/packages/python-gil)|3.13.2|3.13.3|Patch Upgrade|pixi-update on {osx-arm64, win-64}| |[python-gil](https://prefix.dev/channels/conda-forge/packages/python-gil)|3.11.11|3.11.12|Patch Upgrade|{default, interactive} on *all platforms*| |[typing-extensions](https://prefix.dev/channels/conda-forge/packages/typing-extensions)|4.13.1|4.13.2|Patch Upgrade|{default, interactive, pixi-update} on *all platforms*| |[typing_extensions](https://prefix.dev/channels/conda-forge/packages/typing_extensions)|4.13.1|4.13.2|Patch Upgrade|{default, interactive, pixi-update} on *all platforms*| |[widgetsnbextension](https://prefix.dev/channels/conda-forge/packages/widgetsnbextension)|4.0.13|4.0.14|Patch Upgrade|interactive on *all platforms*| |[_python_abi3_support](https://prefix.dev/channels/conda-forge/packages/_python_abi3_support)|hd8ed1ab_1|hd8ed1ab_2|Only build string|{default, interactive} on *all platforms*<br/>pixi-update on {osx-arm64, win-64}| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|hb56cf8f_6_cpu|hf1fce67_7_cpu|Only build string|{default, interactive} on osx-64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|hac3dc41_6_cpu|hd4a375f_7_cpu|Only build string|{default, interactive} on osx-arm64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|h052fb8e_6_cpu|hb90904d_7_cpu|Only build string|{default, interactive} on linux-64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|hb2d35ca_6_cpu|hb2d35ca_7_cpu|Only build string|{default, interactive} on win-64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|hf07054f_6_cpu|hf07054f_7_cpu|Only build string|{default, interactive} on osx-arm64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|hdc53af8_6_cpu|hdc53af8_7_cpu|Only build string|{default, interactive} on osx-64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|hcb10f89_6_cpu|hcb10f89_7_cpu|Only build string|{default, interactive} on linux-64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|h7d8d6a5_6_cpu|h7d8d6a5_7_cpu|Only build string|{default, interactive} on win-64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|hf07054f_6_cpu|hf07054f_7_cpu|Only build string|{default, interactive} on osx-arm64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|hdc53af8_6_cpu|hdc53af8_7_cpu|Only build string|{default, interactive} on osx-64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|hcb10f89_6_cpu|hcb10f89_7_cpu|Only build string|{default, interactive} on linux-64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|h7d8d6a5_6_cpu|h7d8d6a5_7_cpu|Only build string|{default, interactive} on win-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|he749cb8_6_cpu|he749cb8_7_cpu|Only build string|{default, interactive} on osx-arm64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|hb76e781_6_cpu|hb76e781_7_cpu|Only build string|{default, interactive} on win-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|ha37b807_6_cpu|ha37b807_7_cpu|Only build string|{default, interactive} on osx-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|h1bed206_6_cpu|h1bed206_7_cpu|Only build string|{default, interactive} on linux-64| |[libclang-cpp18.1](https://prefix.dev/channels/conda-forge/packages/libclang-cpp18.1)|default_hf90f093_8|default_hf90f093_9|Only build string|{default, interactive} on osx-arm64| |[libclang-cpp18.1](https://prefix.dev/channels/conda-forge/packages/libclang-cpp18.1)|default_h3571c67_8|default_h3571c67_9|Only build string|{default, interactive} on osx-64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|ha850022_6_cpu|ha850022_7_cpu|Only build string|{default, interactive} on win-64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|h636d7b7_6_cpu|h636d7b7_7_cpu|Only build string|{default, interactive} on osx-arm64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|h283e888_6_cpu|h283e888_7_cpu|Only build string|{default, interactive} on osx-64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|h081d1f1_6_cpu|h081d1f1_7_cpu|Only build string|{default, interactive} on linux-64| |[qt6-main](https://prefix.dev/channels/conda-forge/packages/qt6-main)|hca13b62_1|hca13b62_2|Only build string|{default, interactive} on osx-arm64| |[qt6-main](https://prefix.dev/channels/conda-forge/packages/qt6-main)|h72a539a_1|h72a539a_2|Only build string|{default, interactive} on win-64| |[qt6-main](https://prefix.dev/channels/conda-forge/packages/qt6-main)|h69ed9f3_1|h69ed9f3_2|Only build string|{default, interactive} on osx-64| |[qt6-main](https://prefix.dev/channels/conda-forge/packages/qt6-main)|h6441bc3_1|h6441bc3_2|Only build string|{default, interactive} on linux-64| </details> [^1]: **Bold** means explicit dependency. [^2]: Dependency got downgraded. --------- Co-authored-by: Teamcity <[email protected]> Co-authored-by: JoerivanEngelen <[email protected]>
1 parent 3dba8bf commit b63b0b6

File tree

5 files changed

+1421
-1320
lines changed

5 files changed

+1421
-1320
lines changed

imod/mf6/boundary_condition.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ def _write_textfile(self, outpath, struct_array):
127127
fields = struct_array.dtype.fields
128128
fmt = [self._number_format(field[0]) for field in fields.values()]
129129
header = " ".join(list(fields.keys()))
130-
with open(outpath, "w") as f:
131-
np.savetxt(fname=f, X=struct_array, fmt=fmt, header=header)
130+
np.savetxt(fname=outpath, X=struct_array, fmt=fmt, header=header)
132131

133132
def _write_datafile(self, outpath, ds, binary):
134133
"""
@@ -183,18 +182,22 @@ def _to_struct_array(self, arrdict, layer):
183182

184183
return recarr
185184

186-
def _period_paths(self, directory, pkgname, globaltimes, bin_ds, binary):
185+
def _period_paths(
186+
self, directory: pathlib.Path | str, pkgname: str, globaltimes, bin_ds, binary
187+
):
187188
directory = pathlib.Path(directory) / pkgname
188189

189190
if binary:
190191
ext = "bin"
191192
else:
192193
ext = "dat"
193194

194-
periods = {}
195+
periods: dict[np.int64, str] = {}
196+
# Force to np.int64 for mypy and numpy >= 2.2.4
197+
one = np.int64(1)
195198
if "time" in bin_ds: # one of bin_ds has time
196199
package_times = bin_ds.coords["time"].values
197-
starts = np.searchsorted(globaltimes, package_times) + 1
200+
starts = np.searchsorted(globaltimes, package_times) + one
198201
for i, start in enumerate(starts):
199202
path = directory / f"{self._pkg_id}-{i}.{ext}"
200203
periods[start] = path.as_posix()
@@ -203,15 +206,15 @@ def _period_paths(self, directory, pkgname, globaltimes, bin_ds, binary):
203206
if repeat_stress is not None and repeat_stress.values[()] is not None:
204207
keys = repeat_stress.isel(repeat_items=0).values
205208
values = repeat_stress.isel(repeat_items=1).values
206-
repeat_starts = np.searchsorted(globaltimes, keys) + 1
207-
values_index = np.searchsorted(globaltimes, values) + 1
208-
for i, start in zip(values_index, repeat_starts):
209-
periods[start] = periods[i]
209+
repeat_starts = np.searchsorted(globaltimes, keys) + one
210+
values_index = np.searchsorted(globaltimes, values) + one
211+
for j, start_repeat in zip(values_index, repeat_starts):
212+
periods[start_repeat] = periods[j]
210213
# Now make sure the periods are sorted by key.
211214
periods = dict(sorted(periods.items()))
212215
else:
213216
path = directory / f"{self._pkg_id}.{ext}"
214-
periods[1] = path.as_posix()
217+
periods[one] = path.as_posix()
215218

216219
return periods
217220

imod/mf6/npf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import warnings
22
from copy import deepcopy
3-
from typing import Optional
3+
from typing import Optional, cast
44

55
import numpy as np
66
import xarray as xr
@@ -40,7 +40,8 @@ def _dataarray_to_bool(griddataarray: GridDataArray) -> bool:
4040
if griddataarray.values.dtype != bool:
4141
raise ValueError("DataArray is not a boolean")
4242

43-
return griddataarray.values.item()
43+
bool_value = cast(bool, griddataarray.values.item())
44+
return bool_value
4445

4546

4647
class NodePropertyFlow(Package, IRegridPackage):

imod/mf6/package.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,17 @@ def write_binary_griddata(self, outpath, da, dtype):
171171
da.values.flatten().astype(dtype).tofile(f)
172172

173173
def write_text_griddata(self, outpath, da, dtype):
174-
with open(outpath, "w") as f:
175-
# Note: reshaping here avoids writing newlines after every number.
176-
# This dumps all the values in a single row rather than a single
177-
# column. This is to be preferred, since editors can easily
178-
# "reshape" a long row with "word wrap"; they cannot as easily
179-
# ignore newlines.
180-
fmt = self._number_format(dtype)
181-
data = da.values
182-
if data.ndim > 2:
183-
np.savetxt(fname=f, X=da.values.reshape((1, -1)), fmt=fmt)
184-
else:
185-
np.savetxt(fname=f, X=da.values, fmt=fmt)
174+
# Note: reshaping here avoids writing newlines after every number.
175+
# This dumps all the values in a single row rather than a single
176+
# column. This is to be preferred, since editors can easily
177+
# "reshape" a long row with "word wrap"; they cannot as easily
178+
# ignore newlines.
179+
fmt = self._number_format(dtype)
180+
data = da.values
181+
if data.ndim > 2:
182+
np.savetxt(fname=outpath, X=data.reshape((1, -1)), fmt=fmt)
183+
else:
184+
np.savetxt(fname=outpath, X=data, fmt=fmt)
186185

187186
def _get_render_dictionary(
188187
self,

imod/util/expand_repetitions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def expand_repetitions(
3333
value is the "value". For the "key" datetime, the data of the "value"
3434
datetime will be used.
3535
"""
36-
expanded = {}
36+
expanded: dict[np.datetime64, np.datetime64] = {}
3737
for year, date in itertools.product(
3838
range(time_min.year, time_max.year + 1),
3939
repeat_stress,

0 commit comments

Comments
 (0)