diff --git a/docs/src/developers_guide/contributing_ci_tests.rst b/docs/src/developers_guide/contributing_ci_tests.rst index 36c1b402b6..bfe80cd760 100644 --- a/docs/src/developers_guide/contributing_ci_tests.rst +++ b/docs/src/developers_guide/contributing_ci_tests.rst @@ -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. diff --git a/docs/src/developers_guide/contributing_graphics_tests.rst b/docs/src/developers_guide/contributing_graphics_tests.rst index 7964c008c5..1e42c35ae6 100644 --- a/docs/src/developers_guide/contributing_graphics_tests.rst +++ b/docs/src/developers_guide/contributing_graphics_tests.rst @@ -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