Simplify ruff configuration

The E category includes all subcategories.

Change-Id: I8dd82531a2bd6263d34bc9a4f433205f390bf6a8
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
     hooks:
       - id: doc8
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.18
+    rev: v0.16.3
     hooks:
       - id: ruff-check
         args: ['--fix', '--unsafe-fixes']

openstack/compute/v2/_proxy.py

@@ -1527,7 +1527,7 @@ class Proxy(proxy.Proxy):
         server: str | _server.Server,
         *,
         host: str | None = None,
-        availability_zone: str | None | types.Unset = types.UNSET,
+        availability_zone: str | types.Unset | None = types.UNSET,
     ) -> None:
         """Unshelves or restores a shelved server.
 

openstack/compute/v2/server.py

@@ -424,19 +424,19 @@ class Server(resource.Resource, metadata.MetadataMixin, tag.TagMixin):
         self,
         session: adapter.Adapter,
         image: str | _image.Image,
-        name: str | None | types.Unset = types.UNSET,
-        admin_password: str | None | types.Unset = types.UNSET,
+        name: str | types.Unset | None = types.UNSET,
+        admin_password: str | types.Unset | None = types.UNSET,
         preserve_ephemeral: bool | types.Unset = types.UNSET,
-        access_ipv4: str | None | types.Unset = types.UNSET,
-        access_ipv6: str | None | types.Unset = types.UNSET,
-        metadata: dict[str, object] | None | types.Unset = types.UNSET,
-        user_data: dict[str, object] | None | types.Unset = types.UNSET,
-        key_name: str | None | types.Unset = types.UNSET,
-        description: str | None | types.Unset = types.UNSET,
+        access_ipv4: str | types.Unset | None = types.UNSET,
+        access_ipv6: str | types.Unset | None = types.UNSET,
+        metadata: dict[str, object] | types.Unset | None = types.UNSET,
+        user_data: dict[str, object] | types.Unset | None = types.UNSET,
+        key_name: str | types.Unset | None = types.UNSET,
+        description: str | types.Unset | None = types.UNSET,
         trusted_image_certificates: list[str]
-        | None
-        | types.Unset = types.UNSET,
-        hostname: str | None | types.Unset = types.UNSET,
+        | types.Unset
+        | None = types.UNSET,
+        hostname: str | types.Unset | None = types.UNSET,
     ) -> Self:
         """Rebuild the server with the given arguments.
 
@@ -877,7 +877,7 @@ class Server(resource.Resource, metadata.MetadataMixin, tag.TagMixin):
     def unshelve(
         self,
         session: adapter.Adapter,
-        availability_zone: str | None | types.Unset = types.UNSET,
+        availability_zone: str | types.Unset | None = types.UNSET,
         host: str | None = None,
     ) -> None:
         """Unshelve the server.

openstack/proxy.py

@@ -561,7 +561,7 @@ class Proxy(adapter.Adapter):
     def _get_resource(
         self,
         resource_type: type[resource.ResourceT],
-        value: None | str | resource.ResourceT | utils.Munch,
+        value: str | resource.ResourceT | utils.Munch | None,
         **attrs: Any,
     ) -> resource.ResourceT:
         """Get a resource object to work on

openstack/resource.py

@@ -412,11 +412,11 @@ class CreateOpts:
     #: Key to use when enveloping requests. If unset, defaults to the
     #: ``resource_key`` attribute of the resource. Set to None to disable
     #: enveloping.
-    request_key: str | None | types.Unset = types.UNSET
+    request_key: str | types.Unset | None = types.UNSET
     #: Key to use when de-enveloping responses. If unset, defaults to the
     #: ``resource_key`` attribute of the resource. Set to None to disable
     #: de-enveloping.
-    response_key: str | None | types.Unset = types.UNSET
+    response_key: str | types.Unset | None = types.UNSET
     # TODO(stephenfin): Change default to PORT once Resource.create_method is
     # gone.
     #: Method to use for create requests.

pyproject.toml

@@ -82,7 +82,7 @@ quote-style = "preserve"
 docstring-code-format = true
 
 [tool.ruff.lint]
-select = ["E4", "E5", "E7", "E9", "F", "RUF", "S", "UP", "W"]
+select = ["E", "F", "RUF", "S", "UP", "W"]
 ignore = [
     # there are a lot of these to fix
     "RUF012",