Skip to content

Commit 15e00ff

Browse files
committed
Revert "[revert]"
This reverts commit 6a38e27.
1 parent b85f5e8 commit 15e00ff

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,25 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
matrix:
45-
os: ["ubuntu-latest"]
45+
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
4646
# Bookend python versions
47-
python-version: ["3.12"]
47+
python-version: ["3.9", "3.11", "3.12"]
4848
env: [""]
49-
# include:
50-
# # Minimum python version:
51-
# - env: "bare-minimum"
52-
# python-version: "3.9"
53-
# os: ubuntu-latest
54-
# - env: "min-all-deps"
55-
# python-version: "3.9"
56-
# os: ubuntu-latest
57-
# # Latest python version:
58-
# - env: "all-but-dask"
59-
# python-version: "3.10"
60-
# os: ubuntu-latest
61-
# - env: "flaky"
62-
# python-version: "3.10"
63-
# os: ubuntu-latest
49+
include:
50+
# Minimum python version:
51+
- env: "bare-minimum"
52+
python-version: "3.9"
53+
os: ubuntu-latest
54+
- env: "min-all-deps"
55+
python-version: "3.9"
56+
os: ubuntu-latest
57+
# Latest python version:
58+
- env: "all-but-dask"
59+
python-version: "3.10"
60+
os: ubuntu-latest
61+
- env: "flaky"
62+
python-version: "3.10"
63+
os: ubuntu-latest
6464
steps:
6565
- uses: actions/checkout@v4
6666
with:
@@ -136,7 +136,12 @@ jobs:
136136
save-always: true
137137

138138
- name: Run tests
139-
run: python -m pytest
139+
run: python -m pytest -n 4
140+
--timeout 180
141+
--cov=xarray
142+
--cov-report=xml
143+
--junitxml=pytest.xml
144+
$PYTEST_EXTRA_FLAGS
140145

141146
- name: Upload test results
142147
if: always()

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ markers = [
298298
]
299299
minversion = "7"
300300
python_files = "test_*.py"
301-
testpaths = ["properties"]
301+
testpaths = ["xarray/tests", "properties"]
302302

303303
[tool.aliases]
304304
test = "pytest"

0 commit comments

Comments
 (0)