Skip to content

Commit 05d5423

Browse files
author
Pedro Crespo
committed
Fixes bad merge in test_reverser_proxy.
Disabled web/server pylint from makefile since test_package has a linter test and single-file pylint checks produces false positives with relative imports
1 parent 63df90c commit 05d5423

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export HOST_GID=1000
2828
# TODO: Add a meaningfull call to retrieve the local docker group ID and the user ID in linux.
2929
endif
3030

31-
PY_FILES = $(strip $(shell find services packages -iname '*.py' -not -path "*egg*" -not -path "*contrib*" -not -path "*-sdk/python*" -not -path "*generated_code*" -not -path "*datcore.py"))
31+
PY_FILES = $(strip $(shell find services packages -iname '*.py' -not -path "*egg*" -not -path "*contrib*" -not -path "*-sdk/python*" -not -path "*generated_code*" -not -path "*datcore.py" -not -path "web/server"))
3232

3333
export PYTHONPATH=${CURDIR}/packages/s3wrapper/src:${CURDIR}/packages/simcore-sdk/src
3434

services/web/server/src/simcore_service_webserver/director/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
logger = logging.getLogger(__name__)
1515

16+
17+
1618
def setup(app: web.Application):
1719
logger.debug("Setting up %s ...", __name__)
1820

services/web/server/tests/unit/test_reverse_proxy.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
from aiohttp import web
1717
from aiohttp.client_reqrep import ClientResponse
1818
from aiohttp.test_utils import TestClient
19-
from yarl import URL
20-
21-
from simcore_service_webserver.application_keys import APP_CONFIG_KEY
19+
from servicelib.application_keys import APP_CONFIG_KEY
2220
from simcore_service_webserver.reverse_proxy import setup_reverse_proxy
2321
from simcore_service_webserver.reverse_proxy.abc import ServiceResolutionPolicy
2422
from simcore_service_webserver.reverse_proxy.settings import PROXY_MOUNTPOINT
23+
from yarl import URL
2524

2625

2726
def create_backend_app(name, image, basepath):

0 commit comments

Comments
 (0)