Merge branch 'metomi:master' into feature/rose-config-py3

.github/workflows/2_auto_publish_release.yml

@@ -39,7 +39,7 @@ jobs:
       uses: cylc/release-actions/build-python-package@v1
 
     - name: Publish distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.9.0
+      uses: pypa/gh-action-pypi-publish@v1.10.2
       with:
         user: __token__ # uses the API token feature of PyPI - least permissions possible
         password: ${{ secrets.PYPI_TOKEN }}

.mailmap

@@ -35,3 +35,5 @@ Thomas Coleman       <[email protected]>          Tom Coleman          <
 Tim Pillinger        <[email protected]>     wxtim                <[email protected]>
 Tim Pillinger        <[email protected]>
 Tomasz Trzeciak      <[email protected]>   TomekTrzeciak        <[email protected]>
+Joe Marsh Rossney    <[email protected]>
+Joe Marsh Rossney    <[email protected]> <[email protected]>

CONTRIBUTING.md

@@ -53,6 +53,7 @@ below:
  - Ronnie Dutta (Met Office, UK)
  - Roddy Sharp (Met Office UK)
  - Mark Dawson (Met Office UK)
+ - Joe Marsh Rossney (UK Centre for Ecology & Hydrology)
 <!-- end-shortlog -->
 
 (All contributors are identifiable with email addresses in the version control

sphinx/installation.rst

@@ -76,8 +76,8 @@ Configuring Rose
 
 Rose configuration files can be located in the following places:
 
-* ``/etc/.metomi/rose.conf``
-* ``$ROSE_SITE_CONF_PATH/.metomi/rose.conf``
+* ``/etc/rose.conf``
+* ``$ROSE_SITE_CONF_PATH/rose.conf``
 * ``$HOME/.metomi/rose.conf``
 
 See :rose:file:`rose.conf` in the API reference for more information.