Fixes makefile filter (see previous commit)

Removed deprecated modules from merge
Fixed container_environ fixture
Added +x to entrypoint.sh otherwise container does not have execution permissions

Author: Pedro Crespo

Makefile

@@ -28,7 +28,7 @@ export HOST_GID=1000
 # TODO: Add a meaningfull call to retrieve the local docker group ID and the user ID in linux.
 endif
 
-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"))
+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*"))
 
 export PYTHONPATH=${CURDIR}/packages/s3wrapper/src:${CURDIR}/packages/simcore-sdk/src
 

services/sidecar/docker/entrypoint.sh

@@ -52,7 +52,7 @@ def devel_environ(env_devel_file):
 
 
 @pytest.fixture("session")
-def container_environ(services_docker_compose_file, devel_environ):
+def container_environ(services_docker_compose_file, devel_environ, osparc_simcore_root_dir):
     """ Creates a dict with the environment variables
         inside of a webserver container
     """
@@ -61,7 +61,8 @@ def container_environ(services_docker_compose_file, devel_environ):
         dc = yaml.safe_load(f)
 
     container_environ = {
-        'SIMCORE_WEB_OUTDIR': 'home/scu/services/web/client'  # defined in Dockerfile
+        'SIMCORE_WEB_OUTDIR': 'home/scu/services/web/client',  # defined in Dockerfile
+        'OSPARC_SIMCORE_REPO_ROOTDIR': str(osparc_simcore_root_dir) # defined if pip install --edit (but not in travis!)
     }
 
     environ_items = dc["services"]["webserver"]["environment"]