Merge "Fix skyline-apiserver on python3.11"

requirements.txt

@@ -1,6 +1,6 @@
 pbr>=5.8.0 # Apache-2.0
 fastapi<=0.58.1 # MIT
-pydantic<=1.8.2 # MIT
+pydantic<=1.10.0 # MIT
 uvicorn<=0.17.6 # BSD License (3 clause)
 gunicorn>=20.1.0 # MIT
 python-jose<=3.3.0 # MIT

setup.cfg

@@ -19,6 +19,8 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 project_urls:
     Source=https://opendev.org/openstack/skyline-apiserver
     Tracker=https://bugs.launchpad.net/skyline-apiserver

skyline_apiserver/api/v1/extension.py

@@ -165,7 +165,7 @@ async def list_servers(
         sort_dirs=[sort_dirs.value] if sort_dirs else None,
     )
 
-    result = []
+    result: List = []
     server_ids = []
     image_ids = []
     root_device_ids = []
@@ -752,13 +752,13 @@ async def list_volume_snapshots(
                 )
             except NotFound as ex:
                 LOG.debug(f"Not found volume snapshot with id '{uuid}': {ex}")
-                return schemas.VolumeSnapshotsResponse(**{"count": 0, "volume_snapshots": []})
+                return schemas.VolumeSnapshotsResponse(count=0, volume_snapshots=[])
             if volume_snapshot.project_id != profile.project.id:
                 LOG.debug(
                     f"Volume snapshot with id '{uuid}' is in project "
                     f"'{volume_snapshot.project_id}', not in '{profile.project.id}'"
                 )
-                return schemas.VolumeSnapshotsResponse(**{"count": 0, "volume_snapshots": []})
+                return schemas.VolumeSnapshotsResponse(count=0, volume_snapshots=[])
         snapshot_session = get_system_session()
         search_opts["all_tenants"] = True
 

skyline_apiserver/api/v1/login.py

@@ -15,7 +15,7 @@
 from __future__ import annotations
 
 from pathlib import PurePath
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 from fastapi import APIRouter, Depends, Form, Header, HTTPException, Request, Response, status
 from fastapi.responses import RedirectResponse
@@ -218,12 +218,12 @@ async def login(
     response_description="OK",
 )
 async def get_sso(request: Request) -> schemas.SSO:
-    sso = {
+    sso: Dict = {
         "enable_sso": False,
         "protocols": [],
     }
     if CONF.openstack.sso_enabled:
-        protocols = []
+        protocols: List = []
 
         ks_url = CONF.openstack.keystone_url.rstrip("/")
         url_scheme = "https" if CONF.default.ssl_enabled else "http"

skyline_apiserver/api/v1/policy.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import Dict
+from typing import Dict, List
 
 from fastapi import APIRouter, Depends, HTTPException, status
 from keystoneauth1.exceptions.http import (
@@ -113,7 +113,7 @@ async def list_policies(
         LOG.debug("Keystone is not reachable. No privilege to access system scope.")
     target = _generate_target(profile)
 
-    results = []
+    results: List = []
     services = constants.SUPPORTED_SERVICE_EPS.keys()
     for service in services:
         try:
@@ -176,7 +176,7 @@ async def check_policies(
     target = _generate_target(profile)
     target.update(policy_rules.target if policy_rules.target else {})
     try:
-        result = []
+        result: List = []
         for policy_rule in policy_rules.rules:
             service = policy_rule.split(":", 1)[0]
             rule = policy_rule.split(":", 1)[1]

skyline_apiserver/tests/unit/config/test_base.py

@@ -79,7 +79,7 @@ class TestOpt:
                         {
                             "name": FAKER.text.word(),
                             "description": FAKER.text.word(),
-                            "schema": object,
+                            "schema": RuntimeError,
                         },
                         RuntimeError,
                     ),

tox.ini

@@ -2,19 +2,17 @@
 minversion = 3.18.0
 requires = virtualenv>=20.4.2
 skipsdist = True
-# python runtimes: https://governance.openstack.org/tc/reference/project-testing-interface.html#tested-runtimes
-envlist = pep8,py38,functional
+envlist = pep8,py3,functional
 # this allows tox to infer the base python from the environment name
 # and override any basepython configured in this file
 ignore_basepython_conflict=true
 
 [testenv]
-basepython = python3
-setenv = VIRTUAL_ENV={envdir}
-         PYTHONWARNINGS=default::DeprecationWarning
+usedevelop = true
+setenv =
+  VIRTUAL_ENV={envdir}
   OS_STDOUT_CAPTURE=1
   OS_STDERR_CAPTURE=1
-usedevelop = True
 
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -68,10 +66,9 @@ commands =
   black --check --diff --color skyline_apiserver --line-length 98
   flake8 {posargs} .
 
-[testenv:py38]
+[testenv:py{3,38,39,310,311}]
 description =
   Run pytest.
-envdir = {toxworkdir}/shared
 deps =
   {[testenv]deps}
 extras =