Merge branch 'openstack:master' into master

Author: JohnGarbutt

.coveragerc

@@ -2,6 +2,7 @@
 branch = True
 source = nova
 omit = nova/tests/*
+concurrency = eventlet
 
 [report]
 ignore_errors = True

.git-blame-ignore-revs

@@ -0,0 +1,7 @@
+# ignore codespell series
+f4852f4c81a6594dfd56eb18503648b3f449dcd4
+2232ca95f22478bc90da5cb2d99cb0a4570fbc96
+25fd9effd2e12a29643c6e7b5b5e2f5630ff3338
+6314f09ed4574ca9d03a726c0cfd1d7108b1a12c
+320c6fadde751e8de05e98416738a91b89c24de8
+7402822f0bcc810eda6a2a55a9cc8fe778318557

.gitignore

@@ -49,5 +49,9 @@ tools/conf/nova.conf*
 doc/source/_static/nova.conf.sample
 doc/source/_static/nova.policy.yaml.sample
 
- # Files created by releasenotes build
+# Files created by releasenotes build
 releasenotes/build
+
+# Files created by alembic
+/nova.db
+/nova_api.db

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: mixed-line-ending
@@ -16,20 +16,62 @@ repos:
       - id: debug-statements
         # nova/cmd/manage.py imports pdb on purpose.
         exclude: 'nova/cmd/manage.py'
+      - id: check-json
+        files: .*\.json$
       - id: check-yaml
         files: .*\.(yaml|yml)$
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.7
+    rev: v1.5.4
     hooks:
       - id: remove-tabs
         exclude: '.*\.(svg)$'
-  - repo: local
+  - repo: https://opendev.org/openstack/hacking
+    rev: 6.1.0
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies:
-          - hacking>=2.0,<3.0
-        language: python
-        entry: flake8
-        files: '^.*\.py$'
+      - id: hacking
+        additional_dependencies: []
         exclude: '^(doc|releasenotes|tools)/.*$'
+  - repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v2.0.4
+    hooks:
+      - id: autopep8
+        files: '^.*\.py$'
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+    - id: codespell
+      args: ['--ignore-words=doc/dictionary.txt']
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.7.1
+    hooks:
+      - id: mypy
+        additional_dependencies:
+          - types-paramiko
+        # keep this in-sync with '[mypy] files' in 'setup.cfg'
+        files: |
+          (?x)(
+            nova/compute/manager.py
+            | nova/compute/pci_placement_translator.py
+            | nova/crypto.py
+            | nova/filesystem.py
+            | nova/limit/local.py
+            | nova/limit/placement.py
+            | nova/network/neutron.py
+            | nova/pci
+            | nova/privsep/path.py
+            | nova/scheduler/client/report.py
+            | nova/scheduler/request_filter.py
+            | nova/scheduler/utils.py
+            | nova/virt/driver.py
+            | nova/virt/hardware.py
+            | nova/virt/libvirt/machine_type_utils.py
+            | nova/virt/libvirt/__init__.py
+            | nova/virt/libvirt/cpu/__init__.py
+            | nova/virt/libvirt/cpu/api.py
+            | nova/virt/libvirt/cpu/core.py
+            | nova/virt/libvirt/driver.py
+            | nova/virt/libvirt/event.py
+            | nova/virt/libvirt/guest.py
+            | nova/virt/libvirt/host.py
+            | nova/virt/libvirt/utils.py
+          )