From 7a2bae998659dd8d3b5d3db2882a477b3a611e75 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Thu, 24 Apr 2025 09:17:40 -0400 Subject: [PATCH] basic index working --- flopy4/mf6/gwf/dis.py | 6 ++++- flopy4/mf6/indexes.py | 51 +++++++++++++++++++++++++++++++++++++++++++ pixi.lock | 36 +++++++++++++++--------------- pyproject.toml | 2 +- uv.lock | 4 ++-- 5 files changed, 77 insertions(+), 22 deletions(-) create mode 100644 flopy4/mf6/indexes.py diff --git a/flopy4/mf6/gwf/dis.py b/flopy4/mf6/gwf/dis.py index 7f99d7c..a3f4329 100644 --- a/flopy4/mf6/gwf/dis.py +++ b/flopy4/mf6/gwf/dis.py @@ -4,10 +4,11 @@ from xattree import array, dim, field, xattree from flopy4.mf6.converters import convert_array +from flopy4.mf6.indexes import grid_index from flopy4.mf6.package import Package -@xattree +@xattree(index=grid_index, index_scope="gwf") class Dis(Package): length_units: str = field( default=None, @@ -21,6 +22,7 @@ class Dis(Package): default=False, metadata={"block": "options"} ) nlay: int = dim( + coord=False, scope="gwf", default=1, metadata={ @@ -28,6 +30,7 @@ class Dis(Package): }, ) ncol: int = dim( + coord=False, scope="gwf", default=2, metadata={ @@ -35,6 +38,7 @@ class Dis(Package): }, ) nrow: int = dim( + coord=False, scope="gwf", default=2, metadata={ diff --git a/flopy4/mf6/indexes.py b/flopy4/mf6/indexes.py new file mode 100644 index 0000000..c38a048 --- /dev/null +++ b/flopy4/mf6/indexes.py @@ -0,0 +1,51 @@ +import pandas as pd +import xarray as xr +from xarray.core.indexes import Index, PandasIndex +from xarray.core.indexing import merge_sel_results + + +def alias(dataset: xr.Dataset, old_name: str, new_name: str) -> PandasIndex: + """Alias a dimension coordinate to a coordinate with a different name.""" + try: + size = dataset.sizes[old_name] + except KeyError: + try: + size = dataset.dims[old_name] + except KeyError: + size = dataset.attrs[old_name] + return PandasIndex(pd.RangeIndex(size, name=new_name), dim=old_name) + + +class GridIndex(Index): + def __init__(self, indices): + self._indices = indices + + @classmethod + def from_variables(cls, variables): + return { + k: PandasIndex.from_variables({k: v}) for k, v in variables.items() + } + + def create_variables(self, variables=None): + idx_vars = {} + for index in self._indices.values(): + idx_vars.update(index.create_variables(variables)) + return idx_vars + + def sel(self, labels): + results = [] + for k, index in self._indices.items(): + if k in labels: + results.append(index.sel({k: labels[k]})) + return merge_sel_results(results) + + +def grid_index(dataset: xr.Dataset) -> GridIndex: + return GridIndex( + { + # k collides with npf.k so use "lay" + "lay": alias(dataset, "nlay", "lay"), + "col": alias(dataset, "ncol", "col"), + "row": alias(dataset, "nrow", "row"), + } + ) diff --git a/pixi.lock b/pixi.lock index 0797163..805bcf9 100644 --- a/pixi.lock +++ b/pixi.lock @@ -92,7 +92,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5c/23/c7abc0ca0a1526a0774eca151daeb8de62ec457e77262b66b359c3c7679e/tzdata-2025.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -176,7 +176,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5c/23/c7abc0ca0a1526a0774eca151daeb8de62ec457e77262b66b359c3c7679e/tzdata-2025.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -262,7 +262,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5c/23/c7abc0ca0a1526a0774eca151daeb8de62ec457e77262b66b359c3c7679e/tzdata-2025.2-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/6b/11/cc635220681e93a0183390e26485430ca2c7b5f9d33b15c74c2861cb8091/urllib3-2.4.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -487,7 +487,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -696,7 +696,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -907,7 +907,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -1104,7 +1104,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -1287,7 +1287,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -1471,7 +1471,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -1667,7 +1667,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -1848,7 +1848,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -2030,7 +2030,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -2225,7 +2225,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -2408,7 +2408,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -2592,7 +2592,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/ca/51/5447876806d1088a0f8f71e16542bf350918128d0a69437df26047c8e46f/widgetsnbextension-4.0.14-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/91/fd/973deafd9f87085136a58573600646b408ae7af47859f35151f0d83d5090/xarray-2025.3.1-py3-none-any.whl - - pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 + - pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 - pypi: https://files.pythonhosted.org/packages/9a/6e/49408735dae940a0c1c225c6b908fd83bd6e3f5fae120f865754e72f78cb/xyzservices-2025.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/0d/67/971d9a661b66cc1c2fe2472e38085f5025a393ee1c1822b0155cc3f357b7/zarr-3.0.7-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/80/ab/11a76c1e2126084fde2639514f24e6111b789b0bfa4fc6264a8975c7e1f1/zict-3.0.0-py2.py3-none-any.whl @@ -3849,7 +3849,7 @@ packages: - pypi: . name: flopy4 version: 0.0.1.dev0 - sha256: 6392aa184fb7c17a8411e7bc244900208d9664c1dbe37cfe14d0f0a5fe682153 + sha256: 92889d7481f21b63c6200eea0d6e17b6f13b473e495c3fb122031779443594ce requires_dist: - attrs - cattrs @@ -3859,7 +3859,7 @@ packages: - pandas>=2.0.0 - toml>=0.10 - networkx>=3.4.2,<4 - - xarray[io,parallel]>=2024.11.0 + - xarray[io,parallel]>=2025.3.0,<2026 - scipy>=1.14.1,<2 - modflow-devtools[dfn] @ git+https://github.com/MODFLOW-USGS/modflow-devtools.git - xattree @ git+https://github.com/modflowpy/xattree.git @@ -9762,7 +9762,7 @@ packages: - types-pytz ; extra == 'types' - types-setuptools ; extra == 'types' requires_python: '>=3.10' -- pypi: git+https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15 +- pypi: git+https://github.com/modflowpy/xattree.git#ea73008e8421148ed88691dbd62f1d3f7c6d2090 name: xattree version: 0.1.0.dev0 requires_dist: diff --git a/pyproject.toml b/pyproject.toml index ed3869c..73a445b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,7 +42,7 @@ dependencies = [ "pandas>=2.0.0", "toml>=0.10", "networkx>=3.4.2,<4", - "xarray[parallel,io]>=2024.11.0", + "xarray[parallel,io]>=2025.3.0,<2026", "scipy>=1.14.1,<2", "modflow-devtools[dfn] @ git+https://github.com/MODFLOW-USGS/modflow-devtools.git", "xattree @ git+https://github.com/modflowpy/xattree.git", diff --git a/uv.lock b/uv.lock index 9dcab10..8145109 100644 --- a/uv.lock +++ b/uv.lock @@ -853,7 +853,7 @@ requires-dist = [ { name = "sparse", specifier = ">=0.15.5,<1" }, { name = "toml", specifier = ">=0.10" }, { name = "twine", marker = "extra == 'build'" }, - { name = "xarray", extras = ["io", "parallel"], specifier = ">=2024.11.0" }, + { name = "xarray", extras = ["io", "parallel"], specifier = ">=2025.3.0,<2026" }, { name = "xattree", git = "https://github.com/modflowpy/xattree.git" }, ] provides-extras = ["dev", "lint", "test", "build"] @@ -3360,7 +3360,7 @@ parallel = [ [[package]] name = "xattree" version = "0.1.0.dev0" -source = { git = "https://github.com/modflowpy/xattree.git#2268a465fd3e4c2d80f583176fa6010169a7cf15" } +source = { git = "https://github.com/modflowpy/xattree.git#6c2cb601a09106c7feb1e2c0333aee0648b29084" } dependencies = [ { name = "attrs" }, { name = "cattrs" },