Skip to content

Commit 3f76655

Browse files
committed
Formatted
1 parent c45884a commit 3f76655

File tree

12 files changed

+17
-22
lines changed

12 files changed

+17
-22
lines changed

services/storage/docker/healthcheck.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import os
2020
import sys
21-
2221
from urllib.request import urlopen
2322

2423
SUCCESS, UNHEALTHY = 0, 1

services/storage/src/simcore_service_storage/__version__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
33
"""
44
import pkg_resources
5-
65
from semantic_version import Version
76

87
__version__: str = pkg_resources.get_distribution("simcore_service_storage").version

services/storage/src/simcore_service_storage/datcore.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from blackfynn import Blackfynn
1616
from blackfynn.models import BaseCollection, Collection, DataPackage
17+
1718
from simcore_service_storage.models import DatasetMetaData, FileMetaData, FileMetaDataEx
1819
from simcore_service_storage.settings import DATCORE_ID, DATCORE_STR
1920

@@ -345,7 +346,7 @@ def download_file(self, source, filename, destination_path):
345346

346347
url = self.download_link(source, filename)
347348
if url:
348-
_file = urllib.URLopener() # nosec
349+
_file = urllib.URLopener() # nosec
349350
_file.retrieve(url, destination_path)
350351
return True
351352
return False

services/storage/src/simcore_service_storage/datcore_wrapper.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ def __init__(
7474
)
7575
except Exception:
7676
self.d_client = None # Disabled: any call will raise AttributeError
77-
logger.warning(
78-
"Failed to setup datcore. Disabling client.", exc_info=True
79-
)
77+
logger.warning("Failed to setup datcore. Disabling client.", exc_info=True)
8078

8179
@property
8280
def is_communication_enabled(self) -> bool:

services/storage/src/simcore_service_storage/db.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import logging
22

33
from aiohttp import web
4+
from tenacity import Retrying
5+
46
from servicelib.aiopg_utils import (
57
DataSourceName,
68
PostgresRetryPolicyUponInitialization,
@@ -9,7 +11,6 @@
911
is_pg_responsive,
1012
raise_if_not_responsive,
1113
)
12-
from tenacity import Retrying
1314

1415
from .models import metadata
1516
from .settings import APP_CONFIG_KEY, APP_DB_ENGINE_KEY

services/storage/src/simcore_service_storage/dsm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import tempfile
77
from concurrent.futures import ThreadPoolExecutor
88
from pathlib import Path
9-
from typing import Dict, List, Tuple, Optional
9+
from typing import Dict, List, Optional, Tuple
1010

1111
import aiobotocore
1212
import aiofiles
@@ -44,7 +44,6 @@
4444
SIMCORE_S3_STR,
4545
)
4646

47-
4847
# pylint: disable=no-value-for-parameter
4948
# FIXME: E1120:No value for argument 'dml' in method call
5049

services/storage/src/simcore_service_storage/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
from simcore_postgres_database.storage_models import (
1111
file_meta_data,
12+
groups,
1213
metadata,
1314
projects,
1415
tokens,
15-
users,
16-
groups,
1716
user_to_groups,
17+
users,
1818
)
1919
from simcore_service_storage.settings import DATCORE_STR, SIMCORE_S3_ID, SIMCORE_S3_STR
2020

services/storage/src/simcore_service_storage/rest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from .resources import resources
1515
from .settings import APP_OPENAPI_SPECS_KEY
1616

17-
1817
log = logging.getLogger(__name__)
1918

2019

services/storage/src/simcore_service_storage/rest_config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- settings
55
"""
66
import trafaret as T
7+
78
from servicelib.config_schema_utils import minimal_addon_schema
89

910
from .settings import APP_OPENAPI_SPECS_KEY

services/storage/src/simcore_service_storage/s3.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
from typing import Dict
77

88
from aiohttp import web
9-
from s3wrapper.s3_client import S3Client
109
from tenacity import before_sleep_log, retry, stop_after_attempt, wait_fixed
1110

11+
from s3wrapper.s3_client import S3Client
12+
1213
from .settings import APP_CONFIG_KEY, APP_S3_KEY
1314
from .utils import RETRY_COUNT, RETRY_WAIT_SECS
1415

services/storage/tests/test_package.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
# TODO: W0611:Unused import ...
2-
# pylint: disable=W0611
3-
# TODO: W0613:Unused argument ...
4-
# pylint: disable=W0613
5-
# W0621: Redefining name ... from outer scope
6-
# pylint: disable=W0621
1+
# pylint:disable=unused-variable
2+
# pylint:disable=unused-argument
3+
# pylint:disable=redefined-outer-name
74

8-
from pytest_simcore.helpers.utils_pylint import assert_pylint_is_passing
95

106
import pytest
117

8+
from pytest_simcore.helpers.utils_pylint import assert_pylint_is_passing
129
from simcore_service_storage.cli import main
1310

1411

services/storage/tests/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
from simcore_service_storage.models import (
1212
FileMetaData,
1313
file_meta_data,
14-
projects,
15-
users,
1614
groups,
15+
projects,
1716
user_to_groups,
17+
users,
1818
)
1919

2020
log = logging.getLogger(__name__)

0 commit comments

Comments
 (0)