Skip to content

Commit c2bf9e5

Browse files
deltares-service-accountTeamcityManangka
authored
[TEAMCITY] Update project dependencies (#1688)
Teamcity automatically updated the dependencies defined the pixi.toml file. Please verify that all tests succeed before merging # Dependencies <details open> <summary>Explicit dependencies</summary> |Dependency|Before|After|Change|Environments| |-|-|-|-|-| |[gh](https://prefix.dev/channels/conda-forge/packages/gh)|2.79.0|2.80.0|Minor Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[hypothesis](https://prefix.dev/channels/conda-forge/packages/hypothesis)|6.139.2|6.140.2|Minor Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[numba](https://prefix.dev/channels/conda-forge/packages/numba)|0.61.2|0.62.0|Minor Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[numpy](https://prefix.dev/channels/conda-forge/packages/numpy)|2.2.6|2.3.3|Minor Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[pixi-diff-to-markdown](https://prefix.dev/channels/conda-forge/packages/pixi-diff-to-markdown)[^2]|0.3.5|0.2.5|Minor Downgrade|pixi-update on osx-64| |[ruff](https://prefix.dev/channels/conda-forge/packages/ruff)|0.13.1|0.13.2|Patch Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[pip](https://prefix.dev/channels/conda-forge/packages/pip)|pyh145f28c_0|pyh8b19718_0|Only build string|pixi-update on osx-64| </details> <details> <summary>Implicit dependencies</summary> |Dependency|Before|After|Change|Environments| |-|-|-|-|-| |[libegl-devel](https://prefix.dev/channels/conda-forge/packages/libegl-devel)||1.7.0|Added|{default, interactive, user-acceptance} on linux-64| |[libgl-devel](https://prefix.dev/channels/conda-forge/packages/libgl-devel)||1.7.0|Added|{default, interactive, user-acceptance} on linux-64| |[libglx-devel](https://prefix.dev/channels/conda-forge/packages/libglx-devel)||1.7.0|Added|{default, interactive, user-acceptance} on linux-64| |[ordered_enum](https://prefix.dev/channels/conda-forge/packages/ordered_enum)||0.0.9|Added|pixi-update on osx-64| |[setuptools](https://prefix.dev/channels/conda-forge/packages/setuptools)||80.9.0|Added|pixi-update on osx-64| |[wheel](https://prefix.dev/channels/conda-forge/packages/wheel)||0.45.1|Added|pixi-update on osx-64| |[xorg-xorgproto](https://prefix.dev/channels/conda-forge/packages/xorg-xorgproto)||2024.1|Added|{default, interactive, user-acceptance} on linux-64| |_python_abi3_support|1.0||Removed|pixi-update on osx-64| |cpython|3.13.7||Removed|pixi-update on osx-64| |libmpdec|4.0.0||Removed|pixi-update on osx-64| |python-gil|3.13.7||Removed|pixi-update on osx-64| |[adwaita-icon-theme](https://prefix.dev/channels/conda-forge/packages/adwaita-icon-theme)|48.1|49.0|Major Upgrade|{default, interactive, user-acceptance} on {linux-64, osx-64, osx-arm64}| |[cffi](https://prefix.dev/channels/conda-forge/packages/cffi)|1.17.1|2.0.0|Major Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[zc.lockfile](https://prefix.dev/channels/conda-forge/packages/zc.lockfile)|3.0.post1|4.0|Major Upgrade|user-acceptance on *all platforms*| |[anyio](https://prefix.dev/channels/conda-forge/packages/anyio)|4.10.0|4.11.0|Minor Upgrade|interactive on *all platforms*| |[lark](https://prefix.dev/channels/conda-forge/packages/lark)|1.2.2|1.3.0|Minor Upgrade|interactive on *all platforms*| |[llvmlite](https://prefix.dev/channels/conda-forge/packages/llvmlite)|0.44.0|0.45.0|Minor Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[pydantic-settings](https://prefix.dev/channels/conda-forge/packages/pydantic-settings)|2.10.1|2.11.0|Minor Upgrade|pixi-update on *all platforms*| |[typer](https://prefix.dev/channels/conda-forge/packages/typer)|0.17.4|0.19.2|Minor Upgrade|user-acceptance on *all platforms*| |[typer-slim](https://prefix.dev/channels/conda-forge/packages/typer-slim)|0.17.4|0.19.2|Minor Upgrade|user-acceptance on *all platforms*| |[typer-slim-standard](https://prefix.dev/channels/conda-forge/packages/typer-slim-standard)|0.17.4|0.19.2|Minor Upgrade|user-acceptance on *all platforms*| |[click](https://prefix.dev/channels/conda-forge/packages/click)[^2]|8.3.0|8.1.8|Minor Downgrade|pixi-update on osx-64| |[py-rattler](https://prefix.dev/channels/conda-forge/packages/py-rattler)[^2]|0.15.0|0.8.2|Minor Downgrade|pixi-update on osx-64| |[python](https://prefix.dev/channels/conda-forge/packages/python)[^2]|3.13.7|3.12.11|Minor Downgrade|pixi-update on osx-64| |[python_abi](https://prefix.dev/channels/conda-forge/packages/python_abi)[^2]|3.13|3.12|Minor Downgrade|pixi-update on osx-64| |[typer](https://prefix.dev/channels/conda-forge/packages/typer)[^2]|0.16.1|0.15.4|Minor Downgrade|pixi-update on osx-64| |[typer-slim](https://prefix.dev/channels/conda-forge/packages/typer-slim)[^2]|0.16.1|0.15.4|Minor Downgrade|pixi-update on osx-64| |[typer-slim-standard](https://prefix.dev/channels/conda-forge/packages/typer-slim-standard)[^2]|0.16.1|0.15.4|Minor Downgrade|pixi-update on osx-64| |[atpublic](https://prefix.dev/channels/conda-forge/packages/atpublic)|6.0.1|6.0.2|Patch Upgrade|user-acceptance on *all platforms*| |[aws-crt-cpp](https://prefix.dev/channels/conda-forge/packages/aws-crt-cpp)|0.34.3|0.34.4|Patch Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[coverage](https://prefix.dev/channels/conda-forge/packages/coverage)|7.10.6|7.10.7|Patch Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[dulwich](https://prefix.dev/channels/conda-forge/packages/dulwich)|0.24.1|0.24.2|Patch Upgrade|user-acceptance on *all platforms*| |[dvc-objects](https://prefix.dev/channels/conda-forge/packages/dvc-objects)|5.1.1|5.1.2|Patch Upgrade|user-acceptance on *all platforms*| |[jupyterlab](https://prefix.dev/channels/conda-forge/packages/jupyterlab)|4.4.7|4.4.9|Patch Upgrade|interactive on *all platforms*| |[level-zero](https://prefix.dev/channels/conda-forge/packages/level-zero)|1.24.2|1.24.3|Patch Upgrade|{default, interactive, user-acceptance} on linux-64| |[libclang13](https://prefix.dev/channels/conda-forge/packages/libclang13)|21.1.1|21.1.2|Patch Upgrade|{default, interactive, user-acceptance} on win-64| |[libcxx](https://prefix.dev/channels/conda-forge/packages/libcxx)|21.1.1|21.1.2|Patch Upgrade|{default, interactive, user-acceptance} on {osx-64, osx-arm64}| |[libuuid](https://prefix.dev/channels/conda-forge/packages/libuuid)|2.41.1|2.41.2|Patch Upgrade|*all envs* on linux-64| |[markupsafe](https://prefix.dev/channels/conda-forge/packages/markupsafe)|3.0.2|3.0.3|Patch Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[notebook](https://prefix.dev/channels/conda-forge/packages/notebook)|7.4.5|7.4.6|Patch Upgrade|interactive on *all platforms*| |[pyyaml](https://prefix.dev/channels/conda-forge/packages/pyyaml)|6.0.2|6.0.3|Patch Upgrade|{default, interactive, user-acceptance} on *all platforms*| |[wcwidth](https://prefix.dev/channels/conda-forge/packages/wcwidth)|0.2.13|0.2.14|Patch Upgrade|{interactive, user-acceptance} on *all platforms*| |[ordered-enum](https://prefix.dev/channels/conda-forge/packages/ordered-enum)[^2]|0.0.10|0.0.9|Patch Downgrade|pixi-update on osx-64| |[aws-sdk-cpp](https://prefix.dev/channels/conda-forge/packages/aws-sdk-cpp)|h08d6979_3|hda6ec86_4|Only build string|{default, interactive, user-acceptance} on osx-64| |[aws-sdk-cpp](https://prefix.dev/channels/conda-forge/packages/aws-sdk-cpp)|h2d2fbd4_3|h32384e2_4|Only build string|{default, interactive, user-acceptance} on linux-64| |[aws-sdk-cpp](https://prefix.dev/channels/conda-forge/packages/aws-sdk-cpp)|hffd64b9_3|h296c955_4|Only build string|{default, interactive, user-acceptance} on win-64| |[aws-sdk-cpp](https://prefix.dev/channels/conda-forge/packages/aws-sdk-cpp)|h31bab0c_3|h2169b1b_4|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[billiard](https://prefix.dev/channels/conda-forge/packages/billiard)|py312he06e257_0|py312he06e257_1|Only build string|user-acceptance on win-64| |[billiard](https://prefix.dev/channels/conda-forge/packages/billiard)|py312h80b0991_0|py312h80b0991_1|Only build string|user-acceptance on osx-64| |[billiard](https://prefix.dev/channels/conda-forge/packages/billiard)|py312h4c3975b_0|py312h4c3975b_1|Only build string|user-acceptance on linux-64| |[billiard](https://prefix.dev/channels/conda-forge/packages/billiard)|py312h4409184_0|py312h4409184_1|Only build string|user-acceptance on osx-arm64| |[epoxy](https://prefix.dev/channels/conda-forge/packages/epoxy)|h1c322ee_1|hc919400_2|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[epoxy](https://prefix.dev/channels/conda-forge/packages/epoxy)|h166bdaf_1|hb03c661_2|Only build string|{default, interactive, user-acceptance} on linux-64| |[epoxy](https://prefix.dev/channels/conda-forge/packages/epoxy)|h5eb16cf_1|h8616949_2|Only build string|{default, interactive, user-acceptance} on osx-64| |[ld_impl_linux-64](https://prefix.dev/channels/conda-forge/packages/ld_impl_linux-64)|h1423503_1|ha97dd6f_2|Only build string|*all envs* on linux-64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|hdbfeaa0_5_cpu|hcbb3402_6_cpu|Only build string|{default, interactive, user-acceptance} on win-64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|hac26942_5_cpu|h73424eb_6_cpu|Only build string|{default, interactive, user-acceptance} on linux-64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|hd55f110_5_cpu|h4c37d73_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[libarrow](https://prefix.dev/channels/conda-forge/packages/libarrow)|h925ef0d_5_cpu|h21b10d8_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|hc317990_5_cpu|hc317990_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|h7d8d6a5_5_cpu|h7d8d6a5_6_cpu|Only build string|{default, interactive, user-acceptance} on win-64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|h635bf11_5_cpu|h635bf11_6_cpu|Only build string|{default, interactive, user-acceptance} on linux-64| |[libarrow-acero](https://prefix.dev/channels/conda-forge/packages/libarrow-acero)|h2db2d7d_5_cpu|h2db2d7d_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-64| |[libarrow-compute](https://prefix.dev/channels/conda-forge/packages/libarrow-compute)|h8c2c5c3_5_cpu|h8c2c5c3_6_cpu|Only build string|{default, interactive, user-acceptance} on linux-64| |[libarrow-compute](https://prefix.dev/channels/conda-forge/packages/libarrow-compute)|h7751554_5_cpu|h7751554_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-64| |[libarrow-compute](https://prefix.dev/channels/conda-forge/packages/libarrow-compute)|h75845d1_5_cpu|h75845d1_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[libarrow-compute](https://prefix.dev/channels/conda-forge/packages/libarrow-compute)|h2db994a_5_cpu|h2db994a_6_cpu|Only build string|{default, interactive, user-acceptance} on win-64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|hc317990_5_cpu|hc317990_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|h7d8d6a5_5_cpu|h7d8d6a5_6_cpu|Only build string|{default, interactive, user-acceptance} on win-64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|h635bf11_5_cpu|h635bf11_6_cpu|Only build string|{default, interactive, user-acceptance} on linux-64| |[libarrow-dataset](https://prefix.dev/channels/conda-forge/packages/libarrow-dataset)|h2db2d7d_5_cpu|h2db2d7d_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|hf865cc0_5_cpu|hf865cc0_6_cpu|Only build string|{default, interactive, user-acceptance} on win-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|h4653b8a_5_cpu|h4653b8a_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|h3f74fd7_5_cpu|h3f74fd7_6_cpu|Only build string|{default, interactive, user-acceptance} on linux-64| |[libarrow-substrait](https://prefix.dev/channels/conda-forge/packages/libarrow-substrait)|h144af7f_5_cpu|h144af7f_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[libgit2](https://prefix.dev/channels/conda-forge/packages/libgit2)|hc9b8bfc_0|hce7164d_1|Only build string|user-acceptance on win-64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|ha67a804_5_cpu|ha67a804_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|h790f06f_5_cpu|h790f06f_6_cpu|Only build string|{default, interactive, user-acceptance} on linux-64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|h45c8936_5_cpu|h45c8936_6_cpu|Only build string|{default, interactive, user-acceptance} on osx-arm64| |[libparquet](https://prefix.dev/channels/conda-forge/packages/libparquet)|h24c48c9_5_cpu|h24c48c9_6_cpu|Only build string|{default, interactive, user-acceptance} on win-64| |[openssl](https://prefix.dev/channels/conda-forge/packages/openssl)|h725018a_0|h725018a_1|Only build string|*all envs* on win-64| |[openssl](https://prefix.dev/channels/conda-forge/packages/openssl)|h5503f6c_0|h5503f6c_1|Only build string|*all envs* on osx-arm64| |[openssl](https://prefix.dev/channels/conda-forge/packages/openssl)|h26f9b46_0|h26f9b46_1|Only build string|*all envs* on linux-64| |[openssl](https://prefix.dev/channels/conda-forge/packages/openssl)|h230baf5_0|h230baf5_1|Only build string|*all envs* on osx-64| |[pathlib2](https://prefix.dev/channels/conda-forge/packages/pathlib2)|py312hb401068_4|py312hb401068_5|Only build string|user-acceptance on osx-64| |[pathlib2](https://prefix.dev/channels/conda-forge/packages/pathlib2)|py312h81bd7bf_4|py312h81bd7bf_5|Only build string|user-acceptance on osx-arm64| |[pathlib2](https://prefix.dev/channels/conda-forge/packages/pathlib2)|py312h7900ff3_4|py312h7900ff3_5|Only build string|user-acceptance on linux-64| |[pathlib2](https://prefix.dev/channels/conda-forge/packages/pathlib2)|py312h2e8e312_4|py312h2e8e312_5|Only build string|user-acceptance on win-64| |[py-rattler](https://prefix.dev/channels/conda-forge/packages/py-rattler)|py310hdba2031_1|py310hb39080a_1|Only build string|pixi-update on win-64| |[py-rattler](https://prefix.dev/channels/conda-forge/packages/py-rattler)|py310h96efe9e_1|py310h96aa460_1|Only build string|pixi-update on osx-arm64| |[pydantic-core](https://prefix.dev/channels/conda-forge/packages/pydantic-core)|py313hb35714d_0|py312haba3716_0|Only build string|pixi-update on osx-64| </details> [^1]: **Bold** means explicit dependency. [^2]: Dependency got downgraded. --------- Co-authored-by: Teamcity <teamcity@deltares.nl> Co-authored-by: Sunny Titus <sunny.titus@deltares.nl>
1 parent c8be95b commit c2bf9e5

4 files changed

Lines changed: 1270 additions & 1185 deletions

File tree

imod/mf6/simulation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,13 @@ def create_time_discretization(self, additional_times, validate: bool = True):
238238
times.extend(model._yield_times())
239239

240240
# np.unique also sorts
241-
times = np.unique(np.hstack(times))
241+
unique_times = np.unique(np.hstack(times))
242242

243-
duration = imod.util.time.timestep_duration(times, self.use_cftime)
243+
duration = imod.util.time.timestep_duration(unique_times, self.use_cftime)
244244
# Generate time discretization, just rely on default arguments
245245
# Probably won't be used that much anyway?
246246
timestep_duration = xr.DataArray(
247-
duration, coords={"time": np.array(times)[:-1]}, dims=("time",)
247+
duration, coords={"time": unique_times[:-1]}, dims=("time",)
248248
)
249249
self["time_discretization"] = imod.mf6.TimeDiscretization(
250250
timestep_duration=timestep_duration, validate=validate

imod/tests/test_mf6/test_utilities/test_mf6_clipped_boundary_condition_creator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_create_different_n_clipped_cells(self, circle_dis, n_clipped_cells):
6969
number_clipped_head_locations = np.count_nonzero(
7070
~np.isnan(result_clipped_head.sel(layer=layer_index))
7171
)
72-
assert number_clipped_head_locations is n_clipped_cells
72+
assert number_clipped_head_locations == n_clipped_cells
7373

7474
@pytest.mark.parametrize(
7575
"dis, grid_data_array", [("basic_unstructured_dis", xu), ("basic_dis", xr)]
@@ -117,4 +117,4 @@ def test_create_different_dis(self, dis, grid_data_array, request):
117117
number_clipped_head_locations = np.count_nonzero(
118118
~np.isnan(result_clipped_head.sel(layer=1))
119119
)
120-
assert number_clipped_head_locations is n_clipped_cells
120+
assert number_clipped_head_locations == n_clipped_cells

imod/typing/structured.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def merge_arrays(
135135
return out
136136

137137

138-
def _unique_coords(das: List[xr.DataArray], dim: str) -> xr.DataArray:
138+
def _unique_coords(das: List[xr.DataArray], dim: str) -> np.ndarray:
139139
"""Collect unique coords in list of dataarrays"""
140140
return np.unique(np.concatenate([da.coords[dim].values for da in das]))
141141

0 commit comments

Comments
 (0)