diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c4881bc4871..acace7aab95 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -125,6 +125,7 @@ jobs: - name: Run tests run: python -m pytest -n 4 + --timeout 180 --cov=xarray --cov-report=xml --junitxml=pytest.xml diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh index 62bf08b366f..171ba3bf55f 100755 --- a/ci/install-upstream-wheels.sh +++ b/ci/install-upstream-wheels.sh @@ -48,4 +48,3 @@ python -m pip install \ git+https://github.com/SciTools/nc-time-axis \ git+https://github.com/xarray-contrib/flox \ git+https://github.com/h5netcdf/h5netcdf -python -m pip install pytest-timeout diff --git a/ci/min_deps_check.py b/ci/min_deps_check.py index 3bff655de0a..9631cb03162 100755 --- a/ci/min_deps_check.py +++ b/ci/min_deps_check.py @@ -26,6 +26,7 @@ "pytest-cov", "pytest-env", "pytest-xdist", + "pytest-timeout", } POLICY_MONTHS = {"python": 24, "numpy": 18} diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml index 5581de1d59b..b156297816b 100644 --- a/ci/requirements/all-but-dask.yml +++ b/ci/requirements/all-but-dask.yml @@ -35,6 +35,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - rasterio - scipy - seaborn diff --git a/ci/requirements/bare-minimum.yml b/ci/requirements/bare-minimum.yml index e8d05180966..0a36493fa07 100644 --- a/ci/requirements/bare-minimum.yml +++ b/ci/requirements/bare-minimum.yml @@ -10,6 +10,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - numpy=1.21 - packaging=21.3 - pandas=1.4 diff --git a/ci/requirements/environment-py311.yml b/ci/requirements/environment-py311.yml index 607b5acdd0b..321cd4bb010 100644 --- a/ci/requirements/environment-py311.yml +++ b/ci/requirements/environment-py311.yml @@ -39,6 +39,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - rasterio - scipy - seaborn diff --git a/ci/requirements/environment-windows-py311.yml b/ci/requirements/environment-windows-py311.yml index a07986d187e..321611065a4 100644 --- a/ci/requirements/environment-windows-py311.yml +++ b/ci/requirements/environment-windows-py311.yml @@ -35,6 +35,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - rasterio - scipy - seaborn diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml index cbd6dc599a0..c876887df73 100644 --- a/ci/requirements/environment-windows.yml +++ b/ci/requirements/environment-windows.yml @@ -35,6 +35,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - rasterio - scipy - seaborn diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml index 9dbc5730a16..cd82ccf4f06 100644 --- a/ci/requirements/environment.yml +++ b/ci/requirements/environment.yml @@ -39,6 +39,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - rasterio - scipy - seaborn diff --git a/ci/requirements/min-all-deps.yml b/ci/requirements/min-all-deps.yml index 4df2a3d7b19..036a159675e 100644 --- a/ci/requirements/min-all-deps.yml +++ b/ci/requirements/min-all-deps.yml @@ -44,6 +44,7 @@ dependencies: - pytest-cov - pytest-env - pytest-xdist + - pytest-timeout - rasterio=1.2 - scipy=1.7 - seaborn=0.11