Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated xugrid and meshkernel requirements #431

Merged
merged 3 commits into from
Jul 6, 2023
Merged

updated xugrid and meshkernel requirements #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29daac8
updated xugrid and meshkernel requirements
veenstrajelmer Jul 6, 2023
c4a439c
excluded xugrid 0.6.0 because of a bug https://github.com/Deltares/xu…
veenstrajelmer Jul 6, 2023
f6db935
improved formatting
veenstrajelmer Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ xarray<2023.3.0
dask
netcdf4>=1.5.3
bottleneck
xugrid>=0.4.0
xugrid<0.6.0
cdsapi
pydap>=3.3.0
hydrolib-core>=0.5.1
meshkernel>=2.0.2
meshkernel>=2.1.0
9 changes: 5 additions & 4 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,22 @@ install_requires =
scipy<1.10.0
numpy
matplotlib
#install pandas<2.0.0 to avoid conflict with xarray<2023.3.0: https://github.com/Deltares/xugrid/issues/78#issuecomment-1597723955
#install pandas<2.0.0 to avoid conflict with xarray<2023.3.0: https://github.com/Deltares/xugrid/issues/78#issuecomment-1597723955 (solved from xugrid 0.6.0, but has another bug)
pandas<2.0.0
shapely>=1.7.0
geopandas
contextily
#install xarray<2023.3.0 to avoid issue: https://github.com/Deltares/xugrid/issues/78
#install xarray<2023.3.0 to avoid issue: https://github.com/Deltares/xugrid/issues/78 (solved from xugrid 0.6.0, but has another bug)
xarray<2023.3.0
dask
netcdf4>=1.5.3
bottleneck
xugrid>=0.4.0
#install xugrid<0.6.0 to avoid issue: https://github.com/Deltares/xugrid/issues/113
xugrid<0.6.0
cdsapi
pydap>=3.3.0
hydrolib-core>=0.5.1
meshkernel>=2.0.2
meshkernel>=2.1.0
packages = find:
include_package_data = True
zip_safe = False
Expand Down
13 changes: 10 additions & 3 deletions tests/test_external_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ def test_import_shapely():


@pytest.mark.systemtest
def test_xugrid_opendataset_ugridplot(): #this one fails with xarray>=2023.3.0: https://github.com/Deltares/xugrid/issues/78
def test_xugrid_opendataset_ugridplot():
"""
this one fails with xarray>=2023.3.0: https://github.com/Deltares/xugrid/issues/78
"""
file_nc = os.path.join(dir_testinput,'DFM_curvedbend_3D/cb_3d_map.nc')

uds = xu.open_dataset(file_nc,chunks={'time':1})
Expand All @@ -36,8 +39,9 @@ def test_xugrid_opendataset_ugridplot(): #this one fails with xarray>=2023.3.0:


@pytest.mark.unittest
def test_xarray_pandas_resample(): #this one fails with xarray<2023.3.0 (required for test_opendataset_ugridplot()) and pandas>1.5.3: https://github.com/Deltares/xugrid/issues/78#issuecomment-1597723955
def test_xarray_pandas_resample():
"""
this one fails with xarray<2023.3.0 (required for test_opendataset_ugridplot()) and pandas>1.5.3: https://github.com/Deltares/xugrid/issues/78#issuecomment-1597723955
pandas 1.5.3 works with xarray<2023.3.0
pandas 2.0.* fails with xarray<2023.3.0
pandas 2.0.* works with xarray==2023.5.0
Expand All @@ -47,7 +51,10 @@ def test_xarray_pandas_resample(): #this one fails with xarray<2023.3.0 (require


@pytest.mark.unittest
def test_xarray_interp_to_newdim(): #this one fails with scipy>=1.10.0: https://github.com/pydata/xarray/issues/7701
def test_xarray_interp_to_newdim():
"""
this one fails with scipy>=1.10.0: https://github.com/pydata/xarray/issues/7701
"""
ds = xr.Dataset()
so_np = np.array([[[35.819576, 35.82568 , 35.82873 ],
[35.819576, 35.824154, 35.831783],
Expand Down