From c110845300bab18256ea2a5f9cd05837760ea63b Mon Sep 17 00:00:00 2001 From: veenstrajelmer <60435591+veenstrajelmer@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:24:09 +0200 Subject: [PATCH] 536 release fixed xarray version after new xugrid release (#549) * remove xarray fixed version * updated minimal xugrid version * added all durations to pytest config --- requirements.txt | 4 ++-- setup.cfg | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 527e0edb2..68c583fbc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,11 +6,11 @@ shapely>=1.7.0 geopandas fiona>=1.9 contextily -xarray<2023.9.0 +xarray dask netcdf4>=1.5.3 bottleneck -xugrid>=0.6.4 +xugrid>=0.6.5 cdsapi pydap>=3.3.0 pooch diff --git a/setup.cfg b/setup.cfg index ac13e6526..a1de891a0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,12 +37,11 @@ install_requires = geopandas fiona>=1.9 contextily - #install xarray<2023.9.0 to avoid xugrid ImportError until the next xugrid release: https://github.com/Deltares/xugrid/issues/162 - xarray<2023.9.0 + xarray dask netcdf4>=1.5.3 bottleneck - xugrid>=0.6.4 + xugrid>=0.6.5 cdsapi pydap>=3.3.0 pooch @@ -74,7 +73,7 @@ python_files = test_*.py console_output_style = count norecursedirs = tests/* #norecursedirs = .git .eggs .github dfm_tools.egg-info docs -addopts = -v --tb=short --durations=5 +addopts = -v --tb=short --durations=0 testpaths = tests markers =