From 75666664fc1f8c89d212d323c8e192ad597e7b81 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:05:47 +0100 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#5980) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.4 → v0.4.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.4...v0.4.7) - [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](https://github.com/codespell-project/codespell/compare/v2.2.6...v2.3.0) * fix codespell failures (#5985) --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Bill Little --- .pre-commit-config.yaml | 4 ++-- docs/src/copyright.rst | 4 ++-- .../dask_best_practices/dask_bags_and_greed.rst | 2 +- docs/src/further_topics/netcdf_io.rst | 2 +- docs/src/further_topics/ugrid/partner_packages.rst | 2 +- docs/src/further_topics/which_regridder_to_use.rst | 2 +- docs/src/whatsnew/3.6.rst | 4 ++-- lib/iris/analysis/calculus.py | 2 +- lib/iris/fileformats/netcdf/saver.py | 4 ++-- pyproject.toml | 4 ++-- tools/release_do_nothing.py | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb33180953..df449ae010 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: no-commit-to-branch - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.4.4" + rev: "v0.4.7" hooks: - id: ruff types: [file, python] @@ -38,7 +38,7 @@ repos: types: [file, python] - repo: https://github.com/codespell-project/codespell - rev: "v2.2.6" + rev: "v2.3.0" hooks: - id: codespell types_or: [asciidoc, python, markdown, rst] diff --git a/docs/src/copyright.rst b/docs/src/copyright.rst index 513d281c07..b0d68cfe8c 100644 --- a/docs/src/copyright.rst +++ b/docs/src/copyright.rst @@ -27,10 +27,10 @@ are licensed under the UK's Open Government Licence: (C) British Crown Copyright |copyright_years| - You may use and re-use the information featured on this website (not including logos) free of + You may use and reuse the information featured on this website (not including logos) free of charge in any format or medium, under the terms of the `Open Government Licence `_. We encourage users to establish hypertext links to this website. - Any email enquiries regarding the use and re-use of this information resource should be + Any email enquiries regarding the use and reuse of this information resource should be sent to: psi@nationalarchives.gsi.gov.uk. diff --git a/docs/src/further_topics/dask_best_practices/dask_bags_and_greed.rst b/docs/src/further_topics/dask_best_practices/dask_bags_and_greed.rst index 007a58d400..272ea6fc08 100644 --- a/docs/src/further_topics/dask_best_practices/dask_bags_and_greed.rst +++ b/docs/src/further_topics/dask_best_practices/dask_bags_and_greed.rst @@ -7,7 +7,7 @@ Here is a journey that demonstrates: * How to apply dask.bags to an existing script * The equal importance of optimisation of non-parallel parts of a script -* Protection against multiple softwares trying to manage parallelism +* Protection against multiple software trying to manage parallelism simultaneously diff --git a/docs/src/further_topics/netcdf_io.rst b/docs/src/further_topics/netcdf_io.rst index bae32ebcae..4e1c32b22f 100644 --- a/docs/src/further_topics/netcdf_io.rst +++ b/docs/src/further_topics/netcdf_io.rst @@ -66,7 +66,7 @@ creation of the :data:`iris.fileformats.netcdf.loader.CHUNK_CONTROL` class. Custom Chunking: Set ^^^^^^^^^^^^^^^^^^^^ -There are three context manangers within :data:`~iris.fileformats.netcdf.loader.CHUNK_CONTROL`. The most basic is +There are three context managers within :data:`~iris.fileformats.netcdf.loader.CHUNK_CONTROL`. The most basic is :meth:`~iris.fileformats.netcdf.loader.ChunkControl.set`. This allows you to specify the chunksize for each dimension, and to specify a ``var_name`` specifically to change. diff --git a/docs/src/further_topics/ugrid/partner_packages.rst b/docs/src/further_topics/ugrid/partner_packages.rst index 75b54b037f..1c7a8b8c8c 100644 --- a/docs/src/further_topics/ugrid/partner_packages.rst +++ b/docs/src/further_topics/ugrid/partner_packages.rst @@ -93,7 +93,7 @@ Applications * Regrid unstructured to structured. * Regrid with dask integration, computing in parallel and maintaining data laziness. -* | Save a prepared regridder for re-use in subsequent runs. +* | Save a prepared regridder for reuse in subsequent runs. | Regridders can even be re-used on sources with different masks - a significant efficiency gain. diff --git a/docs/src/further_topics/which_regridder_to_use.rst b/docs/src/further_topics/which_regridder_to_use.rst index 5d7d7fdba1..dae273252d 100644 --- a/docs/src/further_topics/which_regridder_to_use.rst +++ b/docs/src/further_topics/which_regridder_to_use.rst @@ -341,7 +341,7 @@ of ``kg m-2`` as an area weighted sum. With ``mdtol=0`` this will consistently underestimate this total and with ``mdtol=1`` will consistently overestimate. This can be somewhat mitigated with a choice of ``mdtol=0.5``, but you should still be aware of potential inaccuracies. It should be noted that this choice of ``mdtol`` is highly -context dependent and there wil likely be occasions where a choice of ``mdtol=0`` or +context dependent and there will likely be occasions where a choice of ``mdtol=0`` or ``mdtol=1`` is more suitable. The important thing is to *know your data, know what* *you're doing with your data and know how your regridder fits in this process*. diff --git a/docs/src/whatsnew/3.6.rst b/docs/src/whatsnew/3.6.rst index 389356df46..b5a23ac401 100644 --- a/docs/src/whatsnew/3.6.rst +++ b/docs/src/whatsnew/3.6.rst @@ -15,11 +15,11 @@ This document explains the changes made to Iris for this release We're so excited about our recent support for **delayed saving of lazy data to netCDF** (:pull:`5191`) that we're celebrating this important step change - in behavour with its very own dedicated release 🥳 + in behaviour with its very own dedicated release 🥳 By using ``iris.save(..., compute=False)`` you can now save to multiple NetCDF files in parallel. See the new ``compute`` keyword in :func:`iris.fileformats.netcdf.save`. - This can share and re-use any common (lazy) result computations, and it makes much + This can share and reuse any common (lazy) result computations, and it makes much better use of resources during any file-system waiting (i.e., it can use such periods to progress the *other* saves). diff --git a/lib/iris/analysis/calculus.py b/lib/iris/analysis/calculus.py index 75b7db050b..4cb634efbe 100644 --- a/lib/iris/analysis/calculus.py +++ b/lib/iris/analysis/calculus.py @@ -760,7 +760,7 @@ def spatial_vectors_with_phenom_name(i_cube, j_cube, k_cube=None): The cube standard names must match one of the combinations in :data:`DIRECTIONAL_NAMES`. - This routine is designed to identify the vector quantites which each + This routine is designed to identify the vector quantities which each of the cubes provided represent and return a list of their 3d spatial dimension names and associated phenomenon. For example, given a cube of "u wind" and "v wind" the return value diff --git a/lib/iris/fileformats/netcdf/saver.py b/lib/iris/fileformats/netcdf/saver.py index 8d53a4d5be..676eb69631 100644 --- a/lib/iris/fileformats/netcdf/saver.py +++ b/lib/iris/fileformats/netcdf/saver.py @@ -458,7 +458,7 @@ def write( cube : :class:`iris.cube.Cube` A :class:`iris.cube.Cube` to be saved to a netCDF file. local_keys : iterable of str, optional - An interable of cube attribute keys. Any cube attributes with + An iterable of cube attribute keys. Any cube attributes with matching keys will become attributes on the data variable rather than global attributes. @@ -2441,7 +2441,7 @@ def save( Underlying netCDF file format, one of 'NETCDF4', 'NETCDF4_CLASSIC', 'NETCDF3_CLASSIC' or 'NETCDF3_64BIT'. Default is 'NETCDF4' format. local_keys : iterable of str, optional - An interable of cube attribute keys. Any cube attributes with + An iterable of cube attribute keys. Any cube attributes with matching keys will become attributes on the data variable rather than global attributes. diff --git a/pyproject.toml b/pyproject.toml index 42dbab2bdc..5840b77b85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -153,8 +153,8 @@ exclude_lines = [ ] [tool.codespell] -ignore-words-list = "alpha-numeric,degreee,discontiguities,lazyness,meaned,nin" -skip = "_build,*.css,*.ipynb,*.js,*.html,*.svg,*.xml,.git,generated" +ignore-words-list = "alpha-numeric,assertIn,degreee,discontiguities,lazyness,meaned,nin" +skip = "./CODE_OF_CONDUCT.md,_build,*.css,*.ipynb,*.js,*.html,*.svg,*.xml,.git,generated" [tool.check-manifest] ignore = [ diff --git a/tools/release_do_nothing.py b/tools/release_do_nothing.py index 634e6a65a2..79f26f3409 100755 --- a/tools/release_do_nothing.py +++ b/tools/release_do_nothing.py @@ -327,7 +327,7 @@ def finalise_whats_new( message = ( "Commit and push all the What's New changes.\n" - f'git commit -am "Whats new updates for {release_strings.tag} .";\n' + f"git commit -am \"What's new updates for {release_strings.tag} .\";\n" f"git push -u origin {working_branch};" ) _wait_for_done(message) @@ -759,7 +759,7 @@ def merge_back( message = ( "Commit and push all the What's New changes.\n" - 'git commit -am "Restore latest Whats New files.";\n' + "git commit -am \"Restore latest What's New files.\";\n" f"git push -u origin {working_branch};" ) _wait_for_done(message)