Skip to content

Commit

Permalink
fix indentation and remove ref to ssstack (#5256)
Browse files Browse the repository at this point in the history
  • Loading branch information
tkknight authored Apr 18, 2023
1 parent 2eac400 commit 0cef4ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
11 changes: 2 additions & 9 deletions docs/src/developers_guide/contributing_ci_tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,14 @@ or simply::

and add the changed lockfiles to your pull request.

.. note::

If your installation of conda runs through Artifactory or another similar
proxy then you will need to amend that lockfile to use URLs that Github
Actions can access. A utility to strip out Artifactory exists in the
``ssstack`` tool.

New lockfiles are generated automatically each week to ensure that Iris continues to be
tested against the latest available version of its dependencies.
Each week the yaml files in ``requirements`` are resolved by a GitHub Action.
If the resolved environment has changed, a pull request is created with the new lock files.
The CI test suite will run on this pull request. If the tests fail, a developer
will need to create a new branch based off the ``auto-update-lockfiles`` branch
will need to create a new branch based off the ``auto-update-lockfiles`` branch
and add the required fixes to this new branch. If the fixes are made to the
``auto-update-lockfiles`` branch these will be overwritten the next time the
``auto-update-lockfiles`` branch these will be overwritten the next time the
Github Action is run.


Expand Down
4 changes: 2 additions & 2 deletions docs/src/developers_guide/contributing_graphics_tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ The results of the failing image tests will now be available in
Reviewing Failing Tests
-----------------------

#. Run ``iris/lib/iris/tests/graphics/idiff.py`` with python, e.g.:
#. Run ``iris/lib/iris/tests/graphics/idiff.py`` with python, e.g.::

python idiff.py
python idiff.py

This will open a window for you to visually inspect
side-by-side **old**, **new** and **difference** images for each failed
Expand Down

0 comments on commit 0cef4ae

Please sign in to comment.