diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b7b9f3dc576f..390c2231b842 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - id: mixed-line-ending args: ['--fix', 'lf'] exclude: '.*\.(svg)$' - - id: check-byte-order-marker + - id: fix-byte-order-marker - id: check-executables-have-shebangs - id: check-merge-conflict - id: debug-statements @@ -29,17 +29,17 @@ repos: additional_dependencies: [] exclude: '^(doc|releasenotes|tools)/.*$' - repo: https://github.com/hhatto/autopep8 - rev: v2.3.1 + rev: v2.3.2 hooks: - id: autopep8 files: '^.*\.py$' - repo: https://github.com/codespell-project/codespell - rev: v2.3.0 + rev: v2.4.1 hooks: - id: codespell args: ['--ignore-words=doc/dictionary.txt'] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.12.0 + rev: v1.15.0 hooks: - id: mypy additional_dependencies: diff --git a/doc/source/admin/cells.rst b/doc/source/admin/cells.rst index 4db624356826..09d3008ebad1 100644 --- a/doc/source/admin/cells.rst +++ b/doc/source/admin/cells.rst @@ -492,7 +492,7 @@ to create your first cell. We can create a new cell record using targeted at a specific cell. You can repeat this step for each cell you wish to add to your deployment. Your -existing cell database will be re-used - this simply informs the top-level API +existing cell database will be reused - this simply informs the top-level API database about your existing cell databases. Once you've created your new cell, use :program:`nova-manage cell_v2 diff --git a/doc/source/reference/upgrade-checks.rst b/doc/source/reference/upgrade-checks.rst index c84ab26337f5..d8cc1a415419 100644 --- a/doc/source/reference/upgrade-checks.rst +++ b/doc/source/reference/upgrade-checks.rst @@ -241,7 +241,7 @@ FAQs - Can upgrade checks be backported? - Sometimes upgrade checks can be backported to aid in pre-empting bugs on + Sometimes upgrade checks can be backported to aid in preempting bugs on stable branches. For example, a check was added for `bug 1759316`__ in Rocky which was also backported to stable/queens in case anyone upgrading from Pike to Queens would hit the same issue. Backportable checks are generally only diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 8b9bb51a957a..e99a95a28272 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -1002,7 +1002,7 @@ class CellV2Commands(object): 'Host %(host)s is already mapped to cell %(uuid)s' ) % {'host': host_mapping.host, 'uuid': host_mapping.cell_mapping.uuid}) - # Re-using the existing UUID in case there is already a mapping + # Reusing the existing UUID in case there is already a mapping # NOTE(sbauza): There could be possibly multiple CellMappings # if the operator provides another configuration file and moves # the hosts to another cell v2, but that's not really something diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index 902cc0e63129..1530faaed571 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -692,7 +692,7 @@ class SchedulerManager(manager.Manager): # the future based on information in the provider # summaries, we'll just try to claim resources using # the first allocation_request - # NOTE(gibi): we are using, and re-using, allocation + # NOTE(gibi): we are using, and reusing, allocation # candidates for alternatives here. This is OK as # these candidates are not yet allocated in placement # and we don't know if an alternate will ever be used. diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py index ed786e0ba73b..796dc16053e6 100644 --- a/nova/virt/disk/mount/nbd.py +++ b/nova/virt/disk/mount/nbd.py @@ -131,7 +131,7 @@ class NbdMount(api.Mount): def flush_dev(self): """flush NBD block device buffer.""" # Perform an explicit BLKFLSBUF to support older qemu-nbd(s). - # Without this flush, when a nbd device gets re-used the + # Without this flush, when a nbd device gets reused the # qemu-nbd intermittently hangs. if self.device: nova.privsep.fs.blockdev_flush(self.device) diff --git a/releasenotes/notes/multiple-config-files-with-mod_wsgi-f114ea5fdd8b9a51.yaml b/releasenotes/notes/multiple-config-files-with-mod_wsgi-f114ea5fdd8b9a51.yaml index 7b573dfa5f51..59356a12afae 100644 --- a/releasenotes/notes/multiple-config-files-with-mod_wsgi-f114ea5fdd8b9a51.yaml +++ b/releasenotes/notes/multiple-config-files-with-mod_wsgi-f114ea5fdd8b9a51.yaml @@ -5,7 +5,7 @@ fixes: application that it hosts. As a result when the nova api or metadata api where run under mod_wsgi it was not possible to use multiple config files or non-default file names i.e. nova-api.conf - This has been addressed by the intoduction of a new, optional, environment + This has been addressed by the introduction of a new, optional, environment variable ``OS_NOVA_CONFIG_FILES``. ``OS_NOVA_CONFIG_FILES`` is a ``;`` separated list of file path relitive to ``OS_NOVA_CONFIG_DIR``. When unset the default ``api-paste.ini`` and ``nova.conf`` will be used