Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
94 changes: 0 additions & 94 deletions .github/workflows/ci-docs-linkcheck.yml

This file was deleted.

8 changes: 5 additions & 3 deletions .github/workflows/ci-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

jobs:
tests:
name: "doctests ${{ matrix.os }} ${{ matrix.python-version }}"
name: "${{ matrix.session }} ${{ matrix.os }} py${{ matrix.python-version }}"

runs-on: ${{ matrix.os }}

Expand All @@ -32,9 +32,11 @@ jobs:
shell: bash -l {0}

strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
python-version: ["3.8"]
session: ["doctest", "gallery", "linkcheck"]

env:
IRIS_TEST_DATA_VERSION: "2.9"
Expand Down Expand Up @@ -120,8 +122,8 @@ jobs:
echo "image.cmap : viridis" >> ${MPL_RC}
cat ${MPL_RC}

- name: "iris doctests and gallery"
- name: "iris ${{ matrix.session }}"
env:
PY_VER: ${{ matrix.python-version }}
run: |
nox --session doctest -- --verbose
nox --session ${{ matrix.session }} -- --verbose
7 changes: 4 additions & 3 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

jobs:
tests:
name: "tests ${{ matrix.os }} ${{ matrix.python-version }}"
name: "${{ matrix.session }} ${{ matrix.os }} py${{ matrix.python-version }}"

runs-on: ${{ matrix.os }}

Expand All @@ -36,6 +36,7 @@ jobs:
matrix:
os: ["ubuntu-latest"]
python-version: ["3.8"]
session: ["tests"]

env:
IRIS_TEST_DATA_VERSION: "2.9"
Expand Down Expand Up @@ -115,8 +116,8 @@ jobs:
echo "doc_dir = ${GITHUB_WORKSPACE}/docs" >> ${SITE_CFG}
cat ${SITE_CFG}

- name: "iris tests"
- name: "iris ${{ matrix.session }}"
env:
PY_VER: ${{ matrix.python-version }}
run: |
nox --session tests -- --verbose
nox --session ${{ matrix.session }} -- --verbose
2 changes: 1 addition & 1 deletion .github/workflows/composite/nox-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ runs:
- uses: actions/cache@v3
with:
path: ${{ github.workspace }}/.nox
key: ${{ runner.os }}-nox-${{ inputs.env_name }}-py${{ matrix.python-version }}-b${{ inputs.cache_build }}-${{ hashFiles(inputs.lock_file) }}
key: ${{ runner.os }}-nox-${{ inputs.env_name }}-s${{ matrix.session }}-py${{ matrix.python-version }}-b${{ inputs.cache_build }}-${{ hashFiles(inputs.lock_file) }}
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<a href="https://github.com/SciTools/iris/actions/workflows/ci-docs-tests.yml">
<img src="https://github.com/SciTools/iris/actions/workflows/ci-docs-tests.yml/badge.svg?branch=main"
alt="ci-docs-tests"></a>
<a href="https://github.com/SciTools/iris/actions/workflows/ci-docs-linkcheck.yml">
<img src="https://github.com/SciTools/iris/actions/workflows/ci-docs-linkcheck.yml/badge.svg?branch=main"
alt="ci-docs-linkcheck"></a>
<a href="https://scitools-iris.readthedocs.io/en/latest/?badge=latest">
<img src="https://readthedocs.org/projects/scitools-iris/badge/?version=latest"
alt="Documentation Status"></a>
Expand Down
17 changes: 16 additions & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,22 @@ def doctest(session: nox.sessions.Session):
"doctest",
external=True,
)
session.cd("..")


@nox.session(python=_PY_VERSION_DOCSBUILD, venv_backend="conda")
def gallery(session: nox.sessions.Session):
"""
Perform iris gallery doc-tests.

Parameters
----------
session: object
A `nox.sessions.Session` object.

"""
prepare_venv(session)
session.install("--no-deps", "--editable", ".")
session.env.update(ENV)
session.run(
"python",
"-m",
Expand Down