chore: update conan mount points for conan2

README.md

@@ -8,7 +8,7 @@ running [Faasm](https://github.com/faasm/faasm) cluster.
 To install `faasmctl` you need a working `pip` (virtual-)environment. Then:
 
 ```bash
-pip install faasmctl==0.50.0
+pip install faasmctl==0.51.0
 ```
 
 ## Usage

faasmctl/bin/gen_proto_files.py

@@ -63,15 +63,15 @@ def gen_proto_files(clean=False):
 
     # Find the right protoc binary
     docker_exec_prefix = "docker exec {}".format(tmp_ctr_name)
-    find_protoc_cmd = "{} bash -c 'find ~/.conan -name protoc'".format(
+    find_protoc_cmd = "{} bash -c 'find ~/.conan2 -name protoc'".format(
         docker_exec_prefix
     )
     protoc_bin = (
         run(find_protoc_cmd, shell=True, capture_output=True)
         .stdout.decode("utf-8")
         .split("\n")
     )
-    p_bin = [p_bin for p_bin in protoc_bin if "build_subfolder" in p_bin]
+    p_bin = [p_bin for p_bin in protoc_bin if "bin" in p_bin]
     p_bin = p_bin[0].strip()
 
     # Generate python protobuf files

faasmctl/util/compose.py

@@ -39,21 +39,21 @@ def get_compose_env_vars(faasm_checkout, mount_source, ini_file=None):
 
     if mount_source:
         env["FAASM_BUILD_DIR"] = join(faasm_checkout, "dev/faasm/build")
-        env["CONAN_CACHE_MOUNT_SOURCE"] = join(faasm_checkout, "dev/faasm/conan")
+        env["CONAN_CACHE_MOUNT_SOURCE"] = join(faasm_checkout, "dev/faasm/conan2")
         env["FAASM_BUILD_MOUNT"] = "/build/faasm"
         env["FAASM_CODE_MOUNT"] = "/usr/local/code/faasm"
-        env["FAASM_CONAN_MOUNT"] = "/root/.conan"
+        env["FAASM_CONAN_MOUNT"] = "/root/.conan2"
         env["FAASM_LOCAL_MOUNT"] = "/usr/local/faasm"
         env["PLANNER_BUILD_MOUNT"] = env["FAASM_BUILD_MOUNT"]
     else:
         # FIXME: by using `./dev` in non-mounted clusters we make it impossible
         # to cleanly remove them (as ./dev is root-owned), so we can't rm -rf
         # the directory
         env["FAASM_BUILD_DIR"] = join(faasm_checkout, "dev/faasm/build")
-        env["CONAN_CACHE_MOUNT_SOURCE"] = join(faasm_checkout, "dev/faasm/conan")
+        env["CONAN_CACHE_MOUNT_SOURCE"] = join(faasm_checkout, "dev/faasm/conan2")
         env["FAASM_BUILD_MOUNT"] = "/host_dev/build"
         env["FAASM_CODE_MOUNT"] = "/host_dev/code"
-        env["FAASM_CONAN_MOUNT"] = "/host_dev/conan"
+        env["FAASM_CONAN_MOUNT"] = "/host_dev/conan2"
         env["FAASM_LOCAL_MOUNT"] = "/host_dev/faasm-local"
         env["PLANNER_BUILD_MOUNT"] = "/build/faabric/static"
 

faasmctl/util/faasm.py

@@ -1,6 +1,6 @@
 from os import environ
 
-FAASM_VERSION = "0.29.0"
+FAASM_VERSION = "0.32.0"
 
 
 def get_version():

faasmctl/util/version.py

@@ -1,4 +1,4 @@
-FAASMCTL_VERSION = "0.50.0"
+FAASMCTL_VERSION = "0.51.0"
 
 
 def get_version():

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "faasmctl"
-version = "0.50.0"
+version = "0.51.0"
 authors = [
   { name="Faasm Team", email="foo@bar.com" },
 ]