From a2ce165b77981cdb028143160932341beadff5dc Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Mon, 23 Jan 2023 17:23:52 -0500 Subject: [PATCH] pin docformatter==1.5.0 due to 1.5.1 breaking changes (relates to https://github.com/PyCQA/docformatter/issues/124 and https://github.com/PyCQA/docformatter/issues/156) --- requirements-dev.txt | 2 +- tests/functional/test_cli.py | 2 -- tests/wps_restapi/test_api.py | 1 - weaver/processes/convert.py | 1 + weaver/processes/sources.py | 3 ++- weaver/processes/wps_package.py | 1 - weaver/wps_restapi/colander_extras.py | 1 - 7 files changed, 4 insertions(+), 7 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8b8bfa521..866c6de34 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,7 +9,7 @@ bump2version codacy-coverage coverage doc8>=0.8.1 -docformatter>=1.5.0 # add support of config file +docformatter==1.5.0 # add support of config file flake8<6 # FIXME: false positive redefinition (https://github.com/PyCQA/pyflakes/issues/757) flynt isort>=4.3.21,<5 diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py index 7ae486e92..5aca30d48 100644 --- a/tests/functional/test_cli.py +++ b/tests/functional/test_cli.py @@ -2017,7 +2017,6 @@ class TestWeaverClientAuthBase(TestWeaverClientBase): @classmethod def setup_auth_app(cls): - def auth_view(request): # type: (AnyRequestType) -> AnyResponseType token = str(uuid.uuid4()) @@ -2057,7 +2056,6 @@ def setUpClass(cls): class TestWeaverCLIAuthHandler(TestWeaverClientAuthBase): - def test_describe_auth(self): # prints formatted JSON ProcessDescription over many lines proc = self.test_process["Echo"] diff --git a/tests/wps_restapi/test_api.py b/tests/wps_restapi/test_api.py index 05e73f152..a6532e19d 100644 --- a/tests/wps_restapi/test_api.py +++ b/tests/wps_restapi/test_api.py @@ -15,7 +15,6 @@ class GenericApiRoutesTestCase(unittest.TestCase): - @classmethod def setUpClass(cls): cls.testapp = get_test_weaver_app(settings={"weaver.wps": True, "weaver.wps_restapi": True}) diff --git a/weaver/processes/convert.py b/weaver/processes/convert.py index 141e20061..414fe8282 100644 --- a/weaver/processes/convert.py +++ b/weaver/processes/convert.py @@ -1091,6 +1091,7 @@ def __iter__(self): symbols: "Union[CWL_IO_EnumSymbols, AnyValue, Type[AnyValue]]" = AnyValue """ Specifies the allowed values when the definition is marked as :attr:`enum`. + When not overriden by literal values, it uses the default :class:`AnyValue`. """ diff --git a/weaver/processes/sources.py b/weaver/processes/sources.py index e9351004b..6e4b16d3f 100644 --- a/weaver/processes/sources.py +++ b/weaver/processes/sources.py @@ -17,7 +17,8 @@ from weaver.typedefs import DataSourceConfig DATA_SOURCES = {} # type: DataSourceConfig -"""Data sources configuration. +""" +Data sources configuration. Unless explicitly overridden, the configuration will be loaded from file as specified by``weaver.data_sources`` setting. Following JSON schema format is expected (corresponding YAML also supported): diff --git a/weaver/processes/wps_package.py b/weaver/processes/wps_package.py index 4fa9997a6..ab4e47535 100644 --- a/weaver/processes/wps_package.py +++ b/weaver/processes/wps_package.py @@ -1206,7 +1206,6 @@ def location(self, destination): class WpsPackage(Process): - def __init__(self, package=None, payload=None, **kw): # type: (CWL, Optional[JSON], **Any) -> None """ diff --git a/weaver/wps_restapi/colander_extras.py b/weaver/wps_restapi/colander_extras.py index 042ec77fa..48f90ec6c 100644 --- a/weaver/wps_restapi/colander_extras.py +++ b/weaver/wps_restapi/colander_extras.py @@ -382,7 +382,6 @@ def __init__(self, *args, v_prefix=False, rc_suffix=True, **kwargs): class ExtendedBoolean(colander.Boolean): - def __init__(self, *args, true_choices=None, false_choices=None, allow_string=False, **kwargs): # type: (Any, Optional[Iterable[str]], Optional[Iterable[str]], bool, Any) -> None """