Merge "Remove "from __future__ import annotations""

cinder/api/api_utils.py

@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations
-
 import typing
 from typing import Any, Generator, Iterable, Optional, Union
 

cinder/api/common.py

@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations
-
 import enum
 import json
 import os

cinder/backup/api.py

@@ -17,8 +17,6 @@
 
 """Handles all requests relating to the volume backups service."""
 
-from __future__ import annotations
-
 from datetime import datetime
 import random
 from typing import Optional

cinder/cmd/manage.py

@@ -50,8 +50,6 @@
 
 """CLI interface for cinder management."""
 
-from __future__ import annotations
-
 import collections
 import collections.abc as collections_abc
 import errno

cinder/cmd/status.py

@@ -15,8 +15,6 @@
 
 """CLI interface for cinder status commands."""
 
-from __future__ import annotations
-
 import os
 import sys
 

cinder/context.py

@@ -17,8 +17,6 @@
 
 """RequestContext: context for requests that persist through all of cinder."""
 
-from __future__ import annotations
-
 import copy
 from typing import Any, Optional
 

cinder/flow_utils.py

@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations
-
 import os
 from typing import Any, Optional
 

cinder/image/glance.py

@@ -16,8 +16,6 @@
 
 """Implementation of an image service that uses Glance as the backend"""
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 import copy
 import itertools
 import random

cinder/image/image_utils.py

@@ -23,8 +23,6 @@ Some slight modifications, but at some point
 we should look at maybe pushing this up to Oslo
 """
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 import contextlib
 import errno
 import io

cinder/rpc.py

@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations
-
 __all__ = [
     'init',
     'cleanup',

cinder/scheduler/base_weight.py

@@ -17,8 +17,6 @@
 Pluggable Weighing support
 """
 
-from __future__ import annotations
-
 import abc
 from typing import Iterable, Optional
 

cinder/scheduler/evaluator/evaluator.py

@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 import operator
 import re
 import sys

cinder/scheduler/filter_scheduler.py

@@ -20,8 +20,6 @@ You can customize this scheduler by specifying your own volume Filters and
 Weighing Functions.
 """
 
-from __future__ import annotations
-
 from typing import (Optional, Union)
 
 from oslo_config import cfg

cinder/scheduler/flows/create_volume.py

@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 from typing import Any, Optional
 
 from oslo_log import log as logging

cinder/scheduler/host_manager.py

@@ -15,8 +15,6 @@
 
 """Manage backends in the current zone."""
 
-from __future__ import annotations
-
 from collections import abc
 import random
 import typing

cinder/utils.py

@@ -25,8 +25,6 @@
    should be placed in volume_utils instead.
 """
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 from collections import OrderedDict
 import contextlib
 import datetime

cinder/volume/api.py

@@ -16,8 +16,6 @@
 
 """Handles all requests relating to volumes."""
 
-from __future__ import annotations
-
 import ast
 import collections
 import datetime

cinder/volume/drivers/rbd.py

@@ -14,8 +14,6 @@
 #    under the License.
 """RADOS Block Device Driver"""
 
-from __future__ import annotations
-
 import binascii
 import errno
 import json

cinder/volume/flows/api/create_volume.py

@@ -11,8 +11,6 @@
 #    under the License.
 
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 from typing import Any, Optional, Type, Union
 
 from oslo_config import cfg

cinder/volume/flows/manager/create_volume.py

@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations
-
 import binascii
 import traceback
 import typing

cinder/volume/manager.py

@@ -35,8 +35,6 @@ intact.
 
 """
 
-from __future__ import annotations  # Remove when only supporting Python 3.9+
-
 import functools
 import time
 import typing

cinder/volume/rpcapi.py

@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from __future__ import annotations
-
 from typing import Optional, Union
 
 from cinder.common import constants

cinder/volume/volume_types.py

@@ -19,8 +19,6 @@
 
 """Built-in volume type properties."""
 
-from __future__ import annotations
-
 from typing import Any, Iterable, Optional, Union
 
 from oslo_config import cfg

cinder/volume/volume_utils.py

@@ -14,8 +14,6 @@
 
 """Volume-related Utilities and helpers."""
 
-from __future__ import annotations  # Remove when only supporting python 3.9+
-
 import abc
 import ast
 import functools

setup.cfg

@@ -5,7 +5,7 @@ long_description = file: README.rst
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 url = https://docs.openstack.org/cinder/latest/
-python_requires = >=3.8
+python_requires = >=3.9
 classifiers =
     Environment :: OpenStack
     Intended Audience :: Information Technology