diff --git a/README.md b/README.md index c6546ed..178a668 100644 --- a/README.md +++ b/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 diff --git a/faasmctl/bin/gen_proto_files.py b/faasmctl/bin/gen_proto_files.py index e07bdc9..b2dd946 100755 --- a/faasmctl/bin/gen_proto_files.py +++ b/faasmctl/bin/gen_proto_files.py @@ -63,7 +63,7 @@ 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 = ( @@ -71,7 +71,7 @@ def gen_proto_files(clean=False): .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 diff --git a/faasmctl/util/compose.py b/faasmctl/util/compose.py index cfd77a1..133e1c0 100644 --- a/faasmctl/util/compose.py +++ b/faasmctl/util/compose.py @@ -39,10 +39,10 @@ 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: @@ -50,10 +50,10 @@ def get_compose_env_vars(faasm_checkout, mount_source, ini_file=None): # 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" diff --git a/faasmctl/util/faasm.py b/faasmctl/util/faasm.py index 654a5d1..a478701 100644 --- a/faasmctl/util/faasm.py +++ b/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(): diff --git a/faasmctl/util/version.py b/faasmctl/util/version.py index 2706e64..0bb9159 100644 --- a/faasmctl/util/version.py +++ b/faasmctl/util/version.py @@ -1,4 +1,4 @@ -FAASMCTL_VERSION = "0.50.0" +FAASMCTL_VERSION = "0.51.0" def get_version(): diff --git a/pyproject.toml b/pyproject.toml index b173be0..4e2f83c 100644 --- a/pyproject.toml +++ b/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" }, ]