Tidy-up

Author: Shillaker

requirements.txt

@@ -1,3 +1,2 @@
 black
 invoke
-pyyaml

tasks/container.py

@@ -15,15 +15,18 @@
 DOCKERFILE = join(PROJ_ROOT, "docker", "cpython.dockerfile")
 
 
+def _get_tag():
+    tag_name = "{}:v{}".format(CONTAINER_IMAGE, get_version())
+    return tag_name
+
+
 @task(default=True)
 def build(ctx, nocache=False, push=False):
     """
     Build current version of the cpython container
     """
-    tag_name = "{}:{}".format(CONTAINER_IMAGE, get_version())
-
     build_container(
-        tag_name, DOCKERFILE, PROJ_ROOT, nocache=nocache, push=push
+        _get_tag(), DOCKERFILE, PROJ_ROOT, nocache=nocache, push=push
     )
 
 
@@ -32,5 +35,4 @@ def push(ctx):
     """
     Push the current version of the cpython container
     """
-    tag_name = "{}:{}".format(CONTAINER_IMAGE, get_version())
-    push_container(tag_name)
+    push_container(_get_tag())

tasks/runtime.py

@@ -7,9 +7,11 @@
 
 from invoke import task
 
+from faasmtools import FAASM_LOCAL_DIR
+
 from tasks.env import PROJ_ROOT, THIRD_PARTY_DIR
 
-FAASM_RUNTIME_ROOT = "/usr/local/faasm/runtime_root"
+FAASM_RUNTIME_ROOT = join(FAASM_LOCAL_DIR, "runtime_root")
 CPYTHON_SRC = join(THIRD_PARTY_DIR, "cpython")
 CPYTHON_INSTALL_DIR = join(CPYTHON_SRC, "install", "wasm")
 CROSSENV_WASM_DIR = join(PROJ_ROOT, "cross_venv", "cross")