Skip to content

Attempt to consolidate tests in CI #6533

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

Merged
max-sixty merged 7 commits into from
Apr 28, 2022
Merged

Attempt to consolidate tests in CI #6533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be67588
Attempt to consolidate tests in CI
max-sixty Apr 28, 2022
9b867fd
max-sixty Apr 28, 2022
01c1e3a
max-sixty Apr 28, 2022
aaedae4
max-sixty Apr 28, 2022
56f8a6c
Merge branch 'main' into gha-test
max-sixty Apr 28, 2022
5542719
max-sixty Apr 28, 2022
5106c9e
Merge branch 'main' into gha-test
max-sixty Apr 28, 2022
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
3 changes: 3 additions & 0 deletions .github/workflows/ci-additional.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
with:
keyword: "[skip-ci]"

# This job is deprecated and can be removed soon. It's still here in case the
# move consolidate with `ci.yaml` missed something which the existing test
# picks up.
test:
name: ${{ matrix.os }} ${{ matrix.env }}
runs-on: ${{ matrix.os }}
Expand Down
29 changes: 28 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ jobs:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
# Bookend python versions
python-version: ["3.8", "3.10"]
include:
# Minimum python version:
- env: "py38-bare-minimum"
python-version: 3.8
os: ubuntu-latest
- env: "py38-min-all-deps"
python-version: 3.8
os: ubuntu-latest
# Latest python version:
- env: "py39-all-but-dask"
Copy link
Contributor

@dcherian dcherian Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could bump these to 3.10 too

python-version: 3.9
os: ubuntu-latest
- env: "py39-flaky"
python-version: 3.9
os: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -52,10 +67,19 @@ jobs:
if [[ ${{ matrix.os }} == windows* ]] ;
then
echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
elif [[ "${{ matrix.env }}" != "" ]] ;
then
if [[ "${{ matrix.env }}" == "py39-flaky" ]] ;
then
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
else
echo "CONDA_ENV_FILE=ci/requirements/${{ matrix.env }}.yml" >> $GITHUB_ENV
fi
else
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV

fi

echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV

- name: Cache conda
Expand Down Expand Up @@ -94,14 +118,17 @@ jobs:
conda info -a
conda list
python xarray/util/print_versions.py

- name: Import xarray
run: |
python -c "import xarray"

- name: Run tests
run: python -m pytest -n 4
--cov=xarray
--cov-report=xml
--junitxml=pytest.xml
$PYTEST_EXTRA_FLAGS

- name: Upload test results
if: always()
Expand Down