diff --git a/.coveragerc b/.coveragerc
index 1bf19c310aa..3ba0b9591e0 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
[run]
omit =
- xarray/tests/*
- xarray/core/dask_array_compat.py
- xarray/core/npcompat.py
- xarray/core/pdcompat.py
- xarray/core/pycompat.py
+ */xarray/tests/*
+ */xarray/core/dask_array_compat.py
+ */xarray/core/npcompat.py
+ */xarray/core/pdcompat.py
+ */xarray/core/pycompat.py
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000000..02bc5d0f7b0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
+
+**What happened**:
+
+**What you expected to happen**:
+
+**Minimal Complete Verifiable Example**:
+
+```python
+# Put your MCVE code here
+```
+
+**Anything else we need to know?**:
+
+**Environment**:
+
+Output of xr.show_versions()
+
+
+
+
+Output of xr.show_versions()
-
-
-
-
-
+ Overriding CI behaviors
+
+ By default, the upstream dev CI is disabled on pull request and push events. You can override this behavior per commit by adding a [test-upstream] tag to the first line of the commit message. For documentation-only commits, you can skip the CI per commit by adding a [skip-ci] tag to the first line of the commit message
+
diff --git a/.github/actions/detect-ci-trigger/action.yaml b/.github/actions/detect-ci-trigger/action.yaml
new file mode 100644
index 00000000000..c255d0c57cc
--- /dev/null
+++ b/.github/actions/detect-ci-trigger/action.yaml
@@ -0,0 +1,29 @@
+name: Detect CI Trigger
+description: |
+ Detect a keyword used to control the CI in the subject line of a commit message.
+inputs:
+ keyword:
+ description: |
+ The keyword to detect.
+ required: true
+outputs:
+ trigger-found:
+ description: |
+ true if the keyword has been found in the subject line of the commit message
+ value: ${{ steps.detect-trigger.outputs.CI_TRIGGERED }}
+runs:
+ using: "composite"
+ steps:
+ - name: detect trigger
+ id: detect-trigger
+ run: |
+ bash $GITHUB_ACTION_PATH/script.sh ${{ github.event_name }} ${{ inputs.keyword }}
+ shell: bash
+ - name: show detection result
+ run: |
+ echo "::group::final summary"
+ echo "commit message: ${{ steps.detect-trigger.outputs.COMMIT_MESSAGE }}"
+ echo "trigger keyword: ${{ inputs.keyword }}"
+ echo "trigger found: ${{ steps.detect-trigger.outputs.CI_TRIGGERED }}"
+ echo "::endgroup::"
+ shell: bash
diff --git a/.github/actions/detect-ci-trigger/script.sh b/.github/actions/detect-ci-trigger/script.sh
new file mode 100644
index 00000000000..c98175a5a08
--- /dev/null
+++ b/.github/actions/detect-ci-trigger/script.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+event_name="$1"
+keyword="$2"
+
+echo "::group::fetch a sufficient number of commits"
+echo "skipped"
+# git log -n 5 2>&1
+# if [[ "$event_name" == "pull_request" ]]; then
+# ref=$(git log -1 --format='%H')
+# git -c protocol.version=2 fetch --deepen=2 --no-tags --prune --progress -q origin $ref 2>&1
+# git log FETCH_HEAD
+# git checkout FETCH_HEAD
+# else
+# echo "nothing to do."
+# fi
+# git log -n 5 2>&1
+echo "::endgroup::"
+
+echo "::group::extracting the commit message"
+echo "event name: $event_name"
+if [[ "$event_name" == "pull_request" ]]; then
+ ref="HEAD^2"
+else
+ ref="HEAD"
+fi
+
+commit_message="$(git log -n 1 --pretty=format:%s "$ref")"
+
+if [[ $(echo $commit_message | wc -l) -le 1 ]]; then
+ echo "commit message: '$commit_message'"
+else
+ echo -e "commit message:\n--- start ---\n$commit_message\n--- end ---"
+fi
+echo "::endgroup::"
+
+echo "::group::scanning for the keyword"
+echo "searching for: '$keyword'"
+if echo "$commit_message" | grep -qF "$keyword"; then
+ result="true"
+else
+ result="false"
+fi
+echo "keyword detected: $result"
+echo "::endgroup::"
+
+echo "::set-output name=COMMIT_MESSAGE::$commit_message"
+echo "::set-output name=CI_TRIGGERED::$result"
diff --git a/.github/stale.yml b/.github/stale.yml
index f4835b5eeec..f4057844d01 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -56,4 +56,4 @@ limitPerRun: 1 # start with a small number
# issues:
# exemptLabels:
-# - confirmed
\ No newline at end of file
+# - confirmed
diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
new file mode 100644
index 00000000000..fdc61f2f4f7
--- /dev/null
+++ b/.github/workflows/ci-additional.yaml
@@ -0,0 +1,191 @@
+name: CI Additional
+on:
+ push:
+ branches:
+ - "*"
+ pull_request:
+ branches:
+ - "*"
+ workflow_dispatch: # allows you to trigger manually
+
+jobs:
+ detect-ci-trigger:
+ name: detect ci trigger
+ runs-on: ubuntu-latest
+ if: github.event_name == 'push' || github.event_name == 'pull_request'
+ outputs:
+ triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 2
+ - uses: ./.github/actions/detect-ci-trigger
+ id: detect-trigger
+ with:
+ keyword: "[skip-ci]"
+
+ test:
+ name: ${{ matrix.os }} ${{ matrix.env }}
+ runs-on: ${{ matrix.os }}
+ needs: detect-ci-trigger
+ if: needs.detect-ci-trigger.outputs.triggered == 'false'
+ defaults:
+ run:
+ shell: bash -l {0}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: ["ubuntu-latest"]
+ env:
+ [
+ "py37-bare-minimum",
+ "py37-min-all-deps",
+ "py37-min-nep18",
+ "py38-all-but-dask",
+ "py38-backend-api-v2",
+ "py38-flaky",
+ ]
+ steps:
+ - name: Cancel previous runs
+ uses: styfle/cancel-workflow-action@0.6.0
+ with:
+ access_token: ${{ github.token }}
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 # Fetch all history for all branches and tags.
+
+ - name: Set environment variables
+ run: |
+ if [[ ${{ matrix.env }} == "py38-backend-api-v2" ]] ;
+ then
+ echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
+ echo "XARRAY_BACKEND_API=v2" >> $GITHUB_ENV
+
+ elif [[ ${{ matrix.env }} == "py38-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
+ - name: Cache conda
+ uses: actions/cache@v2
+ with:
+ path: ~/conda_pkgs_dir
+ key:
+ ${{ runner.os }}-conda-${{ matrix.env }}-${{
+ hashFiles('ci/requirements/**.yml') }}
+
+ - uses: conda-incubator/setup-miniconda@v2
+ with:
+ channels: conda-forge
+ channel-priority: strict
+ mamba-version: "*"
+ activate-environment: xarray-tests
+ auto-update-conda: false
+ python-version: 3.8
+ use-only-tar-bz2: true
+
+ - name: Install conda dependencies
+ run: |
+ mamba env update -f $CONDA_ENV_FILE
+
+ - name: Install xarray
+ run: |
+ python -m pip install --no-deps -e .
+
+ - name: Version info
+ run: |
+ 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 \
+ $PYTEST_EXTRA_FLAGS
+
+ - name: Upload code coverage to Codecov
+ uses: codecov/codecov-action@v1
+ with:
+ file: ./coverage.xml
+ flags: unittests,${{ matrix.env }}
+ env_vars: RUNNER_OS
+ name: codecov-umbrella
+ fail_ci_if_error: false
+ doctest:
+ name: Doctests
+ runs-on: "ubuntu-latest"
+ needs: detect-ci-trigger
+ if: needs.detect-ci-trigger.outputs.triggered == 'false'
+ defaults:
+ run:
+ shell: bash -l {0}
+
+ steps:
+ - name: Cancel previous runs
+ uses: styfle/cancel-workflow-action@0.6.0
+ with:
+ access_token: ${{ github.token }}
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 # Fetch all history for all branches and tags.
+ - uses: conda-incubator/setup-miniconda@v2
+ with:
+ channels: conda-forge
+ channel-priority: strict
+ mamba-version: "*"
+ activate-environment: xarray-tests
+ auto-update-conda: false
+ python-version: "3.8"
+
+ - name: Install conda dependencies
+ run: |
+ mamba env update -f ci/requirements/environment.yml
+ - name: Install xarray
+ run: |
+ python -m pip install --no-deps -e .
+ - name: Version info
+ run: |
+ conda info -a
+ conda list
+ python xarray/util/print_versions.py
+ - name: Run doctests
+ run: |
+ python -m pytest --doctest-modules xarray --ignore xarray/tests
+
+ min-version-policy:
+ name: Minimum Version Policy
+ runs-on: "ubuntu-latest"
+ needs: detect-ci-trigger
+ if: needs.detect-ci-trigger.outputs.triggered == 'false'
+ defaults:
+ run:
+ shell: bash -l {0}
+
+ steps:
+ - name: Cancel previous runs
+ uses: styfle/cancel-workflow-action@0.6.0
+ with:
+ access_token: ${{ github.token }}
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 # Fetch all history for all branches and tags.
+ - uses: conda-incubator/setup-miniconda@v2
+ with:
+ channels: conda-forge
+ channel-priority: strict
+ mamba-version: "*"
+ auto-update-conda: false
+ python-version: "3.8"
+
+ - name: minimum versions policy
+ run: |
+ mamba install -y pyyaml conda
+ python ci/min_deps_check.py ci/requirements/py37-bare-minimum.yml
+ python ci/min_deps_check.py ci/requirements/py37-min-all-deps.yml
diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml
new file mode 100644
index 00000000000..1ab5642367e
--- /dev/null
+++ b/.github/workflows/ci-pre-commit.yml
@@ -0,0 +1,16 @@
+name: linting
+
+on:
+ push:
+ branches: "*"
+ pull_request:
+ branches: "*"
+
+jobs:
+ linting:
+ name: "pre-commit hooks"
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ - uses: pre-commit/action@v2.0.0
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 00000000000..7d7326eb5c2
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,104 @@
+name: CI
+on:
+ push:
+ branches:
+ - "*"
+ pull_request:
+ branches:
+ - "*"
+ workflow_dispatch: # allows you to trigger manually
+
+jobs:
+ detect-ci-trigger:
+ name: detect ci trigger
+ runs-on: ubuntu-latest
+ if: github.event_name == 'push' || github.event_name == 'pull_request'
+ outputs:
+ triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 2
+ - uses: ./.github/actions/detect-ci-trigger
+ id: detect-trigger
+ with:
+ keyword: "[skip-ci]"
+ test:
+ name: ${{ matrix.os }} py${{ matrix.python-version }}
+ runs-on: ${{ matrix.os }}
+ needs: detect-ci-trigger
+ if: needs.detect-ci-trigger.outputs.triggered == 'false'
+ defaults:
+ run:
+ shell: bash -l {0}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+ python-version: ["3.7", "3.8"]
+ steps:
+ - name: Cancel previous runs
+ uses: styfle/cancel-workflow-action@0.6.0
+ with:
+ access_token: ${{ github.token }}
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 # Fetch all history for all branches and tags.
+ - name: Set environment variables
+ run: |
+ if [[ ${{ matrix.os }} == windows* ]] ;
+ then
+ echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
+ else
+ echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
+
+ fi
+ echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
+
+ - name: Cache conda
+ uses: actions/cache@v2
+ with:
+ path: ~/conda_pkgs_dir
+ key:
+ ${{ runner.os }}-conda-py${{ matrix.python-version }}-${{
+ hashFiles('ci/requirements/**.yml') }}
+ - uses: conda-incubator/setup-miniconda@v2
+ with:
+ channels: conda-forge
+ channel-priority: strict
+ mamba-version: "*"
+ activate-environment: xarray-tests
+ auto-update-conda: false
+ python-version: ${{ matrix.python-version }}
+ use-only-tar-bz2: true
+
+ - name: Install conda dependencies
+ run: |
+ mamba env update -f $CONDA_ENV_FILE
+
+ - name: Install xarray
+ run: |
+ python -m pip install --no-deps -e .
+
+ - name: Version info
+ run: |
+ 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
+
+ - name: Upload code coverage to Codecov
+ uses: codecov/codecov-action@v1
+ with:
+ file: ./coverage.xml
+ flags: unittests
+ env_vars: RUNNER_OS,PYTHON_VERSION
+ name: codecov-umbrella
+ fail_ci_if_error: false
diff --git a/.github/workflows/parse_logs.py b/.github/workflows/parse_logs.py
new file mode 100644
index 00000000000..4d3bea54e50
--- /dev/null
+++ b/.github/workflows/parse_logs.py
@@ -0,0 +1,57 @@
+# type: ignore
+import argparse
+import itertools
+import pathlib
+import textwrap
+
+parser = argparse.ArgumentParser()
+parser.add_argument("filepaths", nargs="+", type=pathlib.Path)
+args = parser.parse_args()
+
+filepaths = sorted(p for p in args.filepaths if p.is_file())
+
+
+def extract_short_test_summary_info(lines):
+ up_to_start_of_section = itertools.dropwhile(
+ lambda l: "=== short test summary info ===" not in l,
+ lines,
+ )
+ up_to_section_content = itertools.islice(up_to_start_of_section, 1, None)
+ section_content = itertools.takewhile(
+ lambda l: l.startswith("FAILED"), up_to_section_content
+ )
+ content = "\n".join(section_content)
+
+ return content
+
+
+def format_log_message(path):
+ py_version = path.name.split("-")[1]
+ summary = f"Python {py_version} Test Summary Info"
+ with open(path) as f:
+ data = extract_short_test_summary_info(line.rstrip() for line in f)
+ message = (
+ textwrap.dedent(
+ """\
+ {summary}
+
+ ```
+ {data}
+ ```
+
+