From 1a1ec092522a463dc8c8eb94bbea42261038d08b Mon Sep 17 00:00:00 2001 From: liuxiao Date: Tue, 5 Dec 2023 18:11:28 +0800 Subject: [PATCH] replace 1.0 with 1.2 --- src/common/deploy_graph.py | 4 ++-- src/common/loader.py | 4 ++-- src/common/tools.py | 4 ++-- src/graph_function_test/tools/test_tools.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/deploy_graph.py b/src/common/deploy_graph.py index f8c0e6f..cbd2610 100644 --- a/src/common/deploy_graph.py +++ b/src/common/deploy_graph.py @@ -170,8 +170,8 @@ def toolchain(conf): # set properties && start hubble hubble_package_dir_name = os.path.join(code_dir_path, - 'apache-hugegraph-toolchain-incubating-1.0.0', - 'apache-hugegraph-hubble-incubating-1.0.0') + 'apache-hugegraph-toolchain-incubating-1.2.0', + 'apache-hugegraph-hubble-incubating-1.2.0') # set_hubble_properties(hubble_package_dir_name, conf.graph_host, conf.hubble_port) start_graph(hubble_package_dir_name, 'hubble') diff --git a/src/common/loader.py b/src/common/loader.py index 40676af..ac76864 100644 --- a/src/common/loader.py +++ b/src/common/loader.py @@ -15,8 +15,8 @@ from src.common.file_basic import is_match_re from src.config import basic_config as _cfg -loader_name = is_match_re(_cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0', "^apache-hugegraph-loader-incubating-(\d).(\d{1,2}).(\d)$") -loader_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0' + '/' + loader_name +loader_name = is_match_re(_cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.2.0', "^apache-hugegraph-loader-incubating-(\d).(\d{1,2}).(\d)$") +loader_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.2.0' + '/' + loader_name dataset_path = root_path + 'src/config/dataset/' diff --git a/src/common/tools.py b/src/common/tools.py index 5a1af8a..d9d3487 100644 --- a/src/common/tools.py +++ b/src/common/tools.py @@ -15,10 +15,10 @@ from src.common.server_api import Gremlin tools_name = is_match_re( - _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0', + _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.2.0', "^apache-hugegraph-tools-incubating-(\d).(\d{1,2}).(\d)$" ) -tools_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0' + '/' + tools_name +tools_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.2.0' + '/' + tools_name def run_shell(cmd, graph_name=None, graph_host=None, graph_port=None): diff --git a/src/graph_function_test/tools/test_tools.py b/src/graph_function_test/tools/test_tools.py index 20015c8..4d41b08 100644 --- a/src/graph_function_test/tools/test_tools.py +++ b/src/graph_function_test/tools/test_tools.py @@ -23,9 +23,9 @@ from src.common.tools import target_insert_data from src.config import basic_config as _cfg -tools_name = is_match_re(_cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0', +tools_name = is_match_re(_cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.2.0', "^apache-hugegraph-tools-incubating-(\d).(\d{1,2}).(\d)$") -tools_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.0.0' + '/' + tools_name +tools_path = _cfg.code_path + '/incubator-hugegraph-toolchain/apache-hugegraph-toolchain-incubating-1.2.0' + '/' + tools_name class TestTools: