Skip to content

Commit

Permalink
bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
hh-h committed Oct 31, 2020
1 parent 65065fc commit e81908f
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 26 deletions.
6 changes: 5 additions & 1 deletion aiohttp_swagger3/swagger_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ def add_route(
):
meth = meth.lower()
handler = self._wrap_handler(
meth, path, handler, is_method=False, validate=need_validation,
meth,
path,
handler,
is_method=False,
validate=need_validation,
)
else:
handler = self._wrap_handler(
Expand Down
2 changes: 1 addition & 1 deletion aiohttp_swagger3/swagger_route.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ async def parse(self, request: web.Request) -> Dict:
for param in self.qp:
if param.required:
try:
v = request.rel_url.query.getall(param.name)
v: Any = request.rel_url.query.getall(param.name)
except KeyError:
errors[param.name] = "is required"
continue
Expand Down
36 changes: 24 additions & 12 deletions aiohttp_swagger3/ui_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,15 @@ class SwaggerUiSettings(_UiSettings):
default=1, validator=attr.validators.instance_of(int)
)
defaultModelRendering: str = attr.attrib(
default="example", validator=attr.validators.in_(("example", "model")),
default="example",
validator=attr.validators.in_(("example", "model")),
)
displayRequestDuration: bool = attr.attrib(
default=False, validator=attr.validators.instance_of(bool)
)
docExpansion: str = attr.attrib(
default="list", validator=attr.validators.in_(("list", "full", "none")),
default="list",
validator=attr.validators.in_(("list", "full", "none")),
)
filter: bool = attr.attrib(
default=False, validator=attr.validators.instance_of(bool)
Expand Down Expand Up @@ -328,23 +330,27 @@ class RapiDocUiSettings(_UiSettings):
default=False, validator=attr.validators.instance_of(bool)
)
sort_endpoints_by: str = attr.attrib(
default="path", validator=attr.validators.in_(("path", "method")),
default="path",
validator=attr.validators.in_(("path", "method")),
)
heading_text: Optional[str] = attr.attrib(
default=None,
validator=attr.validators.optional(attr.validators.instance_of(str)),
)
# UI Colors and Fonts
theme: str = attr.attrib(
default="light", validator=attr.validators.in_(("light", "dark")),
default="light",
validator=attr.validators.in_(("light", "dark")),
)
bg_color: str = attr.attrib(validator=attr.validators.instance_of(str))
text_color: str = attr.attrib(validator=attr.validators.instance_of(str))
header_color: str = attr.attrib(
default="#444444", validator=attr.validators.instance_of(str),
default="#444444",
validator=attr.validators.instance_of(str),
)
primary_color: str = attr.attrib(
default="#FF791A", validator=attr.validators.instance_of(str),
default="#FF791A",
validator=attr.validators.instance_of(str),
)
font_size: str = attr.attrib(
default="default",
Expand Down Expand Up @@ -373,13 +379,16 @@ class RapiDocUiSettings(_UiSettings):
)
# UI Layout & Placement
layout: str = attr.attrib(
default="row", validator=attr.validators.in_(("row", "column")),
default="row",
validator=attr.validators.in_(("row", "column")),
)
render_style: str = attr.attrib(
default="view", validator=attr.validators.in_(("read", "view", "focused")),
default="view",
validator=attr.validators.in_(("read", "view", "focused")),
)
schema_style: str = attr.attrib(
default="tree", validator=attr.validators.in_(("tree", "table")),
default="tree",
validator=attr.validators.in_(("tree", "table")),
)
schema_expand_level: int = attr.attrib(
default=999, validator=attr.validators.instance_of(int)
Expand All @@ -388,7 +397,8 @@ class RapiDocUiSettings(_UiSettings):
default=False, validator=attr.validators.instance_of(bool)
)
default_schema_tab: str = attr.attrib(
default="model", validator=attr.validators.in_(("model", "example")),
default="model",
validator=attr.validators.in_(("model", "example")),
)
# Hide/Show Sections
show_info: bool = attr.attrib(
Expand Down Expand Up @@ -417,14 +427,16 @@ class RapiDocUiSettings(_UiSettings):
)
# API Server
api_key_name: str = attr.attrib(
default="Authorization", validator=attr.validators.instance_of(str),
default="Authorization",
validator=attr.validators.instance_of(str),
)
api_key_value: Optional[str] = attr.attrib(
default=None,
validator=attr.validators.optional(attr.validators.instance_of(str)),
)
api_key_location: str = attr.attrib(
default="header", validator=attr.validators.in_(("header", "query")),
default="header",
validator=attr.validators.in_(("header", "query")),
)
server_url: Optional[str] = attr.attrib(
default=None,
Expand Down
8 changes: 4 additions & 4 deletions requirements-ci.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mypy==0.782
black==19.10b0
flake8==3.8.3
isort==4.3.21
mypy==0.790
black==20.8b1
flake8==3.8.4
isort==5.6.4
8 changes: 4 additions & 4 deletions requirements-tests.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==5.4.3
pytest-xdist==1.32.0
pytest-cov==2.10.0
codecov==2.1.7
pytest==6.1.2
pytest-xdist==2.1.0
pytest-cov==2.10.1
codecov==2.1.10
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
aiohttp>=3.6.2,<3.7
aiohttp>=3.6.2,<3.8
pyyaml>=5.3,<5.4
attrs>=19.3.0,<19.4
attrs>=19.3.0,<21
fastjsonschema>=2.14.3,<2.15
strict_rfc3339>=0.7,<0.8
contextvars>=2.4,<2.5;python_version<"3.7"
12 changes: 10 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ def _rapidoc_ui_settings(**kwargs):
def swagger_docs_with_components():
def _swagger_docs_with_components(**kwargs):
app = web.Application()
return SwaggerDocs(app, components="tests/testdata/components.yaml", **kwargs,)
return SwaggerDocs(
app,
components="tests/testdata/components.yaml",
**kwargs,
)

return _swagger_docs_with_components

Expand All @@ -64,6 +68,10 @@ def _swagger_docs(**kwargs):
def swagger_file():
def _swagger_file(**kwargs):
app = web.Application()
return SwaggerFile(app, spec_file="tests/testdata/petstore.yaml", **kwargs,)
return SwaggerFile(
app,
spec_file="tests/testdata/petstore.yaml",
**kwargs,
)

return _swagger_file

0 comments on commit e81908f

Please sign in to comment.