diff --git a/modules/deploy.py b/modules/deploy.py index 85caa73..db00a82 100644 --- a/modules/deploy.py +++ b/modules/deploy.py @@ -95,7 +95,6 @@ def bootstrap(): # continue setting up the rootpath and virtualenv setup_rootpath() - setup_virtualenv() bootstrap_pip() diff --git a/modules/docker.py b/modules/docker.py index d4aad8b..2398fa0 100644 --- a/modules/docker.py +++ b/modules/docker.py @@ -200,7 +200,7 @@ under "docker" docker_service_name = configuration.docker.database.service_name dockercompose_cmd = \ - "docker-compose -f {build_path} up -d {docker_service_name}".format( + "docker compose -f {build_path} up -d {docker_service_name}".format( build_path=build_path, docker_service_name=docker_service_name ) diff --git a/modules/pip.py b/modules/pip.py index 0bcc2ef..d305ac0 100644 --- a/modules/pip.py +++ b/modules/pip.py @@ -51,8 +51,10 @@ def setup_virtualenv(python3=True): logging.debug("mkvirtualenv_cmd: %s" % mkvirtualenv_cmd) - logging.debug("with virtualenv_source(): run(\"\n\t%s\n\t\")".format( - mkvirtualenv_cmd)) + logging.debug( + "with virtualenv_source(): " + "run(\"\n\t{mkvirtualenv_cmd}\n\t\")".format( + mkvirtualenv_cmd=mkvirtualenv_cmd)) else: # run("source virtualenvwrapper.sh; mkvirtualenv "