pre-commit: Bump versions
The bump of ruff brings in some new fixes. Change-Id: I239f0e601ffc9057524684ae4e6691cb5ba3fa5d Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
@@ -19,20 +19,20 @@ repos:
|
||||
hooks:
|
||||
- id: doc8
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
rev: v0.12.12
|
||||
rev: v0.15.0
|
||||
hooks:
|
||||
- id: ruff-check
|
||||
args: ['--fix', '--unsafe-fixes']
|
||||
- id: ruff-format
|
||||
- repo: https://opendev.org/openstack/hacking
|
||||
rev: 7.0.0
|
||||
rev: 8.0.0
|
||||
hooks:
|
||||
- id: hacking
|
||||
additional_dependencies:
|
||||
- flake8-import-order>=0.19.0
|
||||
- flake8-import-order~=0.19.2
|
||||
exclude: '^(doc|releasenotes|tools)/.*$'
|
||||
- repo: https://github.com/pre-commit/mirrors-mypy
|
||||
rev: v1.17.1
|
||||
rev: v1.19.1
|
||||
hooks:
|
||||
- id: mypy
|
||||
additional_dependencies:
|
||||
|
||||
@@ -658,7 +658,7 @@ class OpenStackConfig:
|
||||
os_warnings.OpenStackDeprecationWarning,
|
||||
)
|
||||
|
||||
vendor_filename, vendor_file = self._load_vendor_file()
|
||||
_, vendor_file = self._load_vendor_file()
|
||||
if (
|
||||
vendor_file
|
||||
and 'public-clouds' in vendor_file
|
||||
|
||||
@@ -102,17 +102,17 @@ class TestCloudRegion(base.TestCase):
|
||||
|
||||
config_dict['verify'] = False
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
verify, _ = cc.get_requests_verify_args()
|
||||
self.assertFalse(verify)
|
||||
|
||||
config_dict['verify'] = True
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
verify, _ = cc.get_requests_verify_args()
|
||||
self.assertTrue(verify)
|
||||
|
||||
config_dict['insecure'] = True
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
verify, _ = cc.get_requests_verify_args()
|
||||
self.assertFalse(verify)
|
||||
|
||||
def test_verify_cacert(self):
|
||||
@@ -121,17 +121,17 @@ class TestCloudRegion(base.TestCase):
|
||||
|
||||
config_dict['verify'] = False
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
verify, _ = cc.get_requests_verify_args()
|
||||
self.assertFalse(verify)
|
||||
|
||||
config_dict['verify'] = True
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
verify, _ = cc.get_requests_verify_args()
|
||||
self.assertEqual("certfile", verify)
|
||||
|
||||
config_dict['insecure'] = True
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
verify, _ = cc.get_requests_verify_args()
|
||||
self.assertEqual(False, verify)
|
||||
|
||||
def test_cert_with_key(self):
|
||||
@@ -143,7 +143,7 @@ class TestCloudRegion(base.TestCase):
|
||||
config_dict['key'] = 'key'
|
||||
|
||||
cc = cloud_region.CloudRegion("test1", "region-xx", config_dict)
|
||||
(verify, cert) = cc.get_requests_verify_args()
|
||||
_, cert = cc.get_requests_verify_args()
|
||||
self.assertEqual(("cert", "key"), cert)
|
||||
|
||||
def test_ipv6(self):
|
||||
|
||||
@@ -63,7 +63,7 @@ class TestLoader(base.TestCase):
|
||||
fp.write(value)
|
||||
tested_files.append(fn)
|
||||
|
||||
path, result = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
path, _ = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
tested_files
|
||||
)
|
||||
# NOTE(hberaud): Prefer to test path rather than file because
|
||||
@@ -82,7 +82,7 @@ class TestLoader(base.TestCase):
|
||||
fp.write(value)
|
||||
tested_files.append(fn)
|
||||
|
||||
path, result = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
path, _ = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
tested_files
|
||||
)
|
||||
# NOTE(hberaud): Prefer to test path rather than file because
|
||||
@@ -98,7 +98,7 @@ class TestLoader(base.TestCase):
|
||||
fp.write(FILES['txt'])
|
||||
tested_files.append(fn)
|
||||
|
||||
path, result = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
path, _ = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
tested_files
|
||||
)
|
||||
self.assertEqual(fn, path)
|
||||
@@ -109,10 +109,10 @@ class TestLoader(base.TestCase):
|
||||
fn = os.path.join(tmpdir, 'file.txt')
|
||||
with open(fn, 'w+') as fp:
|
||||
fp.write(FILES['txt'])
|
||||
os.chmod(fn, 222)
|
||||
os.chmod(fn, 0o222)
|
||||
tested_files.append(fn)
|
||||
|
||||
path, result = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
path, _ = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
tested_files
|
||||
)
|
||||
self.assertEqual(None, path)
|
||||
@@ -122,9 +122,7 @@ class TestLoader(base.TestCase):
|
||||
fn = os.path.join('/fake', 'file.txt')
|
||||
tested_files.append(fn)
|
||||
|
||||
path, result = loader.OpenStackConfig()._load_yaml_json_file(
|
||||
tested_files
|
||||
)
|
||||
path, _ = loader.OpenStackConfig()._load_yaml_json_file(tested_files)
|
||||
self.assertEqual(None, path)
|
||||
|
||||
|
||||
|
||||
@@ -348,7 +348,7 @@ class TestImage(TestImageProxy):
|
||||
**properties,
|
||||
)
|
||||
|
||||
args, kwargs = self.proxy._create.call_args
|
||||
_, kwargs = self.proxy._create.call_args
|
||||
self.assertEqual(kwargs["is_protected"], True)
|
||||
|
||||
def test_image_create_with_stores(self):
|
||||
|
||||
Reference in New Issue
Block a user