From 78411d25b943d1b948e0bc613ffe224c2c65c51b Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Wed, 4 Dec 2024 16:08:21 +0100 Subject: [PATCH 1/2] Make netcdf mandatory --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 28aa2742a..ae5c97633 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,7 @@ dependencies = [ "mikeio >= 1.2", "matplotlib", "xarray", + "netCDF4", "scipy", "jinja2", ] @@ -52,7 +53,6 @@ dev = ["pytest", test = [ "pytest", "pytest-cov", - "netCDF4", "openpyxl", "dask", "mypy", From 126d0f6992e641d1044990aacde04595a14f6390 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Wed, 4 Dec 2024 16:30:19 +0100 Subject: [PATCH 2/2] Run pytest before mypy --- .github/workflows/full_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full_test.yml b/.github/workflows/full_test.yml index 33ff7a676..e209211a2 100644 --- a/.github/workflows/full_test.yml +++ b/.github/workflows/full_test.yml @@ -35,11 +35,11 @@ jobs: - name: Install modelskill run: | pip install .[test] - - name: Static type check - run: make typecheck - name: Test with pytest run: | pytest --cov=modelskill --ignore tests/notebooks/ + - name: Static type check + run: make typecheck - name: Test docstrings with pytest run: | pytest ./modelskill/metrics.py --doctest-modules