Skip to content

Commit f3f2ea8

Browse files
pavelvazquezsveinugu
authored andcommitted
Fixed some Flake8 errors
1 parent 42a27f5 commit f3f2ea8

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

src/omnipy/data/serializer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def _to_data_from_data_if_direct(dataset, serializer: Serializer):
124124
try:
125125
new_dataset = func(dataset, serializer)
126126
return new_dataset, serializer
127-
except (TypeError, ValueError, ValidationError, AssertionError) as e:
127+
except (TypeError, ValueError, ValidationError, AssertionError):
128128
pass
129129

130130
return None, None

src/omnipy/modules/fairtracks/functions.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@ def encode_api(endpoint='experiments', id=None, limit=None, format='json', frame
2323

2424
# ['projects', 'cases', 'files', 'annotations'], starting_point='0', size='25'
2525
def gdc_api(object_type='projects', starting_point=None, size=None):
26-
api_url = GDC_BASE_URL + object_type + '/' + '?' + \
27-
'&'.join(
28-
(['from=' + starting_point] if starting_point else [])
29-
+ (['size=' + size] if size else [])
30-
+ (['expand=' + 'project'] if object_type == 'cases' else [])
31-
)
26+
api_url = GDC_BASE_URL + object_type + '/' + '?' + '&'.join(
27+
(['from=' + starting_point] if starting_point else []) + (['size=' + size] if size else [])
28+
+ ([+ 'project'] if object_type == 'cases' else []))
3229
print(api_url)
3330
response = requests.get(api_url)
3431
if response.status_code != 200:

tests/integration/reused/engine/conftest.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ def all_job_classes(
3333
dag_flow_template_cls: Type[IsDagFlowTemplate],
3434
func_flow_template_cls: Type[IsFuncFlowTemplate],
3535
):
36-
return job_type, task_template_cls, linear_flow_template_cls, \
37-
dag_flow_template_cls, func_flow_template_cls
36+
return (job_type,
37+
task_template_cls,
38+
linear_flow_template_cls,
39+
dag_flow_template_cls,
40+
func_flow_template_cls)
3841

3942

4043
@pc.fixture(scope='function', name='plain_engine')
@@ -65,7 +68,11 @@ def all_func_types_real_jobs_all_engines_real_reg(
6568
engine_decorator: Optional[Callable[[IsEngine], IsEngine]],
6669
registry: Optional[IsRunStateRegistry],
6770
):
68-
job_type, task_template_cls, linear_flow_template_cls, dag_flow_template_cls, func_flow_template_cls = job_classes
71+
(job_type,
72+
task_template_cls,
73+
linear_flow_template_cls,
74+
dag_flow_template_cls,
75+
func_flow_template_cls) = job_classes
6976

7077
# TODO: Fix job_type comparisons everywhere (bug due to pytest.fixture?)
7178
if job_type.value == JobType.linear_flow.value:

tests/util/test_dynamic_mixin.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from abc import ABCMeta
1+
# from abc import ABCMeta
22
from inspect import Parameter, signature
33
from typing import Dict, Generic, get_args, Optional, Tuple, Type, TypeVar
44

@@ -114,7 +114,7 @@ def override(self):
114114

115115
class MockKwArgAccessOrigClsMemberStateMixin:
116116
def __init__(self, *, my_kwarg):
117-
self._value = f'my_kwarg: {my_kwarg}' if self.kwargs.get('verbose') == True else my_kwarg
117+
self._value = f'my_kwarg: {my_kwarg}' if self.kwargs.get('verbose', False) else my_kwarg
118118

119119
def new_method(self):
120120
return self._value
@@ -182,7 +182,7 @@ def _assert_args_and_kwargs(mock_obj: object,
182182

183183
if mock_cls:
184184
assert tuple(signature(mock_cls.__init__).parameters.keys()) == \
185-
tuple(['self'] + non_self_param_keys)
185+
tuple(['self'] + non_self_param_keys)
186186

187187

188188
def test_new_method_no_state_mixin(mock_plain_cls):
@@ -513,7 +513,7 @@ def override(self):
513513

514514
def test_predefined_init_kwargs_progressive_multiple_state_mixins_same_default(
515515
mock_predefined_init_kwargs_cls):
516-
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls #noqa
516+
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls # noqa
517517

518518
MockPredefinedInitKwargsCls.accept_mixin(MockKwArgStateMixin)
519519

@@ -561,7 +561,7 @@ def test_predefined_init_kwargs_progressive_multiple_state_mixins_same_default(
561561

562562
def test_predefined_init_kwargs_progressive_multiple_state_mixins_different_withmixin_classes(
563563
mock_predefined_init_kwargs_cls):
564-
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls #noqa
564+
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls # noqa
565565

566566
MockPredefinedInitKwargsCls.accept_mixin(MockKwArgStateMixin)
567567

@@ -602,7 +602,7 @@ def test_predefined_init_kwargs_progressive_multiple_state_mixins_different_with
602602

603603

604604
def test_nested_mixins(mock_predefined_init_kwargs_cls, mock_plain_cls):
605-
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls #noqa
605+
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls # noqa
606606
MockPlainCls = mock_plain_cls # noqa
607607

608608
MockPredefinedInitKwargsCls.accept_mixin(MockKwArgStateMixin)
@@ -625,7 +625,7 @@ def test_nested_mixins(mock_predefined_init_kwargs_cls, mock_plain_cls):
625625

626626

627627
def test_nested_mixins_static_outer_inheritance(mock_predefined_init_kwargs_cls):
628-
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls #noqa
628+
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls # noqa
629629
MockPredefinedInitKwargsCls.accept_mixin(MockKwArgStateMixin)
630630

631631
class MockMockPlainCls(MockPredefinedInitKwargsCls):
@@ -654,7 +654,7 @@ def override(self):
654654

655655

656656
def test_nested_mixins_double_static_outer_inheritance(mock_predefined_init_kwargs_cls):
657-
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls #noqa
657+
MockPredefinedInitKwargsCls = mock_predefined_init_kwargs_cls # noqa
658658
MockPredefinedInitKwargsCls.accept_mixin(MockKwArgStateMixin)
659659

660660
class MockMockPlainCls(MockPredefinedInitKwargsCls):
@@ -687,7 +687,7 @@ class MockMockMockPlainCls(MockMockPlainCls):
687687

688688
def test_nested_mixins_static_outer_inheritance_from_generic(
689689
mock_predefined_init_kwargs_generic_cls):
690-
MockPredefinedInitKwargsGenericCls = mock_predefined_init_kwargs_generic_cls #noqa
690+
MockPredefinedInitKwargsGenericCls = mock_predefined_init_kwargs_generic_cls # noqa
691691
MockPredefinedInitKwargsGenericCls.accept_mixin(MockKwArgStateMixin)
692692

693693
class MockMockPlainCls(MockPredefinedInitKwargsGenericCls[int]):

0 commit comments

Comments
 (0)