Unverified Commit 8aa70c6a authored by Nicola Soranzo's avatar Nicola Soranzo Committed by GitHub
Browse files

Merge pull request #14335 from mvdbeek/upgrade_fastapi

parents 46e41ba3 7ab11efe

lib/galaxy/dependencies/dev-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ docutils==0.16; (python_version >= "2.7" and python_full_version < "3.0.0") or ( 
ecdsa==0.17.0; python_version >= "2.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0"

edam-ontology==1.25.2

fastapi-utils==0.2.1; python_version >= "3.6" and python_version < "4.0"

fastapi==0.78.0; python_full_version >= "3.6.1"

fastapi==0.79.0; python_full_version >= "3.6.1"

fluent-logger==0.10.0; python_version >= "3.5"

fonttools==4.33.3; python_version >= "3.7"

fs==2.4.16

lib/galaxy/dependencies/pinned-requirements.txt

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ docutils==0.16; (python_version >= "2.7" and python_full_version < "3.0.0") or ( 
ecdsa==0.17.0; python_version >= "2.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0"

edam-ontology==1.25.2

fastapi-utils==0.2.1; python_version >= "3.6" and python_version < "4.0"

fastapi==0.78.0; python_full_version >= "3.6.1"

fastapi==0.79.0; python_full_version >= "3.6.1"

fs==2.4.16

funcsigs==1.0.2

future==0.18.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")

lib/galaxy/webapps/openapi/utils.py

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ from fastapi.encoders import jsonable_encoder 
from fastapi.openapi.constants import (

    METHODS_WITH_BODY,

    REF_PREFIX,

    STATUS_CODES_WITH_NO_BODY,

)

from fastapi.openapi.models import OpenAPI

from fastapi.params import (
@@ -44,6 +43,7 @@ from fastapi.utils import ( 
    deep_dict_update,

    generate_operation_id_for_path,

    get_model_definitions,

    is_body_allowed_for_status_code,

)

from pydantic import BaseModel

from pydantic.fields import (
@@ -266,7 +266,7 @@ def get_openapi_path( 
            operation.setdefault("responses", {}).setdefault(status_code, {})[

                "description"

            ] = route.response_description

            if route_response_media_type and route.status_code not in STATUS_CODES_WITH_NO_BODY:

            if route_response_media_type and is_body_allowed_for_status_code(route.status_code):

                response_schema = {"type": "string"}

                if lenient_issubclass(current_response_class, JSONResponse):

                    if route.response_field: